Merge "Fix incorrect usages of fake moref in VMware tests"

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

@@ -112,7 +112,7 @@ class ImageCacheManagerTestCase(test.NoDBTestCase):
     def test_get_ds_browser(self):
         cache = self._imagecache._ds_browser
         ds_browser = mock.Mock()
-        moref = fake.ManagedObjectReference('datastore-100')
+        moref = fake.ManagedObjectReference(value='datastore-100')
         self.assertIsNone(cache.get(moref.value))
         mock_get_method = mock.Mock(return_value=ds_browser)
         with mock.patch.object(vutil, 'get_object_property', mock_get_method):
@@ -136,7 +136,7 @@ class ImageCacheManagerTestCase(test.NoDBTestCase):
             mock.patch.object(ds_util, 'get_sub_folders',
                               fake_get_sub_folders)
         ) as (_get_dynamic, _get_sub_folders):
-            fake_ds_ref = fake.ManagedObjectReference('fake-ds-ref')
+            fake_ds_ref = fake.ManagedObjectReference(value='fake-ds-ref')
             datastore = ds_obj.Datastore(name='ds', ref=fake_ds_ref)
             ds_path = datastore.build_path('base_folder')
             images = self._imagecache._list_datastore_images(

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

@@ -55,12 +55,12 @@ class VMwareVMUtilTestCase(test.NoDBTestCase):
 
     def _test_get_stats_from_cluster(self, connection_state="connected",
                                      maintenance_mode=False):
-        ManagedObjectRefs = [fake.ManagedObjectReference("host1",
-                                                         "HostSystem"),
-                             fake.ManagedObjectReference("host2",
-                                                         "HostSystem")]
+        ManagedObjectRefs = [fake.ManagedObjectReference("HostSystem",
+                                                         "host1"),
+                             fake.ManagedObjectReference("HostSystem",
+                                                         "host2")]
         hosts = fake._convert_to_array_of_mor(ManagedObjectRefs)
-        respool = fake.ManagedObjectReference("resgroup-11", "ResourcePool")
+        respool = fake.ManagedObjectReference("ResourcePool", "resgroup-11")
         prop_dict = {'host': hosts, 'resourcePool': respool}
 
         hardware = fake.DataObject()

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

@@ -72,7 +72,7 @@ class VMwareVMOpsTestCase(test.NoDBTestCase):
 
         self._virtapi = mock.Mock()
         self._image_id = nova.tests.unit.image.fake.get_valid_image_id()
-        fake_ds_ref = vmwareapi_fake.ManagedObjectReference('fake-ds')
+        fake_ds_ref = vmwareapi_fake.ManagedObjectReference(value='fake-ds')
         self._ds = ds_obj.Datastore(
                 ref=fake_ds_ref, name='fake_ds',
                 capacity=10 * units.Gi,
@@ -1382,7 +1382,7 @@ class VMwareVMOpsTestCase(test.NoDBTestCase):
     def test_get_ds_browser(self):
         cache = self._vmops._datastore_browser_mapping
         ds_browser = mock.Mock()
-        moref = vmwareapi_fake.ManagedObjectReference('datastore-100')
+        moref = vmwareapi_fake.ManagedObjectReference(value='datastore-100')
         self.assertIsNone(cache.get(moref.value))
         mock_call_method = mock.Mock(return_value=ds_browser)
         with mock.patch.object(self._session, '_call_method',