Merge "Fix VMware fakes"

warpkwd · Sep 2, 2013 · c3e8517 · c3e8517
2 parents c55932f + cf681ca
commit c3e8517
Show file tree

Hide file tree

Showing 3 changed files with 169 additions and 102 deletions.
diff --git a/nova/tests/virt/vmwareapi/test_vmwareapi.py b/nova/tests/virt/vmwareapi/test_vmwareapi.py
@@ -592,11 +592,13 @@ def test_get_vnc_console_non_existent(self):
                           self.instance)
 
     def test_get_vnc_console(self):
-        self._create_instance_in_the_db()
         self._create_vm()
+        fake_vm = vmwareapi_fake._get_objects("VirtualMachine").objects[0]
+        fake_vm_id = int(fake_vm.obj.value.replace('vm-', ''))
         vnc_dict = self.conn.get_vnc_console(self.instance)
         self.assertEquals(vnc_dict['host'], "ha-host")
-        self.assertEquals(vnc_dict['port'], 5910)
+        self.assertEquals(vnc_dict['port'], cfg.CONF.vmware.vnc_port +
+                          fake_vm_id % cfg.CONF.vmware.vnc_port_total)
 
     def test_host_ip_addr(self):
         self.assertEquals(self.conn.get_host_ip_addr(), "test_url")

diff --git a/nova/tests/virt/vmwareapi/test_vmwareapi_vm_util.py b/nova/tests/virt/vmwareapi/test_vmwareapi_vm_util.py
@@ -107,12 +107,9 @@ def test_get_datastore_ref_and_name_without_datastore(self):
                 fake_session(), cluster="fake-cluster")
 
     def test_get_host_ref_from_id(self):
-
-        fake_host_sys = fake.HostSystem(
-            fake.ManagedObjectReference("HostSystem", "host-123"))
-
-        fake_host_id = fake_host_sys.obj.value
         fake_host_name = "ha-host"
+        fake_host_sys = fake.HostSystem(fake_host_name)
+        fake_host_id = fake_host_sys.obj.value
         fake_objects = fake.FakeRetrieveResult()
         fake_objects.add_object(fake_host_sys)
         ref = vm_util.get_host_ref_from_id(
@@ -126,12 +123,10 @@ def test_get_host_ref_from_id(self):
         self.assertEquals(fake_host_name, host_name)
 
     def test_get_host_name_for_vm(self):
-
-        fake_vm = fake.ManagedObject(
-            "VirtualMachine", fake.ManagedObjectReference(
-                "vm-123", "VirtualMachine"))
-        fake_vm.propSet.append(
-            fake.Property('name', 'vm-123'))
+        fake_host = fake.HostSystem()
+        fake_host_id = fake_host.obj.value
+        fake_vm = fake.VirtualMachine(name='vm-123',
+                                      runtime_host=fake_host.obj)
         fake_objects = fake.FakeRetrieveResult()
         fake_objects.add_object(fake_vm)
 
@@ -140,22 +135,10 @@ def test_get_host_name_for_vm(self):
 
         self.assertIsNotNone(vm_ref)
 
-        fake_results = [
-            fake.ObjectContent(
-                None, [
-                    fake.Property('runtime.host',
-                              fake.ManagedObjectReference(
-                                'host-123', 'HostSystem'))
-                ])]
-
-        fake_objects = fake.FakeRetrieveResult()
-        for results in fake_results:
-            fake_objects.add_object(results)
-
         host_id = vm_util.get_host_id_from_vm_ref(
             fake_session(fake_objects), vm_ref)
 
-        self.assertEqual('host-123', host_id)
+        self.assertEqual(fake_host_id, host_id)
 
     def test_property_from_property_set(self):