Merge "vmware tests: Support different moref backend representations"

Author: Zuul

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

@@ -169,6 +169,7 @@ def __init__(self, name="ManagedObject", value=None):
         # typically have values like vm-123 or
         # host-232 and not UUID.
         self.value = value
+        self._value_1 = value
         # Managed Object Reference type
         # attributes hold the name of the type
         # of the vCenter object the value

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

@@ -468,8 +468,8 @@ def test_get_connected_hosts_none(self):
                     'fake_datastore', 'host')
 
     def test_get_connected_hosts(self):
-        host = mock.Mock(spec=object)
-        host.value = 'fake-host'
+        host = fake.ManagedObjectReference(value='fake-host',
+                                           name='HostSystem')
         host_mount = mock.Mock(spec=object)
         host_mount.key = host
         host_mounts = mock.Mock(spec=object)

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

@@ -1920,8 +1920,8 @@ def test_create_folder(self):
         session = fake.FakeSession()
         with mock.patch.object(session, '_call_method',
                                side_effect=[child_folder]):
-            parent_folder = mock.sentinel.parent_folder
-            parent_folder.value = 'parent-ref'
+            parent_folder = fake.ManagedObjectReference(value='parent-ref',
+                                                        name='Folder')
             child_name = 'child_folder'
             ret = vm_util.create_folder(session, parent_folder, child_name)
 
@@ -1938,8 +1938,8 @@ def test_create_folder_duplicate_name(self):
         duplicate_exception = vexc.DuplicateName(details=details)
         with mock.patch.object(session, '_call_method',
                                side_effect=[duplicate_exception]):
-            parent_folder = mock.sentinel.parent_folder
-            parent_folder.value = 'parent-ref'
+            parent_folder = fake.ManagedObjectReference(value='parent-ref',
+                                                        name='Folder')
             child_name = 'child_folder'
             ret = vm_util.create_folder(session, parent_folder, child_name)
 

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

@@ -188,8 +188,7 @@ def _setup_create_folder_mocks(self):
         ops = vmops.VMwareVMOps(mock.Mock(), mock.Mock(), mock.Mock())
         base_name = 'folder'
         ds_name = "datastore"
-        ds_ref = mock.Mock()
-        ds_ref.value = 1
+        ds_ref = vmwareapi_fake.ManagedObjectReference(value=1)
         dc_ref = mock.Mock()
         ds_util._DS_DC_MAPPING[ds_ref.value] = ds_util.DcInfo(
                 ref=dc_ref,
@@ -352,13 +351,11 @@ def mock_call_method(module, method, *args, **kwargs):
                 self._instance)
 
     def _test_get_datacenter_ref_and_name(self, ds_ref_exists=False):
-        instance_ds_ref = mock.Mock()
-        instance_ds_ref.value = "ds-1"
+        instance_ds_ref = vmwareapi_fake.ManagedObjectReference(value='ds-1')
         _vcvmops = vmops.VMwareVMOps(self._session, None, None)
         result = vmwareapi_fake.FakeRetrieveResult()
         if ds_ref_exists:
-            ds_ref = mock.Mock()
-            ds_ref.value = "ds-1"
+            ds_ref = vmwareapi_fake.ManagedObjectReference(value='ds-1')
             result.add_object(vmwareapi_fake.Datacenter(ds_ref=ds_ref))
         else:
             result.add_object(vmwareapi_fake.Datacenter(ds_ref=None))