Merge "Enable neutron dynamic routing agent"

.gitignore

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

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'])

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')

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)