Merge lp:~james-page/charms/trusty/neutron-api/kilo-dvr-stable into lp:~openstack-charmers-archive/charms/trusty/neutron-api/trunk

[James Page]

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #4470 neutron-api for james-page mp258750
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/4470/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #4195 neutron-api for james-page mp258750
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/4195/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #4093 neutron-api for james-page mp258750
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/11104327/
Build: http://10.245.162.77:8080/job/charm_amulet_test/4093/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #7166 neutron-api for james-page mp258750
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/7166/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #7750 neutron-api for james-page mp258750
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/7750/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #12354 neutron-api for james-page mp258750
    LINT FAIL: lint-test failed
    LINT FAIL: charm-proof failed

LINT Results (max last 2 lines):
make: *** [lint] Error 100
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/12895653/
Build: http://10.245.162.77:8080/job/charm_lint_check/12354/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #11467 neutron-api for james-page mp258750
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/11467/

Unmerged revisions

114. By James Page on 2015-05-11

Add support of all overlay network types for kilo dvr.

Allow multiple overlay network types to be used in a cloud.

=== modified file 'config.yaml'
--- config.yaml	2015-04-16 19:58:18 +0000
+++ config.yaml	2015-05-11 10:48:04 +0000
@@ -84,11 +84,12 @@
     default: gre
     type: string
     description: |
-      Overlay network type to use choose one of:
+      Overlay network types to use, valid options include:
       .
         gre
-        vxlan 
+        vxlan
       .
+      Multiple types can be provided - field is space delimited.
   flat-network-providers:
     type: string
     default:

=== modified file 'hooks/neutron_api_context.py'
--- hooks/neutron_api_context.py	2015-04-15 14:08:39 +0000
+++ hooks/neutron_api_context.py	2015-05-11 10:48:04 +0000
@@ -14,6 +14,11 @@
     os_release,
 )
 
+VLAN = 'vlan'
+VXLAN = 'vxlan'
+GRE = 'gre'
+OVERLAY_NET_TYPES = [VXLAN, GRE]
+
 
 def get_l2population():
     plugin = config('neutron-plugin')
@@ -21,10 +26,12 @@
 
 
 def get_overlay_network_type():
-    overlay_net = config('overlay-network-type')
-    if overlay_net not in ['vxlan', 'gre']:
-        raise Exception('Unsupported overlay-network-type')
-    return overlay_net
+    overlay_networks = config('overlay-network-type').split()
+    for overlay_net in overlay_networks:
+        if overlay_net not in OVERLAY_NET_TYPES:
+            raise ValueError('Unsupported overlay-network-type %s'
+                             % overlay_net)
+    return ','.join(overlay_networks)
 
 
 def get_l3ha():
@@ -32,10 +39,6 @@
         if os_release('neutron-server') < 'juno':
             log('Disabling L3 HA, enable-l3ha is not valid before Juno')
             return False
-        if config('overlay-network-type') not in ['vlan', 'gre', 'vxlan']:
-            log('Disabling L3 HA, enable-l3ha requires the use of the vxlan, '
-                'vlan or gre overlay network')
-            return False
         if get_l2population():
             log('Disabling L3 HA, l2-population must be disabled with L3 HA')
             return False
@@ -49,10 +52,11 @@
         if os_release('neutron-server') < 'juno':
             log('Disabling DVR, enable-dvr is not valid before Juno')
             return False
-        if config('overlay-network-type') != 'vxlan':
-            log('Disabling DVR, enable-dvr requires the use of the vxlan '
-                'overlay network')
-            return False
+        if os_release('neutron-server') == 'juno':
+            if VXLAN not in config('overlay-network-type').split():
+                log('Disabling DVR, enable-dvr requires the use of the vxlan '
+                    'overlay network for OpenStack Juno')
+                return False
         if get_l3ha():
             log('Disabling DVR, enable-l3ha must be disabled with dvr')
             return False

=== modified file 'templates/icehouse/ml2_conf.ini'
--- templates/icehouse/ml2_conf.ini	2015-04-10 17:42:31 +0000
+++ templates/icehouse/ml2_conf.ini	2015-05-11 10:48:04 +0000
@@ -4,8 +4,8 @@
 # Configuration file maintained by Juju. Local changes may be overwritten.  
 ###############################################################################
 [ml2]
