Merge lp:~hopem/charms/trusty/neutron-api/make-ml2-configurable into lp:~openstack-charmers-archive/charms/trusty/neutron-api/next

[Edward Hope-Morley]

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

charm_lint_check #3223 neutron-api-next for hopem mp255870
    LINT OK: passed

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

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

charm_unit_test #3011 neutron-api-next for hopem mp255870
    UNIT OK: passed

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

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

charm_amulet_test #3040 neutron-api-next for hopem mp255870
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/3040/

[James Page (james-page)]

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2015-03-23 13:17:46 +0000
+++ config.yaml	2015-04-10 17:44:46 +0000
@@ -73,6 +73,11 @@
         gre
         vxlan 
       .
+  vlan-ranges:
+    type: string
+    default: "physnet1:1000:2000"
+    description: |
+      Space-delimited list of network provider vlan id ranges.
   # Quota configuration settings
   quota-security-group:
     default: 10

=== modified file 'hooks/neutron_api_context.py'
--- hooks/neutron_api_context.py	2015-03-31 07:53:39 +0000
+++ hooks/neutron_api_context.py	2015-04-10 17:44:46 +0000
@@ -13,6 +13,9 @@
 from charmhelpers.contrib.openstack.utils import (
     os_release,
 )
+from charmhelpers.contrib.openstack.neutron import (
+    parse_vlan_range_mappings,
+)
 
 
 def get_l2population():
@@ -180,6 +183,14 @@
                     continue
                 if ctxt['nova_url']:
                     return ctxt
+
+        vlan_ranges = config('vlan-ranges')
+        vlan_range_mappings = parse_vlan_range_mappings(vlan_ranges)
+        if vlan_range_mappings:
+            providers = sorted(vlan_range_mappings.keys())
+            ctxt['network_providers'] = ','.join(providers)
+            ctxt['vlan_ranges'] = ','.join(vlan_ranges.split())
+
         return ctxt
 
 

=== modified file 'templates/icehouse/ml2_conf.ini'
--- templates/icehouse/ml2_conf.ini	2014-10-07 08:24:32 +0000
+++ templates/icehouse/ml2_conf.ini	2015-04-10 17:44:46 +0000
@@ -15,10 +15,10 @@
 vni_ranges = 1001:2000
 
 [ml2_type_vlan]
-network_vlan_ranges = physnet1:1000:2000
+network_vlan_ranges = {{ vlan_ranges }}
 
 [ml2_type_flat]
-flat_networks = physnet1
+flat_networks = {{ network_providers }}
 
 [ovs]
 enable_tunneling = True

=== modified file 'unit_tests/test_neutron_api_context.py'
--- unit_tests/test_neutron_api_context.py	2015-03-27 10:59:50 +0000
+++ unit_tests/test_neutron_api_context.py	2015-04-10 17:44:46 +0000
@@ -286,6 +286,8 @@
             'quota_security_group_rule': 100,
             'quota_subnet': 10,
             'quota_vip': 10,
+            'vlan_ranges': 'physnet1:1000:2000',
+            'network_providers': 'physnet1',
         }
         napi_ctxt = context.NeutronCCContext()
         with patch.object(napi_ctxt, '_ensure_packages'):
@@ -317,6 +319,8 @@
             'quota_security_group_rule': 100,
             'quota_subnet': 10,
             'quota_vip': 10,
+            'vlan_ranges': 'physnet1:1000:2000',
+            'network_providers': 'physnet1',
         }
         napi_ctxt = context.NeutronCCContext()
         with patch.object(napi_ctxt, '_ensure_packages'):
@@ -354,6 +358,8 @@
             'quota_security_group_rule': 100,
             'quota_subnet': 10,
             'quota_vip': 10,
+            'vlan_ranges': 'physnet1:1000:2000',
+            'network_providers': 'physnet1',
         }
         napi_ctxt = context.NeutronCCContext()
         with patch.object(napi_ctxt, '_ensure_packages'):