openstack
/
charm-nova-cloud-controller
Code Issues Proposed changes

Merge "Explicitly unset console_access_protocol"

This commit is contained in:
Zuul 2019-09-27 13:58:36 +00:00 committed by Gerrit Code Review
parent 9d8ccd169a dee96d620e
commit b9cdfa8713
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hooks/nova_cc_hooks.py
View File

@ -534,7 +534,7 @@ def console_settings():
rel_settings = {}
proto = common.console_attributes('protocol')
if not proto:
return {}
return {'console_access_protocol': None}
rel_settings['console_keymap'] = hookenv.config('console-keymap')
rel_settings['console_access_protocol'] = proto

8
unit_tests/test_nova_cc_hooks.py
View File

@ -572,6 +572,7 @@ class NovaCCHooksTests(CharmTestCase):
self.relation_set.assert_called_with(
relation_id=None,
console_access_protocol=None,
ca_cert='foocert64',
region='RegionOne',
volume_service='cinder',
@ -608,6 +609,7 @@ class NovaCCHooksTests(CharmTestCase):
hooks.compute_joined()
self.relation_set.assert_called_with(
relation_id=None,
console_access_protocol=None,
quantum_url='http://nova-cc-host1:9696',
ca_cert='foocert64',
quantum_port=9696,
@ -990,6 +992,12 @@ class NovaCCHooksTests(CharmTestCase):
}
self.assertEqual(_con_sets, console_settings)
def test_console_settings_none(self):
self.test_config.set('console-access-protocol', '')
self.assertEqual(
hooks.console_settings(),
{'console_access_protocol': None})
@patch('charmhelpers.contrib.hahelpers.cluster.https')
def test_console_settings_explicit_ip(self, _https):
self.test_config.set('console-access-protocol', 'spice')