VMware: snapshot backs up wrong disk when instance is attached to volume

[Kartik Bommepally]

When a volume is attached to an instance and we backup the instance or try to create an image from it, the volume's disk is being backed up and not the instance's primary disk.

More info: https://communities.vmware.com/community/vmtn/openstack/blog/2013/08/28/introducing-vova-an-easy-way-to-try-out-openstack-on-vsphere#comment-29775

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/53648

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/53648
Committed: https://git.openstack.org/cgit/openstack/nova/commit/?id=9ceee09594cd35c264cab3e3b3d1d80aaa3fdbc4
Submitter: Jenkins
Branch: master

commit 9ceee09594cd35c264cab3e3b3d1d80aaa3fdbc4
Author: Gary Kotton <email address hidden>
Date: Thu Oct 24 06:59:36 2013 -0700

    VMware: fix image snapshot with attached volume

    A snapshot of a instance with an attached volume will result in
    the wrong volume being uploaded to glance. The reason for this
    are as follows:
    1. the last image in the list of images would be exported
    2. the base image would not be exported but the first found

    The same happens with a VM rescue if there is a cinder volume
    attached.

    The solution is to search for an image that contains the instance
    UUID.

    Change-Id: Ic85b0ffd4f1c34f10d07b1a198eaad2030803d6f
    Closes-bug: #1243193

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/havana
Review: https://review.openstack.org/72020

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/72020
Committed: https://git.openstack.org/cgit/openstack/nova/commit/?id=aa7f5506c9b1d99643ee03bd6bc420957e2479b5
Submitter: Jenkins
Branch: stable/havana

commit aa7f5506c9b1d99643ee03bd6bc420957e2479b5
Author: Gary Kotton <email address hidden>
Date: Thu Oct 24 06:59:36 2013 -0700

    VMware: fix image snapshot with attached volume

    A snapshot of a instance with an attached volume will result in
    the wrong volume being uploaded to glance. The reason for this
    are as follows:
    1. the last image in the list of images would be exported
    2. the base image would not be exported but the first found

    The same happens with a VM rescue if there is a cinder volume
    attached.

    The solution is to search for an image that contains the instance
    UUID.

    Change-Id: Ic85b0ffd4f1c34f10d07b1a198eaad2030803d6f
    Closes-bug: #1243193
    (cherry picked from commit 9ceee09594cd35c264cab3e3b3d1d80aaa3fdbc4)

    Conflicts:

     nova/virt/vmwareapi/vm_util.py
     nova/virt/vmwareapi/vmops.py

    Change-Id: I6b9febbfe4e4e6ecf5d31a2b09a4319b07696f9c