From 9334e948162b8e71a44022441d92503d4a3e3512 Mon Sep 17 00:00:00 2001
From: Sarath Kumar <sarath.kutty@bigswitch.com>
Date: Fri, 22 Jul 2016 11:03:34 -0700
Subject: 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
---
 os_net_config/impl_ifcfg.py         |  2 +-
 os_net_config/tests/test_cli.py     | 18 ++++++++++++++
 os_net_config/tests/test_objects.py | 48 ++++++++++++++-----------------------
 3 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/os_net_config/impl_ifcfg.py b/os_net_config/impl_ifcfg.py
index 79e3e42..ab8b094 100644
--- a/os_net_config/impl_ifcfg.py
+++ b/os_net_config/impl_ifcfg.py
@@ -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):
diff --git a/os_net_config/tests/test_cli.py b/os_net_config/tests/test_cli.py
index c5c825f..0626205 100644
--- a/os_net_config/tests/test_cli.py
+++ b/os_net_config/tests/test_cli.py
@@ -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')
diff --git a/os_net_config/tests/test_objects.py b/os_net_config/tests/test_objects.py
index 2e5fbe4..26b16ad 100644
--- a/os_net_config/tests/test_objects.py
+++ b/os_net_config/tests/test_objects.py
@@ -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",
-- 
cgit 1.2.3-korg