openstack
/
nova
Code Issues Proposed changes

Merge "VMware: enable VNC access without user having to enter password"

This commit is contained in:
Jenkins 2013-09-26 13:09:30 +00:00 committed by Gerrit Code Review
parent e8adff58b7 2116d1033e
commit 25630d0d06
5 changed files with 68 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
etc/nova/nova.conf.sample
View File

@ -3287,7 +3287,10 @@
# Total number of VNC ports (integer value)
#vnc_port_total=10000
# VNC password (string value)
# DEPRECATED. VNC password. The password-based access to VNC
# consoles will be removed in the next release. The default
# value will disable password protection on the VNC console.
# (string value)
#vnc_password=<None>
# Whether to use linked clone (boolean value)

22
nova/tests/virt/vmwareapi/test_vmwareapi.py
View File

@ -137,6 +137,7 @@ class VMwareAPIVMTestCase(test.NoDBTestCase):
'size': 512,
}
nova.tests.image.fake.stub_out_image_service(self.stubs)
self.vnc_host = 'test_url'
def tearDown(self):
super(VMwareAPIVMTestCase, self).tearDown()
@ -682,15 +683,22 @@ class VMwareAPIVMTestCase(test.NoDBTestCase):
self.conn.get_vnc_console,
self.instance)
def test_get_vnc_console(self):
def _test_get_vnc_console(self):
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'], 'test_url')
self.assertEquals(vnc_dict['host'], self.vnc_host)
self.assertEquals(vnc_dict['port'], cfg.CONF.vmware.vnc_port +
fake_vm_id % cfg.CONF.vmware.vnc_port_total)
def test_get_vnc_console(self):
self._test_get_vnc_console()
def test_get_vnc_console_with_password(self):
self.flags(vnc_password='vmware', group='vmware')
self._test_get_vnc_console()
def test_host_ip_addr(self):
self.assertEquals(self.conn.get_host_ip_addr(), "test_url")
@ -929,6 +937,7 @@ class VMwareAPIVCDriverTestCase(VMwareAPIVMTestCase):
self.conn = driver.VMwareVCDriver(None, False)
self.node_name = self.conn._resources.keys()[0]
self.node_name2 = self.conn._resources.keys()[1]
self.vnc_host = 'ha-host'
def tearDown(self):
super(VMwareAPIVCDriverTestCase, self).tearDown()
@ -995,15 +1004,6 @@ class VMwareAPIVCDriverTestCase(VMwareAPIVMTestCase):
self._test_finish_revert_migration(power_on=False)
self.assertEquals(False, self.power_on_called)
def test_get_vnc_console(self):
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'], cfg.CONF.vmware.vnc_port +
fake_vm_id % cfg.CONF.vmware.vnc_port_total)
def test_snapshot(self):
# Ensure VMwareVCVMOps's get_copy_virtual_disk_spec is getting called
self.mox.StubOutWithMock(vmops.VMwareVCVMOps,

37
nova/tests/virt/vmwareapi/test_vmwareapi_vm_util.py
View File

@ -281,3 +281,40 @@ class VMwareVMUtilTestCase(test.NoDBTestCase):
self.assertEqual("lsiLogic", vmdk_adapter_type)
vmdk_adapter_type = vm_util.get_vmdk_adapter_type("dummyAdapter")
self.assertEqual("dummyAdapter", vmdk_adapter_type)
def _test_get_vnc_config_spec(self, port, password):
result = vm_util.get_vnc_config_spec(fake.FakeFactory(),
port, password)
return result
def test_get_vnc_config_spec(self):
result = self._test_get_vnc_config_spec(7, None)
expected = """{'extraConfig': [
{'value': 'true',
'key': 'RemoteDisplay.vnc.enabled',
'obj_name': 'ns0:OptionValue'},
{'value': 7,
'key': 'RemoteDisplay.vnc.port',
'obj_name': 'ns0:OptionValue'}],
'obj_name': 'ns0:VirtualMachineConfigSpec'}"""
expected = re.sub(r'\s+', '', expected)
result = re.sub(r'\s+', '', repr(result))
self.assertEqual(expected, result)
def test_get_vnc_config_spec_password(self):
result = self._test_get_vnc_config_spec(7, 'password')
expected = """{'extraConfig': [
{'value': 'true',
'key': 'RemoteDisplay.vnc.enabled',
'obj_name': 'ns0:OptionValue'},
{'value': 7,
'key': 'RemoteDisplay.vnc.port',
'obj_name': 'ns0:OptionValue'},
{'value':'password',
'key':'RemoteDisplay.vnc.password',
'obj_name':'ns0:OptionValue'}],
'obj_name': 'ns0:VirtualMachineConfigSpec'}"""
expected = re.sub(r'\s+', '', expected)
result = re.sub(r'\s+', '', repr(result))
self.assertEqual(expected, result)

6
nova/virt/vmwareapi/driver.py
View File

@ -99,10 +99,14 @@ vmwareapi_opts = [
deprecated_name='vnc_port_total',
deprecated_group='DEFAULT',
help='Total number of VNC ports'),
# Deprecated, remove in Icehouse
cfg.StrOpt('vnc_password',
deprecated_name='vnc_password',
deprecated_group='DEFAULT',
help='VNC password',
help='DEPRECATED. VNC password. The password-based access to '
'VNC consoles will be removed in the next release. The '
'default value will disable password protection on the '
'VNC console.',
secret=True),
cfg.BoolOpt('use_linked_clone',
default=True,

16
nova/virt/vmwareapi/vm_util.py
View File

@ -27,7 +27,6 @@ from nova.openstack.common.gettextutils import _
from nova.openstack.common import log as logging
from nova.virt.vmwareapi import vim_util
LOG = logging.getLogger(__name__)
@ -569,10 +568,17 @@ def get_vnc_config_spec(client_factory, port, password):
opt_port = client_factory.create('ns0:OptionValue')
opt_port.key = "RemoteDisplay.vnc.port"
opt_port.value = port
opt_pass = client_factory.create('ns0:OptionValue')
opt_pass.key = "RemoteDisplay.vnc.password"
opt_pass.value = password
virtual_machine_config_spec.extraConfig = [opt_enabled, opt_port, opt_pass]
extras = [opt_enabled, opt_port]
if password:
LOG.deprecated(_("The password-based access to VNC consoles will be "
"removed in the next release. Please, switch to "
"using the default value (this will disable password "
"protection on the VNC console)."))
opt_pass = client_factory.create('ns0:OptionValue')
opt_pass.key = "RemoteDisplay.vnc.password"
opt_pass.value = password
extras.append(opt_pass)
virtual_machine_config_spec.extraConfig = extras
return virtual_machine_config_spec