From c4d0e55098952ad3180f74357a9256da43bf7d15 Mon Sep 17 00:00:00 2001 From: Matthew Booth Date: Wed, 3 Sep 2014 10:21:51 +0100 Subject: [PATCH] VMware: Fix return type of get_vnc_console() Change I8f6a857b88659ee30b4aa1a25ac52d7e01156a68 changed the return type of get_vnc_console(), but didn't update it in VMwareVCVMOps. Closes-Bug: #1364849 Change-Id: I25edf0a19fa79439ed375ad128d0050718d04cb3 --- nova/tests/virt/vmwareapi/test_driver_api.py | 6 +++--- nova/virt/vmwareapi/vmops.py | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/nova/tests/virt/vmwareapi/test_driver_api.py b/nova/tests/virt/vmwareapi/test_driver_api.py index 1dc82e1e99..c11df01fcf 100644 --- a/nova/tests/virt/vmwareapi/test_driver_api.py +++ b/nova/tests/virt/vmwareapi/test_driver_api.py @@ -1667,9 +1667,9 @@ class VMwareAPIVMTestCase(test.NoDBTestCase): OptionValue = collections.namedtuple('OptionValue', ['key', 'value']) opt_val = OptionValue(key='', value=5906) fake_vm.set(vm_util.VNC_CONFIG_KEY, opt_val) - vnc_dict = self.conn.get_vnc_console(self.context, self.instance) - self.assertEqual(vnc_dict['host'], self.vnc_host) - self.assertEqual(vnc_dict['port'], 5906) + vnc_console = self.conn.get_vnc_console(self.context, self.instance) + self.assertEqual(self.vnc_host, vnc_console.host) + self.assertEqual(5906, vnc_console.port) def test_get_vnc_console(self): self._test_get_vnc_console() diff --git a/nova/virt/vmwareapi/vmops.py b/nova/virt/vmwareapi/vmops.py index 3105dc76f3..6fcbbd0f9b 100644 --- a/nova/virt/vmwareapi/vmops.py +++ b/nova/virt/vmwareapi/vmops.py @@ -33,6 +33,7 @@ from nova import compute from nova.compute import power_state from nova.compute import task_states from nova.compute import vm_states +from nova.console import type as ctype from nova import context as nova_context from nova import exception from nova.i18n import _, _LE @@ -1654,4 +1655,4 @@ class VMwareVMOps(object): LOG.debug("VM %(uuid)s is currently on host %(host_name)s", {'uuid': instance.name, 'host_name': host_name}, instance=instance) - return vnc_console + return ctype.ConsoleVNC(**vnc_console)