openstack
/
charm-neutron-openvswitch
Code Issues Proposed changes

Provide configured hostname over subordinate relation 

Change-Id: I75cbc5eb97cf3603ffa5a9a49670411288d90520
Closes-Bug: #1845303
This commit is contained in:
Frode Nordahl 2019-10-01 07:46:55 +02:00
parent 85b1a9656a
commit 32d7c17b7f
No known key found for this signature in database
GPG Key ID: 6A5D59A3BA48373F
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hooks/neutron_ovs_hooks.py
View File

@ -72,6 +72,8 @@ from neutron_ovs_utils import (
enable_sriov,
)
import neutron_ovs_context
hooks = Hooks()
CONFIGS = register_configs()
@ -197,6 +199,9 @@ def neutron_plugin_joined(relation_id=None, request_restart=False):
rel_data = {
'metadata-shared-secret': secret,
}
host = neutron_ovs_context.HostIPContext()().get('host')
if host:
rel_data.update({'host': host})
if request_restart:
rel_data['restart-nonce'] = str(uuid.uuid4())
relation_set(relation_id=relation_id, **rel_data)

15
unit_tests/test_neutron_ovs_hooks.py
View File

@ -178,14 +178,17 @@ class NeutronOVSHooksTests(CharmTestCase):
'libnetfilter-log1',
'keepalived'])
def test_neutron_plugin_joined_dvr_dhcp(self):
@patch.object(hooks.neutron_ovs_context, 'HostIPContext')
def test_neutron_plugin_joined_dvr_dhcp(self, _HostIPContext):
self.enable_nova_metadata.return_value = True
self.enable_local_dhcp.return_value = True
self.use_dvr.return_value = True
self.get_shared_secret.return_value = 'secret'
_HostIPContext()().get.return_value = 'fq.dn'
self._call_hook('neutron-plugin-relation-joined')
rel_data = {
'metadata-shared-secret': 'secret',
'host': 'fq.dn',
}
self.relation_set.assert_called_with(
relation_id=None,
@ -193,14 +196,17 @@ class NeutronOVSHooksTests(CharmTestCase):
)
self.assertTrue(self.install_packages.called)
def test_neutron_plugin_joined_dvr_nodhcp(self):
@patch.object(hooks.neutron_ovs_context, 'HostIPContext')
def test_neutron_plugin_joined_dvr_nodhcp(self, _HostIPContext):
self.enable_nova_metadata.return_value = True
self.enable_local_dhcp.return_value = False
self.use_dvr.return_value = True
self.get_shared_secret.return_value = 'secret'
_HostIPContext()().get.return_value = 'fq.dn'
self._call_hook('neutron-plugin-relation-joined')
rel_data = {
'metadata-shared-secret': 'secret',
'host': 'fq.dn',
}
self.relation_set.assert_called_with(
relation_id=None,
@ -209,14 +215,17 @@ class NeutronOVSHooksTests(CharmTestCase):
self.purge_packages.assert_called_with(['neutron-dhcp-agent'])
self.assertFalse(self.install_packages.called)
def test_neutron_plugin_joined_nodvr_nodhcp(self):
@patch.object(hooks.neutron_ovs_context, 'HostIPContext')
def test_neutron_plugin_joined_nodvr_nodhcp(self, _HostIPContext):
self.enable_nova_metadata.return_value = False
self.enable_local_dhcp.return_value = False
self.use_dvr.return_value = False
self.get_shared_secret.return_value = 'secret'
_HostIPContext()().get.return_value = 'fq.dn'
self._call_hook('neutron-plugin-relation-joined')
rel_data = {
'metadata-shared-secret': None,
'host': 'fq.dn',
}
self.relation_set.assert_called_with(
relation_id=None,