Deduplicate get_opts methods

One get_opts method can work instead of
get_list_opts and get_show_opts both.
Remove mutable default value.

Change-Id: I9c5683d416f0f3ed4989abab6f152b0341e30a4f

11 files changed, 41 insertions, 41 deletions

diff --git a/functional/tests/network/v2/test_address_scope.py b/functional/tests/network/v2/test_address_scope.py
index 8e25e46a..3beab233 100644
--- a/functional/tests/network/v2/test_address_scope.py
+++ b/functional/tests/network/v2/test_address_scope.py
@@ -23,7 +23,7 @@ class AddressScopeTests(test.TestCase):
 
     @classmethod
     def setUpClass(cls):
-        opts = cls.get_show_opts(cls.FIELDS)
+        opts = cls.get_opts(cls.FIELDS)
         raw_output = cls.openstack('address scope create ' + cls.NAME + opts)
         cls.assertOutput(cls.NAME + "\n", raw_output)
 
@@ -33,17 +33,17 @@ class AddressScopeTests(test.TestCase):
         cls.assertOutput('', raw_output)
 
     def test_address_scope_list(self):
-        opts = self.get_list_opts(self.HEADERS)
+        opts = self.get_opts(self.HEADERS)
         raw_output = self.openstack('address scope list' + opts)
         self.assertIn(self.NAME, raw_output)
 
     def test_address_scope_show(self):
-        opts = self.get_show_opts(self.FIELDS)
+        opts = self.get_opts(self.FIELDS)
         raw_output = self.openstack('address scope show ' + self.NAME + opts)
         self.assertEqual(self.NAME + "\n", raw_output)
 
     def test_address_scope_set(self):
         self.openstack('address scope set --share ' + self.NAME)
-        opts = self.get_show_opts(['shared'])
+        opts = self.get_opts(['shared'])
         raw_output = self.openstack('address scope show ' + self.NAME + opts)
         self.assertEqual("True\n", raw_output)
diff --git a/functional/tests/network/v2/test_floating_ip.py b/functional/tests/network/v2/test_floating_ip.py
index f9ecd928..3b314b70 100644
--- a/functional/tests/network/v2/test_floating_ip.py
+++ b/functional/tests/network/v2/test_floating_ip.py
@@ -33,7 +33,7 @@ class FloatingIpTests(test.TestCase):
             ' --subnet-range 10.10.10.0/24 ' +
             cls.SUBNET_NAME
         )
-        opts = cls.get_show_opts(cls.FIELDS)
+        opts = cls.get_opts(cls.FIELDS)
         raw_output = cls.openstack(
             'ip floating create ' + cls.NETWORK_NAME + opts)
         cls.ID = raw_output.strip('\n')
@@ -48,11 +48,11 @@ class FloatingIpTests(test.TestCase):
         cls.assertOutput('', raw_output)
 
     def test_floating_ip_list(self):
-        opts = self.get_list_opts(self.HEADERS)
+        opts = self.get_opts(self.HEADERS)
         raw_output = self.openstack('ip floating list' + opts)
         self.assertIn(self.ID, raw_output)
 
     def test_floating_ip_show(self):
-        opts = self.get_show_opts(self.FIELDS)
+        opts = self.get_opts(self.FIELDS)
         raw_output = self.openstack('ip floating show ' + self.ID + opts)
         self.assertEqual(self.ID + "\n", raw_output)
diff --git a/functional/tests/network/v2/test_ip_availability.py b/functional/tests/network/v2/test_ip_availability.py
index f1302d5f..e83010fd 100644
--- a/functional/tests/network/v2/test_ip_availability.py
+++ b/functional/tests/network/v2/test_ip_availability.py
@@ -25,7 +25,7 @@ class IPAvailabilityTests(test.TestCase):
     def setUpClass(cls):
         # Create a network for the subnet.
         cls.openstack('network create ' + cls.NETWORK_NAME)