-type_drivers = gre,vxlan,vlan,flat
-tenant_network_types = gre,vxlan,vlan,flat
+type_drivers = {{ overlay_network_type }},vlan,flat
+tenant_network_types = {{ overlay_network_type }},vlan,flat
 mechanism_drivers = openvswitch,hyperv,l2population
 
 [ml2_type_gre]

=== modified file 'templates/kilo/ml2_conf.ini'
--- templates/kilo/ml2_conf.ini	2015-04-15 14:25:38 +0000
+++ templates/kilo/ml2_conf.ini	2015-05-11 10:48:04 +0000
@@ -4,8 +4,8 @@
 # Configuration file maintained by Juju. Local changes may be overwritten.  
 ###############################################################################
 [ml2]
-type_drivers = gre,vxlan,vlan,flat
-tenant_network_types = gre,vxlan,vlan,flat
+type_drivers = {{ overlay_network_type }},vlan,flat
+tenant_network_types = {{ overlay_network_type }},vlan,flat
 mechanism_drivers = openvswitch,l2population
 
 [ml2_type_gre]

=== modified file 'unit_tests/test_neutron_api_context.py'
--- unit_tests/test_neutron_api_context.py	2015-04-15 14:08:39 +0000
+++ unit_tests/test_neutron_api_context.py	2015-05-11 10:48:04 +0000
@@ -34,12 +34,16 @@
         self.test_config.set('overlay-network-type', 'gre')
         self.assertEquals(context.get_overlay_network_type(), 'gre')
 
+    def test_get_overlay_network_type_multi(self):
+        self.test_config.set('overlay-network-type', 'gre vxlan')
+        self.assertEquals(context.get_overlay_network_type(), 'gre,vxlan')
+
     def test_get_overlay_network_type_unsupported(self):
         self.test_config.set('overlay-network-type', 'tokenring')
-        with self.assertRaises(Exception) as _exceptctxt:
+        with self.assertRaises(ValueError) as _exceptctxt:
             context.get_overlay_network_type()
         self.assertEqual(_exceptctxt.exception.message,
-                         'Unsupported overlay-network-type')
+                         'Unsupported overlay-network-type tokenring')
 
     def test_get_l3ha(self):
         self.test_config.set('enable-l3ha', True)
@@ -65,14 +69,6 @@
         self.os_release.return_value = 'juno'
         self.assertEquals(context.get_l3ha(), False)
 
-    def test_get_l3ha_badoverlay(self):
-        self.test_config.set('enable-l3ha', True)
-        self.test_config.set('overlay-network-type', 'tokenring')
-        self.test_config.set('neutron-plugin', 'ovs')
-        self.test_config.set('l2-population', False)
-        self.os_release.return_value = 'juno'
-        self.assertEquals(context.get_l3ha(), False)
-
     def test_get_dvr(self):
         self.test_config.set('enable-dvr', True)
         self.test_config.set('enable-l3ha', False)
@@ -109,6 +105,24 @@
         self.os_release.return_value = 'juno'
         self.assertEquals(context.get_dvr(), False)
 
+    def test_get_dvr_gre_kilo(self):
+        self.test_config.set('enable-dvr', True)
+        self.test_config.set('enable-l3ha', False)
+        self.test_config.set('overlay-network-type', 'gre')
+        self.test_config.set('neutron-plugin', 'ovs')
+        self.test_config.set('l2-population', True)
+        self.os_release.return_value = 'kilo'
+        self.assertEquals(context.get_dvr(), True)
+
+    def test_get_dvr_vxlan_kilo(self):
+        self.test_config.set('enable-dvr', True)
+        self.test_config.set('enable-l3ha', False)
+        self.test_config.set('overlay-network-type', 'vxlan')
+        self.test_config.set('neutron-plugin', 'ovs')
+        self.test_config.set('l2-population', True)
+        self.os_release.return_value = 'kilo'
+        self.assertEquals(context.get_dvr(), True)
+
     def test_get_dvr_l3ha_on(self):
         self.test_config.set('enable-dvr', True)
         self.test_config.set('enable-l3ha', True)