openstack/charm-neutron-api
Code Issues Proposed changes

Enable neutron dynamic routing agent

Browse Source 
Support the neutron dynamic routing agent. A subsequent charm,
neutron-dynamic-routing, will implement the agent. Neutron-api
needs to enable the plugin and install the correct packages.

Change-Id: I2c58bae47f672fe285b7fc59cd13636475d57ed2
This commit is contained in:
David Ames 2018-02-09 19:14:48 +00:00
parent 892666557c
commit 96581bdc50
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -10,3 +10,4 @@ trusty/
xenial/ xenial/
.stestr .stestr
__pycache__ __pycache__
func-results.json

6
hooks/neutron_api_context.py
View File

@ -476,9 +476,11 @@ class NeutronCCContext(context.NeutronContext):
'ocata': ['router', 'firewall', 'vpnaas', 'metering', 'ocata': ['router', 'firewall', 'vpnaas', 'metering',
('neutron_lbaas.services.loadbalancer.plugin.' ('neutron_lbaas.services.loadbalancer.plugin.'
'LoadBalancerPluginv2'), 'segments'], 'LoadBalancerPluginv2'), 'segments'],
'pike': ['router', 'firewall', 'metering', 'pike': ['router', 'firewall', 'metering', 'segments',
('neutron_lbaas.services.loadbalancer.plugin.' ('neutron_lbaas.services.loadbalancer.plugin.'
'LoadBalancerPluginv2'), 'segments'], 'LoadBalancerPluginv2'),
('neutron_dynamic_routing.'
'services.bgp.bgp_plugin.BgpPlugin')],
} }
ctxt['service_plugins'] = service_plugins.get( ctxt['service_plugins'] = service_plugins.get(
release, service_plugins['pike']) release, service_plugins['pike'])

1
hooks/neutron_api_utils.py
View File

@ -388,6 +388,7 @@ def determine_packages(source=None):
packages.extend(KILO_PACKAGES) packages.extend(KILO_PACKAGES)
if CompareOpenStackReleases(release) >= 'pike': if CompareOpenStackReleases(release) >= 'pike':
packages.remove('python-neutron-vpnaas') packages.remove('python-neutron-vpnaas')
packages.append('python-neutron-dynamic-routing')
if release == 'kilo' or CompareOpenStackReleases(release) >= 'mitaka': if release == 'kilo' or CompareOpenStackReleases(release) >= 'mitaka':
packages.append('python-networking-hyperv') packages.append('python-networking-hyperv')

4
unit_tests/test_neutron_api_context.py
View File

@ -849,9 +849,9 @@ class NeutronCCContextTest(CharmTestCase):
# pike # pike
self.os_release.return_value = 'pike' self.os_release.return_value = 'pike'
service_plugins = ( service_plugins = (
'router,firewall,metering,' 'router,firewall,metering,segments,'
'neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2,' 'neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2,'
'segments') 'neutron_dynamic_routing.services.bgp.bgp_plugin.BgpPlugin')
self.assertEqual(context.NeutronCCContext()()['service_plugins'], self.assertEqual(context.NeutronCCContext()()['service_plugins'],
service_plugins) service_plugins)