-        opts = cls.get_show_opts(['name'])
+        opts = cls.get_opts(['name'])
         raw_output = cls.openstack(
             'subnet create --network ' + cls.NETWORK_NAME +
             ' --subnet-range 10.10.10.0/24 ' +
@@ -47,7 +47,7 @@ class IPAvailabilityTests(test.TestCase):
         self.assertIn(self.NETWORK_NAME, raw_output)
 
     def test_ip_availability_show(self):
-        opts = self.get_show_opts(self.FIELDS)
+        opts = self.get_opts(self.FIELDS)
         raw_output = self.openstack(
             'ip availability show ' + self.NETWORK_NAME + opts)
         self.assertEqual(self.NETWORK_NAME + "\n", raw_output)
diff --git a/functional/tests/network/v2/test_network.py b/functional/tests/network/v2/test_network.py
index 5cc461b9..f5c92faa 100644
--- a/functional/tests/network/v2/test_network.py
+++ b/functional/tests/network/v2/test_network.py
@@ -23,7 +23,7 @@ class NetworkTests(test.TestCase):
 
     @classmethod
     def setUpClass(cls):
-        opts = cls.get_show_opts(cls.FIELDS)
+        opts = cls.get_opts(cls.FIELDS)
         raw_output = cls.openstack('network create ' + cls.NAME + opts)
         expected = cls.NAME + '\n'
         cls.assertOutput(expected, raw_output)
@@ -34,17 +34,17 @@ class NetworkTests(test.TestCase):
         cls.assertOutput('', raw_output)
 
     def test_network_list(self):
-        opts = self.get_list_opts(self.HEADERS)
+        opts = self.get_opts(self.HEADERS)
         raw_output = self.openstack('network list' + opts)
         self.assertIn(self.NAME, raw_output)
 
     def test_network_set(self):
         raw_output = self.openstack('network set --disable ' + self.NAME)
-        opts = self.get_show_opts(['name', 'admin_state_up'])
+        opts = self.get_opts(['name', 'admin_state_up'])
         raw_output = self.openstack('network show ' + self.NAME + opts)
         self.assertEqual("DOWN\n" + self.NAME + "\n", raw_output)
 
     def test_network_show(self):
-        opts = self.get_show_opts(self.FIELDS)
+        opts = self.get_opts(self.FIELDS)
         raw_output = self.openstack('network show ' + self.NAME + opts)
         self.assertEqual(self.NAME + "\n", raw_output)
diff --git a/functional/tests/network/v2/test_network_segment.py b/functional/tests/network/v2/test_network_segment.py
index b5b5dcd9..4609973c 100644
--- a/functional/tests/network/v2/test_network_segment.py
+++ b/functional/tests/network/v2/test_network_segment.py
@@ -28,12 +28,12 @@ class NetworkSegmentTests(test.TestCase):
     @classmethod
     def setUpClass(cls):
         # Create a network for the segment.
-        opts = cls.get_show_opts(['id'])
+        opts = cls.get_opts(['id'])
         raw_output = cls.openstack('network create ' + cls.NETWORK_NAME + opts)
         cls.NETWORK_ID = raw_output.strip('\n')
 
         # Get the segment for the network.
-        opts = cls.get_show_opts(['ID', 'Network'])
+        opts = cls.get_opts(['ID', 'Network'])
         raw_output = cls.openstack('--os-beta-command '
                                    'network segment list '
                                    ' --network ' + cls.NETWORK_NAME +
@@ -47,13 +47,13 @@ class NetworkSegmentTests(test.TestCase):
         cls.assertOutput('', raw_output)
 
     def test_network_segment_list(self):
-        opts = self.get_list_opts(['ID'])
+        opts = self.get_opts(['ID'])
         raw_output = self.openstack('--os-beta-command '
                                     'network segment list' + opts)
         self.assertIn(self.NETWORK_SEGMENT_ID, raw_output)
 
     def test_network_segment_show(self):
-        opts = self.get_show_opts(['network_id'])
+        opts = self.get_opts(['network_id'])
         raw_output = self.openstack('--os-beta-command '
                                     'network segment show ' +
                                     self.NETWORK_SEGMENT_ID + opts)
diff --git a/functional/tests/network/v2/test_port.py b/functional/tests/network/v2/test_port.py
index 5b358a38..a68019c4 100644
--- a/functional/tests/network/v2/test_port.py
+++ b/functional/tests/network/v2/test_port.py
@@ -26,7 +26,7 @@ class PortTests(test.TestCase):
     def setUpClass(cls):
         # Create a network for the subnet.
         cls.openstack('network create ' + cls.NETWORK_NAME)
-        opts = cls.get_show_opts(cls.FIELDS)
+        opts = cls.get_opts(cls.FIELDS)
         raw_output = cls.openstack(
             'port create --network ' + cls.NETWORK_NAME + ' ' +
             cls.NAME + opts
@@ -42,17 +42,17 @@ class PortTests(test.TestCase):
         cls.assertOutput('', raw_output)
 
     def test_port_list(self):
-        opts = self.get_list_opts(self.HEADERS)
+        opts = self.get_opts(self.HEADERS)
         raw_output = self.openstack('port list' + opts)
         self.assertIn(self.NAME, raw_output)
 
     def test_port_set(self):
         self.openstack('port set --disable ' + self.NAME)
-        opts = self.get_show_opts(['name', 'admin_state_up'])
+        opts = self.get_opts(['name', 'admin_state_up'])
         raw_output = self.openstack('port show ' + self.NAME + opts)
         self.assertEqual("DOWN\n" + self.NAME + "\n", raw_output)
 
     def test_port_show(self):
-        opts = self.get_show_opts(self.FIELDS)
+        opts = self.get_opts(self.FIELDS)
         raw_output = self.openstack('port show ' + self.NAME + opts)
         self.assertEqual(self.NAME + "\n", raw_output)
diff --git a/functional/tests/network/v2/test_router.py b/functional/tests/network/v2/test_router.py
index ceb76255..e536c64e 100644
--- a/functional/tests/network/v2/test_router.py
+++ b/functional/tests/network/v2/test_router.py
@@ -23,7 +23,7 @@ class RouterTests(test.TestCase):
 
     @classmethod
     def setUpClass(cls):
-        opts = cls.get_show_opts(cls.FIELDS)
+        opts = cls.get_opts(cls.FIELDS)
         raw_output = cls.openstack('router create ' + cls.NAME + opts)
         expected = cls.NAME + '\n'
         cls.assertOutput(expected, raw_output)
@@ -34,17 +34,17 @@ class RouterTests(test.TestCase):
         cls.assertOutput('', raw_output)
 
     def test_router_list(self):
-        opts = self.get_list_opts(self.HEADERS)
+        opts = self.get_opts(self.HEADERS)
         raw_output = self.openstack('router list' + opts)
         self.assertIn(self.NAME, raw_output)
 
     def test_router_set(self):
         self.openstack('router set --disable ' + self.NAME)
-        opts = self.get_show_opts(['name', 'admin_state_up'])
+        opts = self.get_opts(['name', 'admin_state_up'])
         raw_output = self.openstack('router show ' + self.NAME + opts)
         self.assertEqual("DOWN\n" + self.NAME + "\n", raw_output)
 
     def test_router_show(self):
-        opts = self.get_show_opts(self.FIELDS)
+        opts = self.get_opts(self.FIELDS)
         raw_output = self.openstack('router show ' + self.NAME + opts)
         self.assertEqual(self.NAME + "\n", raw_output)
diff --git a/functional/tests/network/v2/test_security_group.py b/functional/tests/network/v2/test_security_group.py
index 4fc4d12d..2a3b92a0 100644
--- a/functional/tests/network/v2/test_security_group.py
+++ b/functional/tests/network/v2/test_security_group.py
@@ -24,7 +24,7 @@ class SecurityGroupTests(test.TestCase):
 
     @classmethod
     def setUpClass(cls):
-        opts = cls.get_show_opts(cls.FIELDS)
+        opts = cls.get_opts(cls.FIELDS)
         raw_output = cls.openstack('security group create ' + cls.NAME + opts)
         expected = cls.NAME + '\n'
         cls.assertOutput(expected, raw_output)
@@ -40,7 +40,7 @@ class SecurityGroupTests(test.TestCase):
         cls.assertOutput('', raw_output)
 
     def test_security_group_list(self):
-        opts = self.get_list_opts(self.HEADERS)
+        opts = self.get_opts(self.HEADERS)
         raw_output = self.openstack('security group list' + opts)
         self.assertIn(self.NAME, raw_output)
 
@@ -50,11 +50,11 @@ class SecurityGroupTests(test.TestCase):
         )
         self.assertEqual('', raw_output)
 
-        opts = self.get_show_opts(['description'])
+        opts = self.get_opts(['description'])
         raw_output = self.openstack('security group show ' + self.NAME + opts)
         self.assertEqual("NSA\n", raw_output)
 
     def test_security_group_show(self):
-        opts = self.get_show_opts(self.FIELDS)
+        opts = self.get_opts(self.FIELDS)
         raw_output = self.openstack('security group show ' + self.NAME + opts)
         self.assertEqual(self.NAME + "\n", raw_output)
diff --git a/functional/tests/network/v2/test_security_group_rule.py b/functional/tests/network/v2/test_security_group_rule.py
index 64e1fcdf..248d20b1 100644
--- a/functional/tests/network/v2/test_security_group_rule.py
+++ b/functional/tests/network/v2/test_security_group_rule.py
@@ -26,7 +26,7 @@ class SecurityGroupRuleTests(test.TestCase):
     @classmethod
     def setUpClass(cls):
         # Create the security group to hold the rule.
-        opts = cls.get_show_opts(cls.NAME_FIELD)
+        opts = cls.get_opts(cls.NAME_FIELD)
         raw_output = cls.openstack('security group create ' +
                                    cls.SECURITY_GROUP_NAME +
                                    opts)
@@ -34,7 +34,7 @@ class SecurityGroupRuleTests(test.TestCase):
         cls.assertOutput(expected, raw_output)
 
         # Create the security group rule.
-        opts = cls.get_show_opts(cls.ID_FIELD)
+        opts = cls.get_opts(cls.ID_FIELD)
         raw_output = cls.openstack('security group rule create ' +
                                    cls.SECURITY_GROUP_NAME +
                                    ' --protocol tcp --dst-port 80:80' +
@@ -53,14 +53,14 @@ class SecurityGroupRuleTests(test.TestCase):
         cls.assertOutput('', raw_output)
 
     def test_security_group_rule_list(self):
-        opts = self.get_list_opts(self.ID_HEADER)
+        opts = self.get_opts(self.ID_HEADER)
         raw_output = self.openstack('security group rule list ' +
                                     self.SECURITY_GROUP_NAME +
                                     opts)
         self.assertIn(self.SECURITY_GROUP_RULE_ID, raw_output)
 
     def test_security_group_rule_show(self):
-        opts = self.get_show_opts(self.ID_FIELD)
+        opts = self.get_opts(self.ID_FIELD)
         raw_output = self.openstack('security group rule show ' +
                                     self.SECURITY_GROUP_RULE_ID +
                                     opts)
diff --git a/functional/tests/network/v2/test_subnet.py b/functional/tests/network/v2/test_subnet.py
index 7697e0f4..11ae6da1 100644
--- a/functional/tests/network/v2/test_subnet.py
+++ b/functional/tests/network/v2/test_subnet.py
@@ -26,7 +26,7 @@ class SubnetTests(test.TestCase):
     def setUpClass(cls):
         # Create a network for the subnet.
         cls.openstack('network create ' + cls.NETWORK_NAME)
-        opts = cls.get_show_opts(cls.FIELDS)
+        opts = cls.get_opts(cls.FIELDS)
         raw_output = cls.openstack(
             'subnet create --network ' + cls.NETWORK_NAME +
             ' --subnet-range 10.10.10.0/24 ' +
@@ -43,17 +43,17 @@ class SubnetTests(test.TestCase):
         cls.assertOutput('', raw_output)
 
     def test_subnet_list(self):
-        opts = self.get_list_opts(self.HEADERS)
+        opts = self.get_opts(self.HEADERS)
         raw_output = self.openstack('subnet list' + opts)
         self.assertIn(self.NAME, raw_output)
 
     def test_subnet_set(self):
         self.openstack('subnet set --no-dhcp ' + self.NAME)
-        opts = self.get_show_opts(['name', 'enable_dhcp'])
+        opts = self.get_opts(['name', 'enable_dhcp'])
         raw_output = self.openstack('subnet show ' + self.NAME + opts)
         self.assertEqual("False\n" + self.NAME + "\n", raw_output)
 
     def test_subnet_show(self):
-        opts = self.get_show_opts(self.FIELDS)
+        opts = self.get_opts(self.FIELDS)
         raw_output = self.openstack('subnet show ' + self.NAME + opts)
         self.assertEqual(self.NAME + "\n", raw_output)
diff --git a/functional/tests/network/v2/test_subnet_pool.py b/functional/tests/network/v2/test_subnet_pool.py
index 1515487a..054188f7 100644
--- a/functional/tests/network/v2/test_subnet_pool.py
+++ b/functional/tests/network/v2/test_subnet_pool.py
@@ -25,7 +25,7 @@ class SubnetPoolTests(test.TestCase):
 
     @classmethod
     def setUpClass(cls):
-        opts = cls.get_show_opts(cls.FIELDS)
+        opts = cls.get_opts(cls.FIELDS)
         raw_output = cls.openstack('subnet pool create --pool-prefix ' +
                                    cls.CREATE_POOL_PREFIX + ' ' +
                                    cls.NAME + opts)
@@ -37,19 +37,19 @@ class SubnetPoolTests(test.TestCase):
         cls.assertOutput('', raw_output)
 
     def test_subnet_list(self):
-        opts = self.get_list_opts(self.HEADERS)
+        opts = self.get_opts(self.HEADERS)
         raw_output = self.openstack('subnet pool list' + opts)
         self.assertIn(self.NAME, raw_output)
 
     def test_subnet_set(self):
         self.openstack('subnet pool set --pool-prefix ' +
                        self.SET_POOL_PREFIX + ' ' + self.NAME)
-        opts = self.get_show_opts(['prefixes', 'name'])
+        opts = self.get_opts(['prefixes', 'name'])
         raw_output = self.openstack('subnet pool show ' + self.NAME + opts)
         self.assertEqual(self.NAME + '\n' + self.SET_POOL_PREFIX + '\n',
                          raw_output)
 
     def test_subnet_show(self):
-        opts = self.get_show_opts(self.FIELDS)
+        opts = self.get_opts(self.FIELDS)
         raw_output = self.openstack('subnet pool show ' + self.NAME + opts)
         self.assertEqual(self.NAME + '\n', raw_output)