From 573997fa381038031476b79d76a022d8d34ec0a1 Mon Sep 17 00:00:00 2001 From: Liam Young Date: Fri, 21 Jun 2019 09:06:59 +0000 Subject: [PATCH] Pass global-physnet-mtu on neutron-plugin-api Charms related to neutron-api on the neutron-plugin-api relation can use the global-physnet-mtu and physical-network-mtus to set mtus on the devices they manage. Change-Id: I18aabe17549d99383d9c13c24879d794719feca7 --- hooks/neutron_api_hooks.py | 2 ++ unit_tests/test_neutron_api_hooks.py | 14 ++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/hooks/neutron_api_hooks.py b/hooks/neutron_api_hooks.py index 9c2223b7..36cc3d98 100755 --- a/hooks/neutron_api_hooks.py +++ b/hooks/neutron_api_hooks.py @@ -499,6 +499,8 @@ def neutron_plugin_api_relation_joined(rid=None): 'polling-interval': config('polling-interval'), 'rpc-response-timeout': config('rpc-response-timeout'), 'report-interval': config('report-interval'), + 'global-physnet-mtu': config('global-physnet-mtu'), + 'physical-network-mtus': config('physical-network-mtus'), } # Provide this value to relations since it needs to be set in multiple diff --git a/unit_tests/test_neutron_api_hooks.py b/unit_tests/test_neutron_api_hooks.py index 255c1424..61f24293 100644 --- a/unit_tests/test_neutron_api_hooks.py +++ b/unit_tests/test_neutron_api_hooks.py @@ -525,6 +525,8 @@ class NeutronAPIHooksTests(CharmTestCase): 'neutron-api-ready': 'no', 'enable-nsg-logging': False, 'enable-nfg-logging': False, + 'global-physnet-mtu': 1500, + 'physical-network-mtus': None, } self.is_qos_requested_and_valid.return_value = False self.is_vlan_trunking_requested_and_valid.return_value = False @@ -568,6 +570,8 @@ class NeutronAPIHooksTests(CharmTestCase): 'neutron-api-ready': 'no', 'enable-nsg-logging': True, 'enable-nfg-logging': False, + 'global-physnet-mtu': 1500, + 'physical-network-mtus': None, } self.is_qos_requested_and_valid.return_value = False @@ -617,6 +621,8 @@ class NeutronAPIHooksTests(CharmTestCase): 'neutron-api-ready': 'no', 'enable-nsg-logging': False, 'enable-nfg-logging': True, + 'global-physnet-mtu': 1500, + 'physical-network-mtus': None, } self.is_qos_requested_and_valid.return_value = False @@ -665,6 +671,8 @@ class NeutronAPIHooksTests(CharmTestCase): 'neutron-api-ready': 'no', 'enable-nsg-logging': False, 'enable-nfg-logging': False, + 'global-physnet-mtu': 1500, + 'physical-network-mtus': None, } self.is_qos_requested_and_valid.return_value = False self.is_vlan_trunking_requested_and_valid.return_value = False @@ -708,6 +716,8 @@ class NeutronAPIHooksTests(CharmTestCase): 'neutron-api-ready': 'no', 'enable-nsg-logging': False, 'enable-nfg-logging': False, + 'global-physnet-mtu': 1500, + 'physical-network-mtus': None, } self.is_qos_requested_and_valid.return_value = False self.is_vlan_trunking_requested_and_valid.return_value = False @@ -753,6 +763,8 @@ class NeutronAPIHooksTests(CharmTestCase): 'neutron-api-ready': 'no', 'enable-nsg-logging': False, 'enable-nfg-logging': False, + 'global-physnet-mtu': 1500, + 'physical-network-mtus': None, } self.is_qos_requested_and_valid.return_value = False self.is_vlan_trunking_requested_and_valid.return_value = False @@ -797,6 +809,8 @@ class NeutronAPIHooksTests(CharmTestCase): 'dns-domain': 'openstack.example.', 'enable-nsg-logging': False, 'enable-nfg-logging': False, + 'global-physnet-mtu': 1500, + 'physical-network-mtus': None, } self.is_qos_requested_and_valid.return_value = False self.is_vlan_trunking_requested_and_valid.return_value = False