Remove unnecessary type conversions in network unit tests

In some tests, when comparing the results data with the
expected ones, many unnecessary type conversions are used.
So remove them to clean up.

Change-Id: I560ca78a3ab5e7b99087bfe1667de500f92c68de
Partial-bug: #1550633

openstackclient/tests/network/v2/test_network.py

@@ -617,8 +617,8 @@ class TestShowNetwork(TestNetwork):
         self.network.find_network.assert_called_once_with(
             self._network.name, ignore_missing=False)
 
-        self.assertEqual(tuple(self.columns), columns)
+        self.assertEqual(self.columns, columns)
-        self.assertEqual(list(self.data), list(data))
+        self.assertEqual(self.data, data)
 
 
 # Tests for Nova network
@@ -931,5 +931,5 @@ class TestShowNetworkCompute(TestNetworkCompute):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.assertEqual(self.columns, tuple(columns))
+        self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, data)

openstackclient/tests/network/v2/test_router.py

@@ -608,5 +608,5 @@ class TestShowRouter(TestRouter):
 
         self.network.find_router.assert_called_once_with(
             self._router.name, ignore_missing=False)
-        self.assertEqual(tuple(self.columns), columns)
+        self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, data)

openstackclient/tests/network/v2/test_security_group.py

@@ -114,7 +114,7 @@ class TestCreateSecurityGroupNetwork(TestSecurityGroupNetwork):
             'description': self._security_group.name,
             'name': self._security_group.name,
         })
-        self.assertEqual(tuple(self.columns), columns)
+        self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, data)
 
     def test_create_all_options(self):
@@ -139,7 +139,7 @@ class TestCreateSecurityGroupNetwork(TestSecurityGroupNetwork):
             'name': self._security_group.name,
             'tenant_id': identity_fakes.project_id,
         })
-        self.assertEqual(tuple(self.columns), columns)
+        self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, data)
 
 
@@ -296,28 +296,30 @@ class TestDeleteSecurityGroupCompute(TestSecurityGroupCompute):
 class TestListSecurityGroupNetwork(TestSecurityGroupNetwork):
 
     # The security group to be listed.
-    _security_group = \
+    _security_groups = \
-        network_fakes.FakeSecurityGroup.create_one_security_group()
+        network_fakes.FakeSecurityGroup.create_security_groups(count=3)
 
-    expected_columns = (
+    columns = (
         'ID',
         'Name',
         'Description',
         'Project',
     )
 
-    expected_data = ((
+    data = []
-        _security_group.id,
+    for grp in _security_groups:
-        _security_group.name,
+        data.append((
-        _security_group.description,
+            grp.id,
-        _security_group.tenant_id,
+            grp.name,
-    ),)
+            grp.description,
+            grp.tenant_id,
+        ))
 
     def setUp(self):
         super(TestListSecurityGroupNetwork, self).setUp()
 
         self.network.security_groups = mock.Mock(
-            return_value=[self._security_group])
+            return_value=self._security_groups)
 
         # Get the command object to test
         self.cmd = security_group.ListSecurityGroup(self.app, self.namespace)
@@ -332,8 +334,8 @@ class TestListSecurityGroupNetwork(TestSecurityGroupNetwork):
         columns, data = self.cmd.take_action(parsed_args)
 
         self.network.security_groups.assert_called_once_with()
