Merge lp:~hopem/charms/trusty/quantum-gateway/add-configurable-flat-network into lp:~openstack-charmers/charms/trusty/quantum-gateway/next

[Edward Hope-Morley]

[lp:~hopem/charms/trusty/quantum-gateway/add-configurable-flat-network]

99. By Edward Hope-Morley on 2015-04-15

better desc

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

charm_lint_check #3390 quantum-gateway-next for hopem mp256325
    LINT OK: passed

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

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

charm_unit_test #3178 quantum-gateway-next for hopem mp256325
    UNIT OK: passed

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

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

charm_amulet_test #3180 quantum-gateway-next for hopem mp256325
    AMULET OK: passed

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

[Billy Olsen (billy-olsen)]

Code changes look fine to me but I can't get an instance to boot when deploying the changes. I suspect its probably me setting the value incorrectly, but I'd like independent verification.

[Edward Hope-Morley (hopem)]

Testing now.

[Liam Young (gnuoy)]

LGTM, +1

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2015-03-12 10:33:36 +0000
+++ config.yaml	2015-04-15 14:27:07 +0000
@@ -128,11 +128,17 @@
     description: |
       Space-separated list of ML2 data bridge mappings with format
       <provider>:<bridge>.
+  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
+      format "<provider>:<start>:<end> ...".
   # Network configuration options
   # by default all access is over 'private-address'
   os-data-network:
 
=== modified file 'hooks/quantum_contexts.py'
--- hooks/quantum_contexts.py	2015-04-10 15:45:07 +0000
+++ hooks/quantum_contexts.py	2015-04-15 14:27:07 +0000
@@ -23,9 +23,6 @@
 from charmhelpers.contrib.network.ip import (
     get_address_in_network,
 )
-from charmhelpers.contrib.openstack.neutron import (
-    parse_vlan_range_mappings,
-)
 
 DB_USER = "quantum"
 QUANTUM_DB = "quantum"
@@ -146,11 +143,12 @@
         if mappings:
             ctxt['bridge_mappings'] = ','.join(mappings.split())
 
+        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())
 
         net_dev_mtu = api_settings['network_device_mtu']
 
=== modified file 'unit_tests/test_quantum_contexts.py'
--- unit_tests/test_quantum_contexts.py	2015-04-10 15:45:07 +0000
+++ unit_tests/test_quantum_contexts.py	2015-04-15 14:27:07 +0000
@@ -125,6 +125,7 @@
         self.test_config.set('instance-mtu', 1420)
         self.test_config.set('vlan-ranges',
                              'physnet1:1000:2000 physnet2:2001:3000')
+        self.test_config.set('flat-network-providers', 'physnet3 physnet4')
         # Provided by neutron-api relation
         _rids.return_value = ['neutron-plugin-api:0']
         _runits.return_value = ['neutron-api/0']
@@ -147,7 +148,7 @@
             'l2_population': True,
             'overlay_network_type': 'gre',
             'bridge_mappings': 'physnet1:br-data',
-            'network_providers': 'physnet1,physnet2',
+            'network_providers': 'physnet3,physnet4',
             'vlan_ranges': 'physnet1:1000:2000,physnet2:2001:3000',
             'network_device_mtu': 9000,
             'veth_mtu': 9000,