python-openstackclient 6.6.1__py3-none-any.whl → 7.1.0__py3-none-any.whl

openstackclient/tests/unit/network/v2/test_network_meter.py

@@ -26,10 +26,10 @@ from openstackclient.tests.unit import utils as tests_utils
 
 class TestMeter(network_fakes.TestNetworkV2):
     def setUp(self):
-        super(TestMeter, self).setUp()
+        super().setUp()
 
-        self.projects_mock = self.app.client_manager.identity.projects
-        self.domains_mock = self.app.client_manager.identity.domains
+        self.projects_mock = self.identity_client.projects
+        self.domains_mock = self.identity_client.domains
 
 
 class TestCreateMeter(TestMeter):
@@ -54,12 +54,12 @@ class TestCreateMeter(TestMeter):
     )
 
     def setUp(self):
-        super(TestCreateMeter, self).setUp()
+        super().setUp()
         self.network_client.create_metering_label = mock.Mock(
             return_value=self.new_meter
         )
         self.projects_mock.get.return_value = self.project
-        self.cmd = network_meter.CreateMeter(self.app, self.namespace)
+        self.cmd = network_meter.CreateMeter(self.app, None)
 
     def test_create_no_options(self):
         arglist = []
@@ -128,7 +128,7 @@ class TestCreateMeter(TestMeter):
 
 class TestDeleteMeter(TestMeter):
     def setUp(self):
-        super(TestDeleteMeter, self).setUp()
+        super().setUp()
 
         self.meter_list = network_fakes.FakeNetworkMeter.create_meter(count=2)
 
@@ -140,7 +140,7 @@ class TestDeleteMeter(TestMeter):
             network_fakes.FakeNetworkMeter.get_meter(meter=self.meter_list)
         )
 
-        self.cmd = network_meter.DeleteMeter(self.app, self.namespace)
+        self.cmd = network_meter.DeleteMeter(self.app, None)
 
     def test_delete_one_meter(self):
         arglist = [
@@ -238,13 +238,13 @@ class TestListMeter(TestMeter):
         )
 
     def setUp(self):
-        super(TestListMeter, self).setUp()
+        super().setUp()
 
         self.network_client.metering_labels = mock.Mock(
             return_value=self.meter_list
         )
 
-        self.cmd = network_meter.ListMeter(self.app, self.namespace)
+        self.cmd = network_meter.ListMeter(self.app, None)
 
     def test_meter_list(self):
         arglist = []
@@ -278,9 +278,9 @@ class TestShowMeter(TestMeter):
     )
 
     def setUp(self):
-        super(TestShowMeter, self).setUp()
+        super().setUp()
 
-        self.cmd = network_meter.ShowMeter(self.app, self.namespace)
+        self.cmd = network_meter.ShowMeter(self.app, None)
 
         self.network_client.find_metering_label = mock.Mock(
             return_value=self.new_meter

openstackclient/tests/unit/network/v2/test_network_meter_rule.py

@@ -26,10 +26,10 @@ from openstackclient.tests.unit import utils as tests_utils
 
 class TestMeterRule(network_fakes.TestNetworkV2):
     def setUp(self):
-        super(TestMeterRule, self).setUp()
+        super().setUp()
 
-        self.projects_mock = self.app.client_manager.identity.projects
-        self.domains_mock = self.app.client_manager.identity.domains
+        self.projects_mock = self.identity_client.projects
+        self.domains_mock = self.identity_client.domains
 
 
 class TestCreateMeterRule(TestMeterRule):
@@ -60,7 +60,7 @@ class TestCreateMeterRule(TestMeterRule):
     )
 
     def setUp(self):
-        super(TestCreateMeterRule, self).setUp()
+        super().setUp()
         fake_meter = network_fakes.FakeNetworkMeter.create_one_meter(
             {'id': self.new_rule.metering_label_id}
         )
@@ -69,7 +69,7 @@ class TestCreateMeterRule(TestMeterRule):
             return_value=self.new_rule
         )
         self.projects_mock.get.return_value = self.project
-        self.cmd = network_meter_rule.CreateMeterRule(self.app, self.namespace)
+        self.cmd = network_meter_rule.CreateMeterRule(self.app, None)
         self.network_client.find_metering_label = mock.Mock(
             return_value=fake_meter
         )