-        self.assertEqual(self.expected_columns, columns)
+        self.assertEqual(self.columns, columns)
-        self.assertEqual(self.expected_data, tuple(data))
+        self.assertEqual(self.data, list(data))
 
     def test_security_group_list_all_projects(self):
         arglist = [
@@ -347,45 +349,49 @@ class TestListSecurityGroupNetwork(TestSecurityGroupNetwork):
         columns, data = self.cmd.take_action(parsed_args)
 
         self.network.security_groups.assert_called_once_with()
-        self.assertEqual(self.expected_columns, columns)
+        self.assertEqual(self.columns, columns)
-        self.assertEqual(self.expected_data, tuple(data))
+        self.assertEqual(self.data, list(data))
 
 
 class TestListSecurityGroupCompute(TestSecurityGroupCompute):
 
     # The security group to be listed.
-    _security_group = \
+    _security_groups = \
-        compute_fakes.FakeSecurityGroup.create_one_security_group()
+        compute_fakes.FakeSecurityGroup.create_security_groups(count=3)
 
-    expected_columns = (
+    columns = (
         'ID',
         'Name',
         'Description',
     )
-    expected_columns_all_projects = (
+    columns_all_projects = (
         'ID',
         'Name',
         'Description',
         'Project',
     )
 
-    expected_data = ((
+    data = []
-        _security_group.id,
+    for grp in _security_groups:
-        _security_group.name,
+        data.append((
-        _security_group.description,
+            grp.id,
-    ),)
+            grp.name,
-    expected_data_all_projects = ((
+            grp.description,
-        _security_group.id,
+        ))
-        _security_group.name,
+    data_all_projects = []
-        _security_group.description,
+    for grp in _security_groups:
-        _security_group.tenant_id,
+        data_all_projects.append((
-    ),)
+            grp.id,
+            grp.name,
+            grp.description,
+            grp.tenant_id,
+        ))
 
     def setUp(self):
         super(TestListSecurityGroupCompute, self).setUp()
 
         self.app.client_manager.network_endpoint_enabled = False
-        self.compute.security_groups.list.return_value = [self._security_group]
+        self.compute.security_groups.list.return_value = self._security_groups
 
         # Get the command object to test
         self.cmd = security_group.ListSecurityGroup(self.app, None)
@@ -401,8 +407,8 @@ class TestListSecurityGroupCompute(TestSecurityGroupCompute):
 
         kwargs = {'search_opts': {'all_tenants': False}}
         self.compute.security_groups.list.assert_called_once_with(**kwargs)
-        self.assertEqual(self.expected_columns, columns)
+        self.assertEqual(self.columns, columns)
-        self.assertEqual(self.expected_data, tuple(data))
+        self.assertEqual(self.data, list(data))
 
     def test_security_group_list_all_projects(self):
         arglist = [
@@ -417,8 +423,8 @@ class TestListSecurityGroupCompute(TestSecurityGroupCompute):
 
         kwargs = {'search_opts': {'all_tenants': True}}
         self.compute.security_groups.list.assert_called_once_with(**kwargs)
-        self.assertEqual(self.expected_columns_all_projects, columns)
+        self.assertEqual(self.columns_all_projects, columns)
-        self.assertEqual(self.expected_data_all_projects, tuple(data))
+        self.assertEqual(self.data_all_projects, list(data))
 
 
 class TestSetSecurityGroupNetwork(TestSecurityGroupNetwork):

openstackclient/tests/network/v2/test_security_group_rule.py

@@ -174,7 +174,7 @@ class TestCreateSecurityGroupRuleNetwork(TestSecurityGroupRuleNetwork):
             'remote_ip_prefix': self._security_group_rule.remote_ip_prefix,
             'security_group_id': self._security_group.id,
         })
-        self.assertEqual(tuple(self.expected_columns), columns)
+        self.assertEqual(self.expected_columns, columns)
         self.assertEqual(self.expected_data, data)
 
     def test_create_source_group(self):
@@ -209,7 +209,7 @@ class TestCreateSecurityGroupRuleNetwork(TestSecurityGroupRuleNetwork):
             'remote_group_id': self._security_group_rule.remote_group_id,
             'security_group_id': self._security_group.id,
         })
-        self.assertEqual(tuple(self.expected_columns), columns)
+        self.assertEqual(self.expected_columns, columns)
         self.assertEqual(self.expected_data, data)
 
     def test_create_source_ip(self):
@@ -240,7 +240,7 @@ class TestCreateSecurityGroupRuleNetwork(TestSecurityGroupRuleNetwork):
             'remote_ip_prefix': self._security_group_rule.remote_ip_prefix,
             'security_group_id': self._security_group.id,
         })
-        self.assertEqual(tuple(self.expected_columns), columns)
+        self.assertEqual(self.expected_columns, columns)
         self.assertEqual(self.expected_data, data)
 
     def test_create_network_options(self):
@@ -282,7 +282,7 @@ class TestCreateSecurityGroupRuleNetwork(TestSecurityGroupRuleNetwork):
             'security_group_id': self._security_group.id,
             'tenant_id': identity_fakes.project_id,
         })
-        self.assertEqual(tuple(self.expected_columns), columns)
+        self.assertEqual(self.expected_columns, columns)
         self.assertEqual(self.expected_data, data)
 
 
@@ -816,7 +816,7 @@ class TestShowSecurityGroupRuleNetwork(TestSecurityGroupRuleNetwork):
 
         self.network.find_security_group_rule.assert_called_once_with(
             self._security_group_rule.id, ignore_missing=False)
-        self.assertEqual(tuple(self.columns), columns)
+        self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, data)
 
 

openstackclient/tests/network/v2/test_subnet.py

@@ -627,4 +627,4 @@ class TestShowSubnet(TestSubnet):
             self._subnet.name, ignore_missing=False)
 
         self.assertEqual(self.columns, columns)
-        self.assertEqual(list(self.data), list(data))
+        self.assertEqual(self.data, data)