openstack/charm-neutron-api
Code Issues Proposed changes

add internal endpoints to neutron-plugin-api relation data

Browse Source 
The change [1] syncs the charmhelpers that has additional
context data to IdentityServiceContext - internal_host,
internal_port, internal_protocol.

This patch adds the internal_host, internal_port,
internal_protocol to neutron-plugin-api relation data.
Without this patch, any relations over neutron-plugin-api
will be incomplete if the charm holding the other end of
the relation has charmhelpers synced.

[1] https://review.opendev.org/c/openstack/charm-neutron-api/+/806676

Change-Id: Ic4abbd0a408949c0c752a1701db161e1cd5c4ff7
This commit is contained in:
Hemanth Nakkina 2021-09-08 11:32:22 +05:30
parent 69af89a615
commit c7d8ee4c86
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hooks/neutron_api_hooks.py
View File

@ -585,6 +585,9 @@ def neutron_plugin_api_relation_joined(rid=None):
'service_tenant': identity_ctxt.get('admin_tenant_name'), 'service_tenant': identity_ctxt.get('admin_tenant_name'),
'service_username': identity_ctxt.get('admin_user'), 'service_username': identity_ctxt.get('admin_user'),
'service_password': identity_ctxt.get('admin_password'), 'service_password': identity_ctxt.get('admin_password'),
'internal_host': identity_ctxt.get('internal_host'),
'internal_port': identity_ctxt.get('internal_port'),
'internal_protocol': identity_ctxt.get('internal_protocol'),
'region': config('region'), 'region': config('region'),
}) })

24
unit_tests/test_neutron_api_hooks.py
View File

@ -540,6 +540,9 @@ class NeutronAPIHooksTests(CharmTestCase):
'auth_host': None, 'auth_host': None,
'service_username': None, 'service_username': None,
'service_host': None, 'service_host': None,
'internal_host': None,
'internal_port': None,
'internal_protocol': None,
'neutron-api-ready': 'no', 'neutron-api-ready': 'no',
'enable-nsg-logging': False, 'enable-nsg-logging': False,
'enable-nfg-logging': False, 'enable-nfg-logging': False,
@ -587,6 +590,9 @@ class NeutronAPIHooksTests(CharmTestCase):
'auth_host': None, 'auth_host': None,
'service_username': None, 'service_username': None,
'service_host': None, 'service_host': None,
'internal_host': None,
'internal_port': None,
'internal_protocol': None,
'neutron-api-ready': 'no', 'neutron-api-ready': 'no',
'enable-nsg-logging': True, 'enable-nsg-logging': True,
'enable-nfg-logging': False, 'enable-nfg-logging': False,
@ -640,6 +646,9 @@ class NeutronAPIHooksTests(CharmTestCase):
'auth_host': None, 'auth_host': None,
'service_username': None, 'service_username': None,
'service_host': None, 'service_host': None,
'internal_host': None,
'internal_port': None,
'internal_protocol': None,
'neutron-api-ready': 'no', 'neutron-api-ready': 'no',
'enable-nsg-logging': False, 'enable-nsg-logging': False,
'enable-nfg-logging': True, 'enable-nfg-logging': True,
@ -686,6 +695,9 @@ class NeutronAPIHooksTests(CharmTestCase):
'auth_protocol': None, 'auth_protocol': None,
'service_tenant': None, 'service_tenant': None,
'service_port': None, 'service_port': None,
'internal_host': None,
'internal_port': None,
'internal_protocol': None,
'region': 'RegionOne', 'region': 'RegionOne',
'service_password': None, 'service_password': None,
'auth_port': None, 'auth_port': None,
@ -744,6 +756,9 @@ class NeutronAPIHooksTests(CharmTestCase):
'auth_host': None, 'auth_host': None,
'service_username': None, 'service_username': None,
'service_host': None, 'service_host': None,
'internal_host': None,
'internal_port': None,
'internal_protocol': None,
'neutron-api-ready': 'no', 'neutron-api-ready': 'no',
'enable-nsg-logging': False, 'enable-nsg-logging': False,
'enable-nfg-logging': False, 'enable-nfg-logging': False,
@ -791,6 +806,9 @@ class NeutronAPIHooksTests(CharmTestCase):
'auth_host': None, 'auth_host': None,
'service_username': None, 'service_username': None,
'service_host': None, 'service_host': None,
'internal_host': None,
'internal_port': None,
'internal_protocol': None,
'neutron-api-ready': 'no', 'neutron-api-ready': 'no',
'enable-nsg-logging': False, 'enable-nsg-logging': False,
'enable-nfg-logging': False, 'enable-nfg-logging': False,
@ -840,6 +858,9 @@ class NeutronAPIHooksTests(CharmTestCase):
'auth_host': None, 'auth_host': None,
'service_username': None, 'service_username': None,
'service_host': None, 'service_host': None,
'internal_host': None,
'internal_port': None,
'internal_protocol': None,
'neutron-api-ready': 'no', 'neutron-api-ready': 'no',
'enable-nsg-logging': False, 'enable-nsg-logging': False,
'enable-nfg-logging': False, 'enable-nfg-logging': False,
@ -887,6 +908,9 @@ class NeutronAPIHooksTests(CharmTestCase):
'auth_host': None, 'auth_host': None,
'service_username': None, 'service_username': None,
'service_host': None, 'service_host': None,
'internal_host': None,
'internal_port': None,
'internal_protocol': None,
'neutron-api-ready': 'no', 'neutron-api-ready': 'no',
'dns-domain': 'openstack.example.', 'dns-domain': 'openstack.example.',
'enable-nsg-logging': False, 'enable-nsg-logging': False,