Merge "vmware: Handle folder renames in rescue cmd"

Author: Zuul

nova/tests/unit/virt/vmwareapi/test_vmops.py

@@ -407,7 +407,7 @@ def test_rescue(self, mock_get_ds_by_ref, mock_power_on, mock_reconfigure,
         backing = vmwareapi_fake.DataObject()
         backing.datastore = ds.ref
         device.backing = backing
-        vmdk = vm_util.VmdkInfo('[fake] uuid/root.vmdk',
+        vmdk = vm_util.VmdkInfo('[fake] test (uuid)/root.vmdk',
                                 'fake-adapter',
                                 'fake-disk',
                                 'fake-capacity',
@@ -428,7 +428,8 @@ def test_rescue(self, mock_get_ds_by_ref, mock_power_on, mock_reconfigure,
 
             uuid = self._instance.image_ref
             cache_path = ds.build_path('vmware_base', uuid, uuid + '.vmdk')
-            rescue_path = ds.build_path(self._uuid, uuid + '-rescue.vmdk')
+            vm_folder = ds_obj.DatastorePath.parse(vmdk.path).dirname
+            rescue_path = ds.build_path(vm_folder, uuid + '-rescue.vmdk')
 
             mock_disk_copy.assert_called_once_with(self._session, dc_info.ref,
                              cache_path, rescue_path)

nova/virt/vmwareapi/vmops.py

@@ -1225,7 +1225,8 @@ def rescue(self, context, instance, network_info, image_meta):
         self._fetch_image_if_missing(context, vi)
 
         # Get the rescue disk path
-        rescue_disk_path = datastore.build_path(instance.uuid,
+        vm_folder = ds_obj.DatastorePath.parse(vmdk.path).dirname
+        rescue_disk_path = datastore.build_path(vm_folder,
                 "%s-rescue.%s" % (image_info.image_id, image_info.file_type))
 
         # Copy the cached image to the be the rescue disk. This will be used