@@ -142,7 +142,7 @@ class TestCreateMeterRule(TestMeterRule):
 
 class TestDeleteMeterRule(TestMeterRule):
     def setUp(self):
-        super(TestDeleteMeterRule, self).setUp()
+        super().setUp()
         self.rule_list = network_fakes.FakeNetworkMeterRule.create_meter_rule(
             count=2
         )
@@ -156,7 +156,7 @@ class TestDeleteMeterRule(TestMeterRule):
             )
         )
 
-        self.cmd = network_meter_rule.DeleteMeterRule(self.app, self.namespace)
+        self.cmd = network_meter_rule.DeleteMeterRule(self.app, None)
 
     def test_delete_one_rule(self):
         arglist = [
@@ -260,13 +260,13 @@ class TestListMeterRule(TestMeterRule):
         )
 
     def setUp(self):
-        super(TestListMeterRule, self).setUp()
+        super().setUp()
 
         self.network_client.metering_label_rules = mock.Mock(
             return_value=self.rule_list
         )
 
-        self.cmd = network_meter_rule.ListMeterRule(self.app, self.namespace)
+        self.cmd = network_meter_rule.ListMeterRule(self.app, None)
 
     def test_rule_list(self):
         arglist = []
@@ -307,9 +307,9 @@ class TestShowMeterRule(TestMeterRule):
     )
 
     def setUp(self):
-        super(TestShowMeterRule, self).setUp()
+        super().setUp()
 
-        self.cmd = network_meter_rule.ShowMeterRule(self.app, self.namespace)
+        self.cmd = network_meter_rule.ShowMeterRule(self.app, None)
 
         self.network_client.find_metering_label_rule = mock.Mock(
             return_value=self.new_rule

openstackclient/tests/unit/network/v2/test_network_qos_policy.py

@@ -26,7 +26,7 @@ from openstackclient.tests.unit import utils as tests_utils
 
 class TestQosPolicy(network_fakes.TestNetworkV2):
     def setUp(self):
-        super(TestQosPolicy, self).setUp()
+        super().setUp()
         # Get a shortcut to the ProjectManager Mock
         self.projects_mock = self.app.client_manager.identity.projects
 
@@ -61,15 +61,13 @@ class TestCreateNetworkQosPolicy(TestQosPolicy):
     )
 
     def setUp(self):
-        super(TestCreateNetworkQosPolicy, self).setUp()
+        super().setUp()
         self.network_client.create_qos_policy = mock.Mock(
             return_value=self.new_qos_policy
         )
 
         # Get the command object to test
-        self.cmd = network_qos_policy.CreateNetworkQosPolicy(
-            self.app, self.namespace
-        )
+        self.cmd = network_qos_policy.CreateNetworkQosPolicy(self.app, None)
 
         self.projects_mock.get.return_value = self.project
 
@@ -165,7 +163,7 @@ class TestDeleteNetworkQosPolicy(TestQosPolicy):
     )
 
     def setUp(self):
