python-openstackclient 6.6.0__py3-none-any.whl → 7.0.0__py3-none-any.whl

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

@@ -26,7 +26,7 @@ from openstackclient.tests.unit import utils as tests_utils
 
 class TestFloatingIPPortForwarding(network_fakes.TestNetworkV2):
     def setUp(self):
-        super(TestFloatingIPPortForwarding, self).setUp()
+        super().setUp()
 
         self.floating_ip = (
             network_fakes.FakeFloatingIP.create_one_floating_ip()
@@ -38,7 +38,7 @@ class TestFloatingIPPortForwarding(network_fakes.TestNetworkV2):
 
 class TestCreateFloatingIPPortForwarding(TestFloatingIPPortForwarding):
     def setUp(self):
-        super(TestCreateFloatingIPPortForwarding, self).setUp()
+        super().setUp()
         self.new_port_forwarding = network_fakes.FakeFloatingIPPortForwarding.create_one_port_forwarding(  # noqa: E501
             attrs={
                 'internal_port_id': self.port.id,
@@ -62,7 +62,7 @@ class TestCreateFloatingIPPortForwarding(TestFloatingIPPortForwarding):
 
         # Get the command object to test
         self.cmd = floating_ip_port_forwarding.CreateFloatingIPPortForwarding(
-            self.app, self.namespace
+            self.app, None
         )
 
         self.columns = (
@@ -342,7 +342,7 @@ class TestCreateFloatingIPPortForwarding(TestFloatingIPPortForwarding):
 
 class TestDeleteFloatingIPPortForwarding(TestFloatingIPPortForwarding):
     def setUp(self):
-        super(TestDeleteFloatingIPPortForwarding, self).setUp()
+        super().setUp()
         self._port_forwarding = (
             network_fakes.FakeFloatingIPPortForwarding.create_port_forwardings(
                 count=2,
@@ -358,7 +358,7 @@ class TestDeleteFloatingIPPortForwarding(TestFloatingIPPortForwarding):
         self.network_client.find_ip = mock.Mock(return_value=self.floating_ip)
         # Get the command object to test
         self.cmd = floating_ip_port_forwarding.DeleteFloatingIPPortForwarding(
-            self.app, self.namespace
+            self.app, None
         )
 
     def test_port_forwarding_delete(self):
@@ -465,7 +465,7 @@ class TestListFloatingIPPortForwarding(TestFloatingIPPortForwarding):
     )
 
     def setUp(self):
-        super(TestListFloatingIPPortForwarding, self).setUp()
+        super().setUp()
         self.port_forwardings = (
             network_fakes.FakeFloatingIPPortForwarding.create_port_forwardings(
                 count=3,
@@ -496,7 +496,7 @@ class TestListFloatingIPPortForwarding(TestFloatingIPPortForwarding):
         self.network_client.find_ip = mock.Mock(return_value=self.floating_ip)
         # Get the command object to test
         self.cmd = floating_ip_port_forwarding.ListFloatingIPPortForwarding(
-            self.app, self.namespace
+            self.app, None
         )
 
     def test_port_forwarding_list(self):
@@ -551,7 +551,7 @@ class TestListFloatingIPPortForwarding(TestFloatingIPPortForwarding):
 class TestSetFloatingIPPortForwarding(TestFloatingIPPortForwarding):
     # The Port Forwarding to set.
     def setUp(self):
-        super(TestSetFloatingIPPortForwarding, self).setUp()
+        super().setUp()
         self._port_forwarding = network_fakes.FakeFloatingIPPortForwarding.create_one_port_forwarding(  # noqa: E501
             attrs={
                 'floatingip_id': self.floating_ip.id,
@@ -567,7 +567,7 @@ class TestSetFloatingIPPortForwarding(TestFloatingIPPortForwarding):
         self.network_client.find_ip = mock.Mock(return_value=self.floating_ip)
         # Get the command object to test
         self.cmd = floating_ip_port_forwarding.SetFloatingIPPortForwarding(
-            self.app, self.namespace
+            self.app, None
         )
 
     def test_set_nothing(self):
@@ -672,7 +672,7 @@ class TestShowFloatingIPPortForwarding(TestFloatingIPPortForwarding):
     )
 
     def setUp(self):
-        super(TestShowFloatingIPPortForwarding, self).setUp()
+        super().setUp()
         self._port_forwarding = network_fakes.FakeFloatingIPPortForwarding.create_one_port_forwarding(  # noqa: E501
             attrs={
                 'floatingip_id': self.floating_ip.id,
@@ -696,7 +696,7 @@ class TestShowFloatingIPPortForwarding(TestFloatingIPPortForwarding):
         self.network_client.find_ip = mock.Mock(return_value=self.floating_ip)
         # Get the command object to test
         self.cmd = floating_ip_port_forwarding.ShowFloatingIPPortForwarding(
-            self.app, self.namespace
+            self.app, None
         )
 
     def test_show_no_options(self):

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

@@ -23,10 +23,10 @@ from openstackclient.tests.unit import utils as tests_utils
 
 class TestIPAvailability(network_fakes.TestNetworkV2):
     def setUp(self):
-        super(TestIPAvailability, self).setUp()
+        super().setUp()
 
         # Get a shortcut to the ProjectManager Mock
-        self.projects_mock = self.app.client_manager.identity.projects
+        self.projects_mock = self.identity_client.projects
 
         self.project = identity_fakes.FakeProject.create_one_project()
         self.projects_mock.get.return_value = self.project
@@ -52,9 +52,9 @@ class TestListIPAvailability(TestIPAvailability):
         )
 
     def setUp(self):
-        super(TestListIPAvailability, self).setUp()
+        super().setUp()
 
-        self.cmd = ip_availability.ListIPAvailability(self.app, self.namespace)
+        self.cmd = ip_availability.ListIPAvailability(self.app, None)
         self.network_client.network_ip_availabilities = mock.Mock(
             return_value=self._ip_availability
         )
@@ -132,7 +132,7 @@ class TestShowIPAvailability(TestIPAvailability):
     )
 
     def setUp(self):
-        super(TestShowIPAvailability, self).setUp()
+        super().setUp()
 
         self.network_client.find_network_ip_availability = mock.Mock(
             return_value=self._ip_availability
@@ -142,7 +142,7 @@ class TestShowIPAvailability(TestIPAvailability):
         )
 
         # Get the command object to test
-        self.cmd = ip_availability.ShowIPAvailability(self.app, self.namespace)
+        self.cmd = ip_availability.ShowIPAvailability(self.app, None)
 
     def test_show_no_option(self):
         arglist = []

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

@@ -22,7 +22,7 @@ from openstackclient.tests.unit import utils as tests_utils
 
 class TestConntrackHelper(network_fakes.TestNetworkV2):
     def setUp(self):
-        super(TestConntrackHelper, self).setUp()
+        super().setUp()
 
         self.router = network_fakes.FakeRouter.create_one_router()
         self.network_client.find_router = mock.Mock(return_value=self.router)
@@ -30,7 +30,7 @@ class TestConntrackHelper(network_fakes.TestNetworkV2):
 
 class TestCreateL3ConntrackHelper(TestConntrackHelper):
     def setUp(self):
-        super(TestCreateL3ConntrackHelper, self).setUp()
+        super().setUp()
         attrs = {'router_id': self.router.id}
         self.ct_helper = (
             network_fakes.FakeL3ConntrackHelper.create_one_l3_conntrack_helper(
@@ -51,9 +51,7 @@ class TestCreateL3ConntrackHelper(TestConntrackHelper):
         )
 
         # Get the command object to test
-        self.cmd = l3_conntrack_helper.CreateConntrackHelper(
-            self.app, self.namespace
-        )
+        self.cmd = l3_conntrack_helper.CreateConntrackHelper(self.app, None)
 
     def test_create_no_options(self):
         arglist = []
@@ -114,7 +112,7 @@ class TestCreateL3ConntrackHelper(TestConntrackHelper):
 
 class TestDeleteL3ConntrackHelper(TestConntrackHelper):
     def setUp(self):
-        super(TestDeleteL3ConntrackHelper, self).setUp()
+        super().setUp()
         attrs = {'router_id': self.router.id}
         self.ct_helper = (
             network_fakes.FakeL3ConntrackHelper.create_one_l3_conntrack_helper(
@@ -126,9 +124,7 @@ class TestDeleteL3ConntrackHelper(TestConntrackHelper):
         )
 
         # Get the command object to test
-        self.cmd = l3_conntrack_helper.DeleteConntrackHelper(
-            self.app, self.namespace
-        )
+        self.cmd = l3_conntrack_helper.DeleteConntrackHelper(self.app, None)
 
     def test_delete(self):
         arglist = [self.ct_helper.router_id, self.ct_helper.id]
@@ -160,7 +156,7 @@ class TestDeleteL3ConntrackHelper(TestConntrackHelper):
 
 class TestListL3ConntrackHelper(TestConntrackHelper):
     def setUp(self):
-        super(TestListL3ConntrackHelper, self).setUp()
+        super().setUp()
         attrs = {'router_id': self.router.id}
         ct_helpers = (
             network_fakes.FakeL3ConntrackHelper.create_l3_conntrack_helpers(
@@ -190,9 +186,7 @@ class TestListL3ConntrackHelper(TestConntrackHelper):
         )
 
         # Get the command object to test
-        self.cmd = l3_conntrack_helper.ListConntrackHelper(
-            self.app, self.namespace
-        )
+        self.cmd = l3_conntrack_helper.ListConntrackHelper(self.app, None)
 
     def test_conntrack_helpers_list(self):
         arglist = [self.router.id]
@@ -215,7 +209,7 @@ class TestListL3ConntrackHelper(TestConntrackHelper):
 
 class TestSetL3ConntrackHelper(TestConntrackHelper):
     def setUp(self):
-        super(TestSetL3ConntrackHelper, self).setUp()
+        super().setUp()
         attrs = {'router_id': self.router.id}
         self.ct_helper = (
             network_fakes.FakeL3ConntrackHelper.create_one_l3_conntrack_helper(
@@ -227,9 +221,7 @@ class TestSetL3ConntrackHelper(TestConntrackHelper):
         )
 
         # Get the command object to test
-        self.cmd = l3_conntrack_helper.SetConntrackHelper(
-            self.app, self.namespace
-        )
+        self.cmd = l3_conntrack_helper.SetConntrackHelper(self.app, None)
 
     def test_set_nothing(self):
         arglist = [
@@ -273,7 +265,7 @@ class TestSetL3ConntrackHelper(TestConntrackHelper):
 
 class TestShowL3ConntrackHelper(TestConntrackHelper):
     def setUp(self):
-        super(TestShowL3ConntrackHelper, self).setUp()
+        super().setUp()
         attrs = {'router_id': self.router.id}
         self.ct_helper = (
             network_fakes.FakeL3ConntrackHelper.create_one_l3_conntrack_helper(
@@ -294,9 +286,7 @@ class TestShowL3ConntrackHelper(TestConntrackHelper):
         )
 
         # Get the command object to test
-        self.cmd = l3_conntrack_helper.ShowConntrackHelper(
-            self.app, self.namespace
-        )
+        self.cmd = l3_conntrack_helper.ShowConntrackHelper(self.app, None)
 
     def test_show_no_options(self):
         arglist = []

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

@@ -29,9 +29,9 @@ class TestLocalIP(network_fakes.TestNetworkV2):
         super().setUp()
 
         # Get a shortcut to the ProjectManager Mock
-        self.projects_mock = self.app.client_manager.identity.projects
+        self.projects_mock = self.identity_client.projects
         # Get a shortcut to the DomainManager Mock
-        self.domains_mock = self.app.client_manager.identity.domains
+        self.domains_mock = self.identity_client.domains
 
 
 class TestCreateLocalIP(TestLocalIP):
@@ -86,7 +86,7 @@ class TestCreateLocalIP(TestLocalIP):
         self.network_client.find_port = mock.Mock(return_value=self.port)
 
         # Get the command object to test
-        self.cmd = local_ip.CreateLocalIP(self.app, self.namespace)
+        self.cmd = local_ip.CreateLocalIP(self.app, None)
 
         self.projects_mock.get.return_value = self.project
         self.domains_mock.get.return_value = self.domain
@@ -155,7 +155,7 @@ class TestDeleteLocalIP(TestLocalIP):
         )
 
         # Get the command object to test
-        self.cmd = local_ip.DeleteLocalIP(self.app, self.namespace)
+        self.cmd = local_ip.DeleteLocalIP(self.app, None)
 
     def test_local_ip_delete(self):
         arglist = [
@@ -264,7 +264,7 @@ class TestListLocalIP(TestLocalIP):
         )
 
         # Get the command object to test
-        self.cmd = local_ip.ListLocalIP(self.app, self.namespace)
+        self.cmd = local_ip.ListLocalIP(self.app, None)
 
     def test_local_ip_list(self):
         arglist = []
@@ -408,7 +408,7 @@ class TestSetLocalIP(TestLocalIP):
         )
 
         # Get the command object to test
-        self.cmd = local_ip.SetLocalIP(self.app, self.namespace)
+        self.cmd = local_ip.SetLocalIP(self.app, None)
 
     def test_set_nothing(self):
         arglist = [
@@ -487,7 +487,7 @@ class TestShowLocalIP(TestLocalIP):
         )
 
         # Get the command object to test
-        self.cmd = local_ip.ShowLocalIP(self.app, self.namespace)
+        self.cmd = local_ip.ShowLocalIP(self.app, None)
 
     def test_show_no_options(self):
         arglist = []

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

@@ -53,7 +53,7 @@ class TestCreateLocalIPAssociation(TestLocalIPAssociation):
 
         # Get the command object to test
         self.cmd = local_ip_association.CreateLocalIPAssociation(
-            self.app, self.namespace
+            self.app, None
         )
 
         self.columns = (
@@ -137,7 +137,7 @@ class TestDeleteLocalIPAssociation(TestLocalIPAssociation):
         )
         # Get the command object to test
         self.cmd = local_ip_association.DeleteLocalIPAssociation(
-            self.app, self.namespace
+            self.app, None
         )
 
     def test_local_ip_association_delete(self):
@@ -270,9 +270,7 @@ class TestListLocalIPAssociation(TestLocalIPAssociation):
         )
         self.network_client.find_port = mock.Mock(return_value=self.fixed_port)
         # Get the command object to test
-        self.cmd = local_ip_association.ListLocalIPAssociation(
-            self.app, self.namespace
-        )
+        self.cmd = local_ip_association.ListLocalIPAssociation(self.app, None)
 
     def test_local_ip_association_list(self):
         arglist = [self.local_ip.id]

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

@@ -24,11 +24,11 @@ from openstackclient.tests.unit import utils as tests_utils
 
 class TestNDPProxy(network_fakes.TestNetworkV2):
     def setUp(self):
-        super(TestNDPProxy, self).setUp()
+        super().setUp()
         # Get a shortcut to the ProjectManager Mock
-        self.projects_mock = self.app.client_manager.identity.projects
+        self.projects_mock = self.identity_client.projects
         # Get a shortcut to the DomainManager Mock
-        self.domains_mock = self.app.client_manager.identity.domains
+        self.domains_mock = self.identity_client.domains
 
         self.router = network_fakes.FakeRouter.create_one_router(
             {'id': 'fake-router-id'}
@@ -40,7 +40,7 @@ class TestNDPProxy(network_fakes.TestNetworkV2):
 
 class TestCreateNDPProxy(TestNDPProxy):
     def setUp(self):
-        super(TestCreateNDPProxy, self).setUp()
+        super().setUp()
         attrs = {'router_id': self.router.id, 'port_id': self.port.id}
         self.ndp_proxy = network_fakes.create_one_ndp_proxy(attrs)
         self.columns = (
@@ -73,7 +73,7 @@ class TestCreateNDPProxy(TestNDPProxy):
         )
 
         # Get the command object to test
-        self.cmd = ndp_proxy.CreateNDPProxy(self.app, self.namespace)
+        self.cmd = ndp_proxy.CreateNDPProxy(self.app, None)
 
     def test_create_no_options(self):
         arglist = []
@@ -125,7 +125,7 @@ class TestCreateNDPProxy(TestNDPProxy):
 
 class TestDeleteNDPProxy(TestNDPProxy):
     def setUp(self):
-        super(TestDeleteNDPProxy, self).setUp()
+        super().setUp()
         attrs = {'router_id': self.router.id, 'port_id': self.port.id}
         self.ndp_proxies = network_fakes.create_ndp_proxies(attrs)
         self.ndp_proxy = self.ndp_proxies[0]
@@ -135,7 +135,7 @@ class TestDeleteNDPProxy(TestNDPProxy):
         )
 
         # Get the command object to test
-        self.cmd = ndp_proxy.DeleteNDPProxy(self.app, self.namespace)
+        self.cmd = ndp_proxy.DeleteNDPProxy(self.app, None)
 
     def test_delete(self):
         arglist = [self.ndp_proxy.id]
@@ -183,7 +183,7 @@ class TestDeleteNDPProxy(TestNDPProxy):
 
 class TestListNDPProxy(TestNDPProxy):
     def setUp(self):
-        super(TestListNDPProxy, self).setUp()
+        super().setUp()
         attrs = {'router_id': self.router.id, 'port_id': self.port.id}
         ndp_proxies = network_fakes.create_ndp_proxies(attrs, count=3)
         self.columns = (
@@ -208,7 +208,7 @@ class TestListNDPProxy(TestNDPProxy):
         self.network_client.ndp_proxies = mock.Mock(return_value=ndp_proxies)
 
         # Get the command object to test
-        self.cmd = ndp_proxy.ListNDPProxy(self.app, self.namespace)
+        self.cmd = ndp_proxy.ListNDPProxy(self.app, None)
 
     def test_ndp_proxy_list(self):
         arglist = []
@@ -339,7 +339,7 @@ class TestListNDPProxy(TestNDPProxy):
 
 class TestSetNDPProxy(TestNDPProxy):
     def setUp(self):
-        super(TestSetNDPProxy, self).setUp()
+        super().setUp()
         attrs = {'router_id': self.router.id, 'port_id': self.port.id}
         self.ndp_proxy = network_fakes.create_one_ndp_proxy(attrs)
         self.network_client.update_ndp_proxy = mock.Mock(return_value=None)
@@ -348,7 +348,7 @@ class TestSetNDPProxy(TestNDPProxy):
         )
 
         # Get the command object to test
-        self.cmd = ndp_proxy.SetNDPProxy(self.app, self.namespace)
+        self.cmd = ndp_proxy.SetNDPProxy(self.app, None)
 
     def test_set_nothing(self):
         arglist = [
@@ -407,7 +407,7 @@ class TestSetNDPProxy(TestNDPProxy):
 
 class TestShowNDPProxy(TestNDPProxy):
     def setUp(self):
-        super(TestShowNDPProxy, self).setUp()
+        super().setUp()
         attrs = {'router_id': self.router.id, 'port_id': self.port.id}
         self.ndp_proxy = network_fakes.create_one_ndp_proxy(attrs)
 
@@ -444,7 +444,7 @@ class TestShowNDPProxy(TestNDPProxy):
         )
 
         # Get the command object to test
-        self.cmd = ndp_proxy.ShowNDPProxy(self.app, self.namespace)
+        self.cmd = ndp_proxy.ShowNDPProxy(self.app, None)
 
     def test_show_no_options(self):
         arglist = []

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

@@ -19,7 +19,6 @@ from osc_lib.cli import format_columns
 from osc_lib import exceptions
 
 from openstackclient.network.v2 import network
-from openstackclient.tests.unit import fakes
 from openstackclient.tests.unit.identity.v2_0 import fakes as identity_fakes_v2
 from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes_v3
 from openstackclient.tests.unit.network.v2 import fakes as network_fakes
@@ -30,12 +29,12 @@ from openstackclient.tests.unit import utils as tests_utils
 #
 class TestNetwork(network_fakes.TestNetworkV2):
     def setUp(self):
-        super(TestNetwork, self).setUp()
+        super().setUp()
 
         # Get a shortcut to the ProjectManager Mock
-        self.projects_mock = self.app.client_manager.identity.projects
+        self.projects_mock = self.identity_client.projects
         # Get a shortcut to the DomainManager Mock
-        self.domains_mock = self.app.client_manager.identity.domains
+        self.domains_mock = self.identity_client.domains
 
 
 class TestCreateNetworkIdentityV3(TestNetwork):
@@ -113,7 +112,7 @@ class TestCreateNetworkIdentityV3(TestNetwork):
     )
 
     def setUp(self):
-        super(TestCreateNetworkIdentityV3, self).setUp()
+        super().setUp()
 
         self.network_client.create_network = mock.Mock(
             return_value=self._network
@@ -121,7 +120,7 @@ class TestCreateNetworkIdentityV3(TestNetwork):
         self.network_client.set_tags = mock.Mock(return_value=None)
 
         # Get the command object to test
-        self.cmd = network.CreateNetwork(self.app, self.namespace)
+        self.cmd = network.CreateNetwork(self.app, None)
 
         self.projects_mock.get.return_value = self.project
         self.domains_mock.get.return_value = self.domain
@@ -311,7 +310,11 @@ class TestCreateNetworkIdentityV3(TestNetwork):
         self._test_create_with_tag(add_tags=False)
 
 
-class TestCreateNetworkIdentityV2(TestNetwork):
+class TestCreateNetworkIdentityV2(
+    identity_fakes_v2.FakeClientMixin,
+    network_fakes.FakeClientMixin,
+    tests_utils.TestCommand,
+):
     project = identity_fakes_v2.FakeProject.create_one_project()
     # The new network created.
     _network = network_fakes.create_one_network(
@@ -378,7 +381,7 @@ class TestCreateNetworkIdentityV2(TestNetwork):
     )
 
     def setUp(self):
-        super(TestCreateNetworkIdentityV2, self).setUp()
+        super().setUp()
 
         self.network_client.create_network = mock.Mock(
             return_value=self._network
@@ -386,18 +389,10 @@ class TestCreateNetworkIdentityV2(TestNetwork):
         self.network_client.set_tags = mock.Mock(return_value=None)
 
         # Get the command object to test
-        self.cmd = network.CreateNetwork(self.app, self.namespace)
-
-        # Set identity client v2. And get a shortcut to Identity client.
-        identity_client = identity_fakes_v2.FakeIdentityv2Client(
-            endpoint=fakes.AUTH_URL,
-            token=fakes.AUTH_TOKEN,
-        )
-        self.app.client_manager.identity = identity_client
-        self.identity = self.app.client_manager.identity
+        self.cmd = network.CreateNetwork(self.app, None)
 
         # Get a shortcut to the ProjectManager Mock
-        self.projects_mock = self.identity.tenants
+        self.projects_mock = self.identity_client.tenants
         self.projects_mock.get.return_value = self.project
 
         # There is no DomainManager Mock in fake identity v2.
@@ -458,7 +453,7 @@ class TestCreateNetworkIdentityV2(TestNetwork):
 
 class TestDeleteNetwork(TestNetwork):
     def setUp(self):
-        super(TestDeleteNetwork, self).setUp()
+        super().setUp()
 
         # The networks to delete
         self._networks = network_fakes.create_networks(count=3)
@@ -470,7 +465,7 @@ class TestDeleteNetwork(TestNetwork):
         )
 
         # Get the command object to test
-        self.cmd = network.DeleteNetwork(self.app, self.namespace)
+        self.cmd = network.DeleteNetwork(self.app, None)
 
     def test_delete_one_network(self):
         arglist = [
@@ -596,10 +591,10 @@ class TestListNetwork(TestNetwork):
         )
 
     def setUp(self):
-        super(TestListNetwork, self).setUp()
+        super().setUp()
 
         # Get the command object to test
-        self.cmd = network.ListNetwork(self.app, self.namespace)
+        self.cmd = network.ListNetwork(self.app, None)
 
         self.network_client.networks = mock.Mock(return_value=self._network)
 
@@ -954,7 +949,7 @@ class TestSetNetwork(TestNetwork):
     )
 
     def setUp(self):
-        super(TestSetNetwork, self).setUp()
+        super().setUp()
 
         self.network_client.update_network = mock.Mock(return_value=None)
         self.network_client.set_tags = mock.Mock(return_value=None)
@@ -967,7 +962,7 @@ class TestSetNetwork(TestNetwork):
         )
 
         # Get the command object to test
-        self.cmd = network.SetNetwork(self.app, self.namespace)
+        self.cmd = network.SetNetwork(self.app, None)
 
     def test_set_this(self):
         arglist = [
@@ -1203,14 +1198,14 @@ class TestShowNetwork(TestNetwork):
     )
 
     def setUp(self):
-        super(TestShowNetwork, self).setUp()
+        super().setUp()
 
         self.network_client.find_network = mock.Mock(
             return_value=self._network
         )
 
         # Get the command object to test
-        self.cmd = network.ShowNetwork(self.app, self.namespace)
+        self.cmd = network.ShowNetwork(self.app, None)
 
     def test_show_no_options(self):
         arglist = []
@@ -1251,7 +1246,7 @@ class TestUnsetNetwork(TestNetwork):
     )
 
     def setUp(self):
-        super(TestUnsetNetwork, self).setUp()
+        super().setUp()
 
         self.network_client.update_network = mock.Mock(return_value=None)
         self.network_client.set_tags = mock.Mock(return_value=None)
@@ -1264,7 +1259,7 @@ class TestUnsetNetwork(TestNetwork):
         )
 
         # Get the command object to test
-        self.cmd = network.UnsetNetwork(self.app, self.namespace)
+        self.cmd = network.UnsetNetwork(self.app, None)
 
     def test_unset_nothing(self):
         arglist = [