openstack
/
os-net-config
Code Issues Proposed changes

Cleanups and new unit test for IVS 

- refactor test_object unit-test for IVS to follow other object class tests
- add new CLI unit test for IVS
- cleanup comments from https://review.openstack.org/#/c/345599

Change-Id: I0c337b019ae90ee7b2f207ff9b5060ed67bf182f
This commit is contained in:
Sarath Kumar 2016-07-22 11:03:34 -07:00
parent f79d534c3e
commit 9334e94816
3 changed files with 37 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
os_net_config/impl_ifcfg.py
View File

@ -599,7 +599,7 @@ class IfcfgNetConfig(os_net_config.NetConfig):
ifaces.append(iface)
internal_str = ''.join(ifaces)
data = ("SETUP_ARGS=\"%s%s%s\"" % (cpu_str, iface_str, internal_str))
data = "SETUP_ARGS=\"%s%s%s\"" % (cpu_str, iface_str, internal_str)
return data
def apply(self, cleanup=False, activate=True):

18
os_net_config/tests/test_cli.py
View File

@ -66,6 +66,24 @@ class TestCli(base.TestCase):
self.assertIn(dev, stdout_yaml)
self.assertEqual(stdout_yaml, stdout_json)
def test_ivs_noop_output(self):
ivs_yaml = os.path.join(SAMPLE_BASE, 'ivs.yaml')
ivs_json = os.path.join(SAMPLE_BASE, 'ivs.json')
stdout_yaml, stderr = self.run_cli('ARG0 --provider=ifcfg --noop '
'-c %s' % ivs_yaml)
self.assertEqual('', stderr)
stdout_json, stderr = self.run_cli('ARG0 --provider=ifcfg --noop '
'-c %s' % ivs_json)
self.assertEqual('', stderr)
sanity_devices = ['DEVICE=nic2',
'DEVICE=nic3',
'DEVICE=api201',
'DEVICE=storage202',
'DEVICETYPE=ivs']
for dev in sanity_devices:
self.assertIn(dev, stdout_yaml)
self.assertEqual(stdout_yaml, stdout_json)
def test_bridge_noop_output(self):
bridge_yaml = os.path.join(SAMPLE_BASE, 'bridge_dhcp.yaml')
bridge_json = os.path.join(SAMPLE_BASE, 'bridge_dhcp.json')

48
os_net_config/tests/test_objects.py
View File

@ -345,13 +345,13 @@ class TestLinuxBridge(base.TestCase):
class TestIvsBridge(base.TestCase):
def test_interface_from_json(self):
def test_from_json(self):
data = """{
"type": "ivs_bridge",
"members": [{
"type": "interface",
"name": "nic2"
}]
"members": [
{"type": "interface", "name": "nic2"},
{"type": "interface", "name": "nic3"}
]
}
"""
bridge = objects.object_from_json(json.loads(data))
@ -359,16 +359,20 @@ class TestIvsBridge(base.TestCase):
interface1 = bridge.members[0]
self.assertEqual("nic2", interface1.name)
self.assertEqual(False, interface1.ovs_port)
interface2 = bridge.members[1]
self.assertEqual("nic3", interface2.name)
self.assertEqual(False, interface2.ovs_port)
self.assertEqual("ivs", interface1.ivs_bridge_name)
class TestIvsInterface(base.TestCase):
def test_ivs_interface_from_json(self):
data = """{
"type": "ivs_bridge",
"members": [{
"type": "ivs_interface",
"name": "storage",
"vlan_id": 202
}]
"members": [
{"type": "ivs_interface", "name": "storage", "vlan_id": 202}
]
}
"""
bridge = objects.object_from_json(json.loads(data))
@ -404,26 +408,6 @@ class TestNfvswitchBridge(base.TestCase):
data = """{
"type": "nfvswitch_bridge",
"cpus": "2,3,4,5",
"members": [
{"type": "interface", "name": "nic2"}
]
}
"""
bridge = objects.object_from_json(json.loads(data))
self.assertEqual("nfvswitch", bridge.name)
self.assertEqual("2,3,4,5", bridge.cpus)
interface1 = bridge.members[0]
self.assertEqual("nic2", interface1.name)
self.assertEqual(False, interface1.ovs_port)
self.assertEqual("nfvswitch", interface1.nfvswitch_bridge_name)
class TestNfvswitchInterface(base.TestCase):
def test_interface_from_json(self):
data = """{
"type": "nfvswitch_bridge",
"cpus": "2,3,4,5",
"members": [
{"type": "interface","name": "nic1"},
{"type": "interface","name": "nic2"}
@ -435,11 +419,15 @@ class TestNfvswitchInterface(base.TestCase):
self.assertEqual("2,3,4,5", bridge.cpus)
interface1 = bridge.members[0]
self.assertEqual("nic1", interface1.name)
self.assertEqual(False, interface1.ovs_port)
interface2 = bridge.members[1]
self.assertEqual("nic2", interface2.name)
self.assertEqual(False, interface2.ovs_port)
self.assertEqual("nfvswitch", interface1.nfvswitch_bridge_name)
class TestNfvswitchInterface(base.TestCase):
def test_nfvswitch_internal_from_json(self):
data = """{
"type": "nfvswitch_bridge",