diff --git a/.gitignore b/.gitignore index 2d7b42f2..b44e2dca 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ trusty/ xenial/ .stestr __pycache__ +func-results.json diff --git a/hooks/neutron_api_context.py b/hooks/neutron_api_context.py index 21b79db9..9682b923 100644 --- a/hooks/neutron_api_context.py +++ b/hooks/neutron_api_context.py @@ -476,9 +476,11 @@ class NeutronCCContext(context.NeutronContext): 'ocata': ['router', 'firewall', 'vpnaas', 'metering', ('neutron_lbaas.services.loadbalancer.plugin.' 'LoadBalancerPluginv2'), 'segments'], - 'pike': ['router', 'firewall', 'metering', + 'pike': ['router', 'firewall', 'metering', 'segments', ('neutron_lbaas.services.loadbalancer.plugin.' - 'LoadBalancerPluginv2'), 'segments'], + 'LoadBalancerPluginv2'), + ('neutron_dynamic_routing.' + 'services.bgp.bgp_plugin.BgpPlugin')], } ctxt['service_plugins'] = service_plugins.get( release, service_plugins['pike']) diff --git a/hooks/neutron_api_utils.py b/hooks/neutron_api_utils.py index 56623280..74f0f8c7 100755 --- a/hooks/neutron_api_utils.py +++ b/hooks/neutron_api_utils.py @@ -388,6 +388,7 @@ def determine_packages(source=None): packages.extend(KILO_PACKAGES) if CompareOpenStackReleases(release) >= 'pike': packages.remove('python-neutron-vpnaas') + packages.append('python-neutron-dynamic-routing') if release == 'kilo' or CompareOpenStackReleases(release) >= 'mitaka': packages.append('python-networking-hyperv') diff --git a/unit_tests/test_neutron_api_context.py b/unit_tests/test_neutron_api_context.py index f800f771..0a122cba 100644 --- a/unit_tests/test_neutron_api_context.py +++ b/unit_tests/test_neutron_api_context.py @@ -849,9 +849,9 @@ class NeutronCCContextTest(CharmTestCase): # pike self.os_release.return_value = 'pike' service_plugins = ( - 'router,firewall,metering,' + 'router,firewall,metering,segments,' 'neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2,' - 'segments') + 'neutron_dynamic_routing.services.bgp.bgp_plugin.BgpPlugin') self.assertEqual(context.NeutronCCContext()()['service_plugins'], service_plugins)