1 files changed, 51 insertions, 2 deletions
diff --git a/os_net_config/tests/test_objects.py b/os_net_config/tests/test_objects.py
index ca2dd47..f5daf31 100644
--- a/os_net_config/tests/test_objects.py
+++ b/os_net_config/tests/test_objects.py
@@ -98,6 +98,27 @@ class TestInterface(base.TestCase):
         self.assertEqual("em1", interface.name)
         self.assertTrue(interface.use_dhcp)
 
+    def test_from_json_hotplug(self):
+        data = """{
+"type": "interface",
+"name": "em1",
+"hotplug": true
+}
+"""
+        interface = objects.object_from_json(json.loads(data))
+        self.assertEqual("em1", interface.name)
+        self.assertTrue(interface.hotplug)
+
+    def test_from_json_hotplug_off_by_default(self):
+        data = """{
+"type": "interface",
+"name": "em1"
+}
+"""
+        interface = objects.object_from_json(json.loads(data))
+        self.assertEqual("em1", interface.name)
+        self.assertFalse(interface.hotplug)
+
     def test_from_json_defroute(self):
         data = '{"type": "interface", "name": "em1", "use_dhcp": true}'
         interface1 = objects.object_from_json(json.loads(data))
@@ -274,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_string(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])
+
 
 class TestLinuxBridge(base.TestCase):
 
@@ -407,7 +456,7 @@ class TestIvsInterface(base.TestCase):
                                 objects.IvsBridge.from_json,
                                 json.loads(data))
         expected = 'IVS does not support bond interfaces.'
-        self.assertIn(expected, err)
+        self.assertIn(expected, six.text_type(err))
 
 
 class TestNfvswitchBridge(base.TestCase):
@@ -472,7 +521,7 @@ class TestNfvswitchInterface(base.TestCase):
                                 objects.NfvswitchBridge.from_json,
                                 json.loads(data))
         expected = 'NFVSwitch does not support bond interfaces.'
-        self.assertIn(expected, err)
+        self.assertIn(expected, six.text_type(err))
 
 
 class TestBond(base.TestCase):