openstack/charm-neutron-gateway
Code Issues Proposed changes

Merge next branch

Browse Source
This commit is contained in:
Corey Bryant 2015-04-15 15:30:13 +00:00
commit 4075f9be82
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hooks/quantum_contexts.py
View File

@ -144,14 +144,14 @@ class QuantumGatewayContext(OSContextGenerator):
mappings = config('bridge-mappings')
if mappings:
ctxt['bridge_mappings'] = mappings
ctxt['bridge_mappings'] = ','.join(mappings.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)
ctxt['vlan_ranges'] = vlan_ranges
ctxt['network_providers'] = ','.join(providers)
ctxt['vlan_ranges'] = ','.join(vlan_ranges.split())
net_dev_mtu = api_settings['network_device_mtu']
if net_dev_mtu:

4
unit_tests/test_quantum_contexts.py
View File

@ -147,8 +147,8 @@ class TestQuantumGatewayContext(CharmTestCase):
'l2_population': True,
'overlay_network_type': 'gre',
'bridge_mappings': 'physnet1:br-data',
'network_providers': 'physnet1 physnet2',
'vlan_ranges': 'physnet1:1000:2000 physnet2:2001:3000',
'network_providers': 'physnet1,physnet2',
'vlan_ranges': 'physnet1:1000:2000,physnet2:2001:3000',
'network_device_mtu': 9000,
'veth_mtu': 9000,
})