diff options
Diffstat (limited to 'os_net_config/tests')
| -rw-r--r-- | os_net_config/tests/test_impl_ifcfg.py | 4 | ||||
| -rw-r--r-- | os_net_config/tests/test_objects.py | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/os_net_config/tests/test_impl_ifcfg.py b/os_net_config/tests/test_impl_ifcfg.py index c3acbc8..8586daa 100644 --- a/os_net_config/tests/test_impl_ifcfg.py +++ b/os_net_config/tests/test_impl_ifcfg.py @@ -318,7 +318,7 @@ IPADDR=172.16.2.7 NETMASK=255.255.255.0 """ -_NFVSWITCH_CONFIG = ('SETUP_ARGS=\" -c 2,3,4,5 -u em1 -m storage5\"') +_NFVSWITCH_CONFIG = ('SETUP_ARGS=\"-c 2,3,4,5 -u em1 -m storage5\"') _OVS_IFCFG_PATCH_PORT = """# This file is autogenerated by os-net-config DEVICE=br-pub-patch @@ -590,7 +590,7 @@ class TestIfcfgNetConfig(base.TestCase): iface_name = nfvswitch_internal.name bridge = objects.NfvswitchBridge(members=[interface, nfvswitch_internal], - cpus="2,3,4,5") + options="-c 2,3,4,5") self.provider.add_interface(interface) self.provider.add_nfvswitch_internal(nfvswitch_internal) self.provider.add_nfvswitch_bridge(bridge) diff --git a/os_net_config/tests/test_objects.py b/os_net_config/tests/test_objects.py index 26b16ad..7500392 100644 --- a/os_net_config/tests/test_objects.py +++ b/os_net_config/tests/test_objects.py @@ -407,7 +407,7 @@ class TestNfvswitchBridge(base.TestCase): def test_from_json(self): data = """{ "type": "nfvswitch_bridge", -"cpus": "2,3,4,5", +"options": "-c 2,3,4,5", "members": [ {"type": "interface","name": "nic1"}, {"type": "interface","name": "nic2"} @@ -416,7 +416,7 @@ class TestNfvswitchBridge(base.TestCase): """ bridge = objects.object_from_json(json.loads(data)) self.assertEqual("nfvswitch", bridge.name) - self.assertEqual("2,3,4,5", bridge.cpus) + self.assertEqual("-c 2,3,4,5", bridge.options) interface1 = bridge.members[0] self.assertEqual("nic1", interface1.name) self.assertEqual(False, interface1.ovs_port) @@ -431,7 +431,7 @@ class TestNfvswitchInterface(base.TestCase): def test_nfvswitch_internal_from_json(self): data = """{ "type": "nfvswitch_bridge", -"cpus": "2,3,4,5", +"options": "-c 2,3,4,5", "members": [ {"type": "nfvswitch_internal", "name": "storage", "vlan_id": 202}, {"type": "nfvswitch_internal", "name": "api", "vlan_id": 201} @@ -440,7 +440,7 @@ class TestNfvswitchInterface(base.TestCase): """ bridge = objects.object_from_json(json.loads(data)) self.assertEqual("nfvswitch", bridge.name) - self.assertEqual("2,3,4,5", bridge.cpus) + self.assertEqual("-c 2,3,4,5", bridge.options) interface1 = bridge.members[0] self.assertEqual("storage202", interface1.name) interface2 = bridge.members[1] @@ -451,7 +451,7 @@ class TestNfvswitchInterface(base.TestCase): def test_bond_interface_from_json(self): data = """{ "type": "nfvswitch_bridge", -"cpus": "2,3,4,5", +"options": "-c 2,3,4,5", "members": [{ "type": "linux_bond", "name": "bond1", "members": [{"type": "interface", "name": "nic2"}, |