-        super(TestDeleteNetworkQosPolicy, self).setUp()
+        super().setUp()
         self.network_client.delete_qos_policy = mock.Mock(return_value=None)
         self.network_client.find_qos_policy = (
             network_fakes.FakeNetworkQosPolicy.get_qos_policies(
@@ -174,9 +172,7 @@ class TestDeleteNetworkQosPolicy(TestQosPolicy):
         )
 
         # Get the command object to test
-        self.cmd = network_qos_policy.DeleteNetworkQosPolicy(
-            self.app, self.namespace
-        )
+        self.cmd = network_qos_policy.DeleteNetworkQosPolicy(self.app, None)
 
     def test_qos_policy_delete(self):
         arglist = [
@@ -272,15 +268,13 @@ class TestListNetworkQosPolicy(TestQosPolicy):
         )
 
     def setUp(self):
-        super(TestListNetworkQosPolicy, self).setUp()
+        super().setUp()
         self.network_client.qos_policies = mock.Mock(
             return_value=self.qos_policies
         )
 
         # Get the command object to test
-        self.cmd = network_qos_policy.ListNetworkQosPolicy(
-            self.app, self.namespace
-        )
+        self.cmd = network_qos_policy.ListNetworkQosPolicy(self.app, None)
 
     def test_qos_policy_list(self):
         arglist = []
@@ -354,16 +348,14 @@ class TestSetNetworkQosPolicy(TestQosPolicy):
     _qos_policy = network_fakes.FakeNetworkQosPolicy.create_one_qos_policy()
 
     def setUp(self):
-        super(TestSetNetworkQosPolicy, self).setUp()
+        super().setUp()
         self.network_client.update_qos_policy = mock.Mock(return_value=None)
         self.network_client.find_qos_policy = mock.Mock(
             return_value=self._qos_policy
         )
 
         # Get the command object to test
-        self.cmd = network_qos_policy.SetNetworkQosPolicy(
-            self.app, self.namespace
-        )
+        self.cmd = network_qos_policy.SetNetworkQosPolicy(self.app, None)
 
     def test_set_nothing(self):
         arglist = [
@@ -457,15 +449,13 @@ class TestShowNetworkQosPolicy(TestQosPolicy):
     )
 
     def setUp(self):
-        super(TestShowNetworkQosPolicy, self).setUp()
+        super().setUp()
         self.network_client.find_qos_policy = mock.Mock(
             return_value=self._qos_policy
         )
 
         # Get the command object to test
-        self.cmd = network_qos_policy.ShowNetworkQosPolicy(
-            self.app, self.namespace
-        )
+        self.cmd = network_qos_policy.ShowNetworkQosPolicy(self.app, None)
 
     def test_show_no_options(self):
         arglist = []

openstackclient/tests/unit/network/v2/test_network_qos_rule.py

@@ -53,7 +53,7 @@ DSCP_VALID_MARKS = [
 
 class TestNetworkQosRule(network_fakes.TestNetworkV2):
     def setUp(self):
-        super(TestNetworkQosRule, self).setUp()
+        super().setUp()
         self.qos_policy = (
             network_fakes.FakeNetworkQosPolicy.create_one_qos_policy()
         )
@@ -67,7 +67,7 @@ class TestCreateNetworkQosRuleMinimumBandwidth(TestNetworkQosRule):
         pass
 
     def setUp(self):
-        super(TestCreateNetworkQosRuleMinimumBandwidth, self).setUp()
+        super().setUp()
         attrs = {
             'qos_policy_id': self.qos_policy.id,
             'type': RULE_TYPE_MINIMUM_BANDWIDTH,
@@ -97,9 +97,7 @@ class TestCreateNetworkQosRuleMinimumBandwidth(TestNetworkQosRule):
         )
 
         # Get the command object to test
-        self.cmd = network_qos_rule.CreateNetworkQosRule(
-            self.app, self.namespace
-        )
+        self.cmd = network_qos_rule.CreateNetworkQosRule(self.app, None)
 
     def test_create_no_options(self):
         arglist = []
@@ -176,7 +174,7 @@ class TestCreateNetworkQosRuleMinimumPacketRate(TestNetworkQosRule):
         pass
 
     def setUp(self):
-        super(TestCreateNetworkQosRuleMinimumPacketRate, self).setUp()
+        super().setUp()
         attrs = {
             'qos_policy_id': self.qos_policy.id,
             'type': RULE_TYPE_MINIMUM_PACKET_RATE,
@@ -206,9 +204,7 @@ class TestCreateNetworkQosRuleMinimumPacketRate(TestNetworkQosRule):
         )
 
         # Get the command object to test
-        self.cmd = network_qos_rule.CreateNetworkQosRule(
-            self.app, self.namespace
-        )
+        self.cmd = network_qos_rule.CreateNetworkQosRule(self.app, None)
 
     def test_create_no_options(self):
         arglist = []
@@ -285,7 +281,7 @@ class TestCreateNetworkQosRuleDSCPMarking(TestNetworkQosRule):
         pass
 
     def setUp(self):
-        super(TestCreateNetworkQosRuleDSCPMarking, self).setUp()
+        super().setUp()
         attrs = {
             'qos_policy_id': self.qos_policy.id,
             'type': RULE_TYPE_DSCP_MARKING,
@@ -313,9 +309,7 @@ class TestCreateNetworkQosRuleDSCPMarking(TestNetworkQosRule):
         )
 
         # Get the command object to test
-        self.cmd = network_qos_rule.CreateNetworkQosRule(
-            self.app, self.namespace
-        )
+        self.cmd = network_qos_rule.CreateNetworkQosRule(self.app, None)
 
     def test_create_no_options(self):
         arglist = []
@@ -385,7 +379,7 @@ class TestCreateNetworkQosRuleBandwidtLimit(TestNetworkQosRule):
         pass
 
     def setUp(self):
-        super(TestCreateNetworkQosRuleBandwidtLimit, self).setUp()
+        super().setUp()
         attrs = {
             'qos_policy_id': self.qos_policy.id,
             'type': RULE_TYPE_BANDWIDTH_LIMIT,
@@ -417,9 +411,7 @@ class TestCreateNetworkQosRuleBandwidtLimit(TestNetworkQosRule):
         )
 
         # Get the command object to test
-        self.cmd = network_qos_rule.CreateNetworkQosRule(
-            self.app, self.namespace
-        )
+        self.cmd = network_qos_rule.CreateNetworkQosRule(self.app, None)
 
     def test_create_no_options(self):
         arglist = []
@@ -548,7 +540,7 @@ class TestCreateNetworkQosRuleBandwidtLimit(TestNetworkQosRule):
 
 class TestDeleteNetworkQosRuleMinimumBandwidth(TestNetworkQosRule):
     def setUp(self):
-        super(TestDeleteNetworkQosRuleMinimumBandwidth, self).setUp()
+        super().setUp()
         attrs = {
             'qos_policy_id': self.qos_policy.id,
             'type': RULE_TYPE_MINIMUM_BANDWIDTH,
@@ -567,9 +559,7 @@ class TestDeleteNetworkQosRuleMinimumBandwidth(TestNetworkQosRule):
         )
 
         # Get the command object to test
-        self.cmd = network_qos_rule.DeleteNetworkQosRule(
-            self.app, self.namespace
-        )
+        self.cmd = network_qos_rule.DeleteNetworkQosRule(self.app, None)
 
     def test_qos_policy_delete(self):
         arglist = [
@@ -608,16 +598,16 @@ class TestDeleteNetworkQosRuleMinimumBandwidth(TestNetworkQosRule):
             parsed_args = self.check_parser(self.cmd, arglist, verifylist)
             self.cmd.take_action(parsed_args)
         except exceptions.CommandError as e:
-            msg = 'Failed to delete Network QoS rule ID "%(rule)s": %(e)s' % {
-                'rule': self.new_rule.id,
-                'e': 'Error message',
-            }
+            msg = 'Failed to delete Network QoS rule ID "{rule}": {e}'.format(
+                rule=self.new_rule.id,
+                e='Error message',
+            )
             self.assertEqual(msg, str(e))
 
 
 class TestDeleteNetworkQosRuleMinimumPacketRate(TestNetworkQosRule):
     def setUp(self):
-        super(TestDeleteNetworkQosRuleMinimumPacketRate, self).setUp()
+        super().setUp()
         attrs = {
             'qos_policy_id': self.qos_policy.id,
             'type': RULE_TYPE_MINIMUM_PACKET_RATE,
@@ -636,9 +626,7 @@ class TestDeleteNetworkQosRuleMinimumPacketRate(TestNetworkQosRule):
         )
 
         # Get the command object to test
-        self.cmd = network_qos_rule.DeleteNetworkQosRule(
-            self.app, self.namespace
-        )
+        self.cmd = network_qos_rule.DeleteNetworkQosRule(self.app, None)
 
     def test_qos_policy_delete(self):
         arglist = [
@@ -677,16 +665,16 @@ class TestDeleteNetworkQosRuleMinimumPacketRate(TestNetworkQosRule):
             parsed_args = self.check_parser(self.cmd, arglist, verifylist)
             self.cmd.take_action(parsed_args)
         except exceptions.CommandError as e:
-            msg = 'Failed to delete Network QoS rule ID "%(rule)s": %(e)s' % {
-                'rule': self.new_rule.id,
-                'e': 'Error message',
-            }
+            msg = 'Failed to delete Network QoS rule ID "{rule}": {e}'.format(
+                rule=self.new_rule.id,
+                e='Error message',
+            )
             self.assertEqual(msg, str(e))
 
 
 class TestDeleteNetworkQosRuleDSCPMarking(TestNetworkQosRule):
     def setUp(self):
-        super(TestDeleteNetworkQosRuleDSCPMarking, self).setUp()
+        super().setUp()
         attrs = {
             'qos_policy_id': self.qos_policy.id,
             'type': RULE_TYPE_DSCP_MARKING,
@@ -705,9 +693,7 @@ class TestDeleteNetworkQosRuleDSCPMarking(TestNetworkQosRule):
         )
 
         # Get the command object to test
-        self.cmd = network_qos_rule.DeleteNetworkQosRule(
-            self.app, self.namespace
-        )
+        self.cmd = network_qos_rule.DeleteNetworkQosRule(self.app, None)
 
     def test_qos_policy_delete(self):
         arglist = [
@@ -746,16 +732,16 @@ class TestDeleteNetworkQosRuleDSCPMarking(TestNetworkQosRule):
             parsed_args = self.check_parser(self.cmd, arglist, verifylist)
             self.cmd.take_action(parsed_args)
         except exceptions.CommandError as e:
-            msg = 'Failed to delete Network QoS rule ID "%(rule)s": %(e)s' % {
-                'rule': self.new_rule.id,
-                'e': 'Error message',
-            }
+            msg = 'Failed to delete Network QoS rule ID "{rule}": {e}'.format(
+                rule=self.new_rule.id,
+                e='Error message',
+            )
             self.assertEqual(msg, str(e))
 
 
 class TestDeleteNetworkQosRuleBandwidthLimit(TestNetworkQosRule):
     def setUp(self):
-        super(TestDeleteNetworkQosRuleBandwidthLimit, self).setUp()
+        super().setUp()
         attrs = {
             'qos_policy_id': self.qos_policy.id,
             'type': RULE_TYPE_BANDWIDTH_LIMIT,
@@ -774,9 +760,7 @@ class TestDeleteNetworkQosRuleBandwidthLimit(TestNetworkQosRule):
         )
 
         # Get the command object to test
-        self.cmd = network_qos_rule.DeleteNetworkQosRule(
-            self.app, self.namespace
-        )
+        self.cmd = network_qos_rule.DeleteNetworkQosRule(self.app, None)
 
     def test_qos_policy_delete(self):
         arglist = [
@@ -815,16 +799,16 @@ class TestDeleteNetworkQosRuleBandwidthLimit(TestNetworkQosRule):
             parsed_args = self.check_parser(self.cmd, arglist, verifylist)
             self.cmd.take_action(parsed_args)
         except exceptions.CommandError as e:
-            msg = 'Failed to delete Network QoS rule ID "%(rule)s": %(e)s' % {
-                'rule': self.new_rule.id,
-                'e': 'Error message',
-            }
+            msg = 'Failed to delete Network QoS rule ID "{rule}": {e}'.format(
+                rule=self.new_rule.id,
+                e='Error message',
+            )
             self.assertEqual(msg, str(e))
 
 
 class TestSetNetworkQosRuleMinimumBandwidth(TestNetworkQosRule):
     def setUp(self):
-        super(TestSetNetworkQosRuleMinimumBandwidth, self).setUp()
+        super().setUp()
         attrs = {
             'qos_policy_id': self.qos_policy.id,
             'type': RULE_TYPE_MINIMUM_BANDWIDTH,
@@ -844,7 +828,7 @@ class TestSetNetworkQosRuleMinimumBandwidth(TestNetworkQosRule):
         )
 
         # Get the command object to test
-        self.cmd = network_qos_rule.SetNetworkQosRule(self.app, self.namespace)
+        self.cmd = network_qos_rule.SetNetworkQosRule(self.app, None)
 
     def test_set_nothing(self):
         arglist = [
@@ -928,7 +912,7 @@ class TestSetNetworkQosRuleMinimumBandwidth(TestNetworkQosRule):
 
 class TestSetNetworkQosRuleMinimumPacketRate(TestNetworkQosRule):
     def setUp(self):
-        super(TestSetNetworkQosRuleMinimumPacketRate, self).setUp()
+        super().setUp()
         attrs = {
             'qos_policy_id': self.qos_policy.id,
             'type': RULE_TYPE_MINIMUM_PACKET_RATE,
@@ -948,7 +932,7 @@ class TestSetNetworkQosRuleMinimumPacketRate(TestNetworkQosRule):
         )
 
         # Get the command object to test
-        self.cmd = network_qos_rule.SetNetworkQosRule(self.app, self.namespace)
+        self.cmd = network_qos_rule.SetNetworkQosRule(self.app, None)
 
     def test_set_nothing(self):
         arglist = [
@@ -1032,7 +1016,7 @@ class TestSetNetworkQosRuleMinimumPacketRate(TestNetworkQosRule):
 
 class TestSetNetworkQosRuleDSCPMarking(TestNetworkQosRule):
     def setUp(self):
-        super(TestSetNetworkQosRuleDSCPMarking, self).setUp()
+        super().setUp()
         attrs = {
             'qos_policy_id': self.qos_policy.id,
             'type': RULE_TYPE_DSCP_MARKING,
@@ -1052,7 +1036,7 @@ class TestSetNetworkQosRuleDSCPMarking(TestNetworkQosRule):
         )
 
         # Get the command object to test
-        self.cmd = network_qos_rule.SetNetworkQosRule(self.app, self.namespace)
+        self.cmd = network_qos_rule.SetNetworkQosRule(self.app, None)
 
     def test_set_nothing(self):
         arglist = [
@@ -1136,7 +1120,7 @@ class TestSetNetworkQosRuleDSCPMarking(TestNetworkQosRule):
 
 class TestSetNetworkQosRuleBandwidthLimit(TestNetworkQosRule):
     def setUp(self):
-        super(TestSetNetworkQosRuleBandwidthLimit, self).setUp()
+        super().setUp()
         attrs = {
             'qos_policy_id': self.qos_policy.id,
             'type': RULE_TYPE_BANDWIDTH_LIMIT,
@@ -1156,7 +1140,7 @@ class TestSetNetworkQosRuleBandwidthLimit(TestNetworkQosRule):
         )
 
         # Get the command object to test
-        self.cmd = network_qos_rule.SetNetworkQosRule(self.app, self.namespace)
+        self.cmd = network_qos_rule.SetNetworkQosRule(self.app, None)
 
     def test_set_nothing(self):
         arglist = [
@@ -1313,7 +1297,7 @@ class TestSetNetworkQosRuleBandwidthLimit(TestNetworkQosRule):
 
 class TestListNetworkQosRule(TestNetworkQosRule):
     def setUp(self):
-        super(TestListNetworkQosRule, self).setUp()
+        super().setUp()
         attrs = {
             'qos_policy_id': self.qos_policy.id,
             'type': RULE_TYPE_MINIMUM_BANDWIDTH,
@@ -1380,9 +1364,7 @@ class TestListNetworkQosRule(TestNetworkQosRule):
                 )
             )
         # Get the command object to test
-        self.cmd = network_qos_rule.ListNetworkQosRule(
-            self.app, self.namespace
-        )
+        self.cmd = network_qos_rule.ListNetworkQosRule(self.app, None)
 
     def test_qos_rule_list(self):
         arglist = [self.qos_policy.id]
@@ -1405,7 +1387,7 @@ class TestListNetworkQosRule(TestNetworkQosRule):
 
 class TestShowNetworkQosRuleMinimumBandwidth(TestNetworkQosRule):
     def setUp(self):
-        super(TestShowNetworkQosRuleMinimumBandwidth, self).setUp()
+        super().setUp()
         attrs = {
             'qos_policy_id': self.qos_policy.id,
             'type': RULE_TYPE_MINIMUM_BANDWIDTH,
@@ -1436,9 +1418,7 @@ class TestShowNetworkQosRuleMinimumBandwidth(TestNetworkQosRule):
         )
 
         # Get the command object to test
-        self.cmd = network_qos_rule.ShowNetworkQosRule(
-            self.app, self.namespace
-        )
+        self.cmd = network_qos_rule.ShowNetworkQosRule(self.app, None)
 
     def test_show_no_options(self):
         arglist = []
@@ -1475,7 +1455,7 @@ class TestShowNetworkQosRuleMinimumBandwidth(TestNetworkQosRule):
 
 class TestShowNetworkQosRuleMinimumPacketRate(TestNetworkQosRule):
     def setUp(self):
-        super(TestShowNetworkQosRuleMinimumPacketRate, self).setUp()
+        super().setUp()
         attrs = {
             'qos_policy_id': self.qos_policy.id,
             'type': RULE_TYPE_MINIMUM_PACKET_RATE,
@@ -1506,9 +1486,7 @@ class TestShowNetworkQosRuleMinimumPacketRate(TestNetworkQosRule):
         )
 
         # Get the command object to test
-        self.cmd = network_qos_rule.ShowNetworkQosRule(
-            self.app, self.namespace
-        )
+        self.cmd = network_qos_rule.ShowNetworkQosRule(self.app, None)
 
     def test_show_no_options(self):
         arglist = []
@@ -1545,7 +1523,7 @@ class TestShowNetworkQosRuleMinimumPacketRate(TestNetworkQosRule):
 
 class TestShowNetworkQosDSCPMarking(TestNetworkQosRule):
     def setUp(self):
-        super(TestShowNetworkQosDSCPMarking, self).setUp()
+        super().setUp()
         attrs = {
             'qos_policy_id': self.qos_policy.id,
             'type': RULE_TYPE_DSCP_MARKING,
@@ -1574,9 +1552,7 @@ class TestShowNetworkQosDSCPMarking(TestNetworkQosRule):
         )
 
         # Get the command object to test
-        self.cmd = network_qos_rule.ShowNetworkQosRule(
-            self.app, self.namespace
-        )
+        self.cmd = network_qos_rule.ShowNetworkQosRule(self.app, None)
 
     def test_show_no_options(self):
         arglist = []
@@ -1613,7 +1589,7 @@ class TestShowNetworkQosDSCPMarking(TestNetworkQosRule):
 
 class TestShowNetworkQosBandwidthLimit(TestNetworkQosRule):
     def setUp(self):
-        super(TestShowNetworkQosBandwidthLimit, self).setUp()
+        super().setUp()
         attrs = {
             'qos_policy_id': self.qos_policy.id,
             'type': RULE_TYPE_BANDWIDTH_LIMIT,
@@ -1646,9 +1622,7 @@ class TestShowNetworkQosBandwidthLimit(TestNetworkQosRule):
         )
 
         # Get the command object to test
-        self.cmd = network_qos_rule.ShowNetworkQosRule(
-            self.app, self.namespace
-        )
+        self.cmd = network_qos_rule.ShowNetworkQosRule(self.app, None)
 
     def test_show_no_options(self):
         arglist = []

openstackclient/tests/unit/network/v2/test_network_qos_rule_type.py

@@ -22,7 +22,7 @@ from openstackclient.tests.unit import utils as tests_utils
 
 class TestNetworkQosRuleType(network_fakes.TestNetworkV2):
     def setUp(self):
-        super(TestNetworkQosRuleType, self).setUp()
+        super().setUp()
 
 
 class TestShowNetworkQosRuleType(TestNetworkQosRuleType):
@@ -35,15 +35,13 @@ class TestShowNetworkQosRuleType(TestNetworkQosRuleType):
     data = [qos_rule_type.drivers, qos_rule_type.type]
 
     def setUp(self):
-        super(TestShowNetworkQosRuleType, self).setUp()
+        super().setUp()
         self.network_client.get_qos_rule_type = mock.Mock(
             return_value=self.qos_rule_type
         )
 
         # Get the command object to test
-        self.cmd = _qos_rule_type.ShowNetworkQosRuleType(
-            self.app, self.namespace
-        )
+        self.cmd = _qos_rule_type.ShowNetworkQosRuleType(self.app, None)
 
     def test_show_no_options(self):
         arglist = []
@@ -87,15 +85,13 @@ class TestListNetworkQosRuleType(TestNetworkQosRuleType):
         data.append((qos_rule_type.type,))
 
     def setUp(self):
-        super(TestListNetworkQosRuleType, self).setUp()
+        super().setUp()
         self.network_client.qos_rule_types = mock.Mock(
             return_value=self.qos_rule_types
         )
 
         # Get the command object to test
-        self.cmd = _qos_rule_type.ListNetworkQosRuleType(
-            self.app, self.namespace
-        )
+        self.cmd = _qos_rule_type.ListNetworkQosRuleType(self.app, None)
 
     def test_qos_rule_type_list(self):
         arglist = []