diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-01-27 16:57:26 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-01-27 16:57:26 +0000 |
commit | 60f043152dedf04c335a049feedb502b194fbc02 (patch) | |
tree | 45c068953c837832f6d891096a287c4b7064ea57 /os_net_config/tests | |
parent | b4ecaa5c344cc33691d91398bfa187e876e6e40d (diff) | |
parent | 8c841946d441d6c90ba61ee0a64698b59c711c3a (diff) |
Merge "Add check that ovs_extra is passed as list"
Diffstat (limited to 'os_net_config/tests')
-rw-r--r-- | os_net_config/tests/test_objects.py | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/os_net_config/tests/test_objects.py b/os_net_config/tests/test_objects.py index 54d153c..0ff653c 100644 --- a/os_net_config/tests/test_objects.py +++ b/os_net_config/tests/test_objects.py @@ -295,6 +295,34 @@ class TestBridge(base.TestCase): self.assertTrue(interface2.ovs_port) self.assertEqual("br-foo", interface2.bridge_name) + def test_from_json_ovs_extra(self): + data = """{ +"type": "ovs_bridge", +"name": "br-foo", +"ovs_extra": ["bar"], +"ovs_fail_mode": "standalone" +} +""" + bridge = objects.object_from_json(json.loads(data)) + self.assertTrue(2 == len(bridge.ovs_extra)) + self.assertEqual("bar", bridge.ovs_extra[0]) + self.assertEqual("set bridge br-foo fail_mode=standalone", + bridge.ovs_extra[1]) + + def test_from_json_ovs_extra_invalid(self): + data = """{ +"type": "ovs_bridge", +"name": "br-foo", +"ovs_extra": "bar", +"ovs_fail_mode": "standalone" +} +""" + json_data = json.loads(data) + err = self.assertRaises(objects.InvalidConfigException, + objects.object_from_json, json_data) + expected = 'ovs_extra must be a list.' + self.assertIn(expected, six.text_type(err)) + class TestLinuxBridge(base.TestCase): |