openstack
/
nova
Code Issues Proposed changes

Merge "VMware: use get_datastore_by_ref from oslo.vmware"

This commit is contained in:
Jenkins 2015-06-03 03:45:30 +00:00 committed by Gerrit Code Review
parent f51b414e12 089c5401ea
commit b1bc436204
3 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/tests/unit/virt/vmwareapi/test_vmops.py
View File

@ -395,7 +395,7 @@ class VMwareVMOpsTestCase(test.NoDBTestCase):
@mock.patch.object(vm_util, 'get_vm_boot_spec')
@mock.patch.object(vm_util, 'reconfigure_vm')
@mock.patch.object(vm_util, 'power_on_instance')
@mock.patch.object(ds_util, 'get_datastore_by_ref')
@mock.patch.object(ds_obj, 'get_datastore_by_ref')
def test_rescue(self, mock_get_ds_by_ref, mock_power_on, mock_reconfigure,
mock_get_boot_spec, mock_find_rescue,
mock_get_values, mock_get_vm_ref, mock_disk_copy,

11
nova/virt/vmwareapi/ds_util.py
View File

@ -148,17 +148,6 @@ def get_datastore(session, cluster, datastore_regex=None,
raise exception.DatastoreNotFound()
def get_datastore_by_ref(session, ds_ref):
lst_properties = ["summary.type", "summary.name",
"summary.capacity", "summary.freeSpace"]
props = session._call_method(vim_util, "get_object_properties",
None, ds_ref, "Datastore", lst_properties)
query = vm_util.get_values_from_object_properties(session, props)
return ds_obj.Datastore(ds_ref, query["summary.name"],
capacity=query["summary.capacity"],
freespace=query["summary.freeSpace"])
def _get_allowed_datastores(data_stores, datastore_regex):
allowed = []
for obj_content in data_stores.objects:

4
nova/virt/vmwareapi/vmops.py
View File

@ -1052,7 +1052,7 @@ class VMwareVMOps(object):
vmdk = vm_util.get_vmdk_info(self._session, vm_ref,
uuid=instance.uuid)
ds_ref = vmdk.device.backing.datastore
datastore = ds_util.get_datastore_by_ref(self._session, ds_ref)
datastore = ds_obj.get_datastore_by_ref(self._session, ds_ref)
dc_info = self.get_datacenter_ref_and_name(datastore.ref)
# Get the image details of the instance
@ -1177,7 +1177,7 @@ class VMwareVMOps(object):
vmdk = vm_util.get_vmdk_info(self._session, vm_ref,
uuid=instance.uuid)
ds_ref = vmdk.device.backing.datastore
datastore = ds_util.get_datastore_by_ref(self._session, ds_ref)
datastore = ds_obj.get_datastore_by_ref(self._session, ds_ref)
dc_info = self.get_datacenter_ref_and_name(ds_ref)
folder = ds_obj.DatastorePath.parse(vmdk.path).dirname
self._create_ephemeral(block_device_info, instance, vm_ref,