openstack/charm-neutron-openvswitch
Code Issues Proposed changes

added unit tests

Browse Source
This commit is contained in:
Edward Hope-Morley 2015-04-10 17:21:20 +01:00
parent 43e0f7bf74
commit 82b867339a
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hooks/neutron_ovs_context.py
View File

@ -71,13 +71,13 @@ class OVSPluginContext(context.NeutronContext):
mappings = config('bridge-mappings') mappings = config('bridge-mappings')
if mappings: if mappings:
ovs_ctxt['bridge_mappings'] = mappings ovs_ctxt['bridge_mappings'] = ','.join(mappings.split())
vlan_ranges = config('vlan-ranges') vlan_ranges = config('vlan-ranges')
vlan_range_mappings = parse_vlan_range_mappings(vlan_ranges) vlan_range_mappings = parse_vlan_range_mappings(vlan_ranges)
if vlan_ranges: if vlan_ranges:
providers = vlan_range_mappings.keys() providers = vlan_range_mappings.keys()
ovs_ctxt['network_providers'] = ','.join(providers) ovs_ctxt['network_providers'] = ','.join(sorted(providers))
ovs_ctxt['vlan_ranges'] = ','.join(vlan_ranges.split()) ovs_ctxt['vlan_ranges'] = ','.join(vlan_ranges.split())
return ovs_ctxt return ovs_ctxt

25
unit_tests/test_neutron_ovs_context.py
View File

@ -65,6 +65,8 @@ class OVSPluginContextTest(CharmTestCase):
{'br-d2': 'em1'} {'br-d2': 'em1'}
) )
@patch.object(charmhelpers.contrib.openstack.context, 'config',
lambda *args: None)
@patch.object(charmhelpers.contrib.openstack.context, 'relation_get') @patch.object(charmhelpers.contrib.openstack.context, 'relation_get')
@patch.object(charmhelpers.contrib.openstack.context, 'relation_ids') @patch.object(charmhelpers.contrib.openstack.context, 'relation_ids')
@patch.object(charmhelpers.contrib.openstack.context, 'related_units') @patch.object(charmhelpers.contrib.openstack.context, 'related_units')
@ -85,8 +87,22 @@ class OVSPluginContextTest(CharmTestCase):
return "neutron.randomdriver" return "neutron.randomdriver"
if section == "config": if section == "config":
return "neutron.randomconfig" return "neutron.randomconfig"
config = {'vlan-ranges': "physnet1:1000:1500 physnet2:2000:2500",
'use-syslog': True,
'verbose': True,
'debug': True,
'bridge-mappings': "physnet1:br-data physnet2:br-data"}
def mock_config(key=None):
if key:
return config.get(key)
return config
self.maxDiff = None
self.config.side_effect = mock_config
_npa.side_effect = mock_npa _npa.side_effect = mock_npa
_config.return_value = 'ovs'
_unit_get.return_value = '127.0.0.13' _unit_get.return_value = '127.0.0.13'
_unit_priv_ip.return_value = '127.0.0.14' _unit_priv_ip.return_value = '127.0.0.14'
_is_clus.return_value = False _is_clus.return_value = False
@ -103,7 +119,6 @@ class OVSPluginContextTest(CharmTestCase):
self.get_host_ip.return_value = '127.0.0.15' self.get_host_ip.return_value = '127.0.0.15'
napi_ctxt = context.OVSPluginContext() napi_ctxt = context.OVSPluginContext()
expect = { expect = {
'neutron_alchemy_flags': {},
'neutron_security_groups': True, 'neutron_security_groups': True,
'distributed_routing': True, 'distributed_routing': True,
'verbose': True, 'verbose': True,
@ -119,9 +134,9 @@ class OVSPluginContextTest(CharmTestCase):
'neutron_url': 'https://127.0.0.13:9696', 'neutron_url': 'https://127.0.0.13:9696',
'l2_population': True, 'l2_population': True,
'overlay_network_type': 'gre', 'overlay_network_type': 'gre',
'network_providers': 'physnet1', 'network_providers': 'physnet1,physnet2',
'bridge_mappings': 'physnet1:br-data', 'bridge_mappings': 'physnet1:br-data,physnet2:br-data',
'vlan_ranges': 'physnet1:1000:2000', 'vlan_ranges': 'physnet1:1000:1500,physnet2:2000:2500',
} }
self.assertEquals(expect, napi_ctxt()) self.assertEquals(expect, napi_ctxt())