[hopem,r=]

Allow flat network providers to be configured seperately to vlan
providers.

Closes-Bug: 1444470

config.yaml

@@ -73,11 +73,17 @@ options:
         gre
         vxlan 
       .
+  flat-network-providers:
+    type: string
+    default:
+    description: |
+      Space-delimited list of Neutron flat network providers.
   vlan-ranges:
     type: string
     default: "physnet1:1000:2000"
     description: |
-      Space-delimited list of network provider vlan id ranges.
+      Space-delimited list of Neutron network-provider & vlan-id-ranges using
+      the following format (<provider>:<start>:<end>).
   # Quota configuration settings
   quota-security-group:
     default: 10

hooks/neutron_api_context.py

@@ -13,9 +13,6 @@ from charmhelpers.contrib.hahelpers.cluster import (
 from charmhelpers.contrib.openstack.utils import (
     os_release,
 )
-from charmhelpers.contrib.openstack.neutron import (
-    parse_vlan_range_mappings,
-)
 
 
 def get_l2population():
@@ -193,11 +190,12 @@ class NeutronCCContext(context.NeutronContext):
         if n_api_settings:
             ctxt.update(n_api_settings)
 
+        flat_providers = config('flat-network-providers')
+        if flat_providers:
+            ctxt['network_providers'] = ','.join(flat_providers.split())
+
         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)
+        if vlan_ranges:
             ctxt['vlan_ranges'] = ','.join(vlan_ranges.split())
 
         return ctxt

unit_tests/test_neutron_api_context.py

@@ -287,7 +287,6 @@ class NeutronCCContextTest(CharmTestCase):
             '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'):
@@ -298,6 +297,7 @@ class NeutronCCContextTest(CharmTestCase):
     @patch('__builtin__.__import__')
     def test_neutroncc_context_vxlan(self, _import, plugin, nm):
         plugin.return_value = None
+        self.test_config.set('flat-network-providers', 'physnet2 physnet3')
         self.test_config.set('overlay-network-type', 'vxlan')
         ctxt_data = {
             'debug': True,
@@ -320,7 +320,7 @@ class NeutronCCContextTest(CharmTestCase):
             'quota_subnet': 10,
             'quota_vip': 10,
             'vlan_ranges': 'physnet1:1000:2000',
-            'network_providers': 'physnet1',
+            'network_providers': 'physnet2,physnet3',
         }
         napi_ctxt = context.NeutronCCContext()
         with patch.object(napi_ctxt, '_ensure_packages'):
@@ -359,7 +359,6 @@ class NeutronCCContextTest(CharmTestCase):
             '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'):