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

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

@@ -24,7 +24,7 @@ from openstackclient.tests.unit import utils as tests_utils
 
 class TestNetworkAgent(network_fakes.TestNetworkV2):
     def setUp(self):
-        super(TestNetworkAgent, self).setUp()
+        super().setUp()
 
 
 class TestAddNetworkToAgent(TestNetworkAgent):
@@ -32,13 +32,13 @@ class TestAddNetworkToAgent(TestNetworkAgent):
     agent = network_fakes.create_one_network_agent()
 
     def setUp(self):
-        super(TestAddNetworkToAgent, self).setUp()
+        super().setUp()
 
         self.network_client.get_agent = mock.Mock(return_value=self.agent)
         self.network_client.find_network = mock.Mock(return_value=self.net)
         self.network_client.name = self.network_client.find_network.name
 
-        self.cmd = network_agent.AddNetworkToAgent(self.app, self.namespace)
+        self.cmd = network_agent.AddNetworkToAgent(self.app, None)
 
     def test_show_no_options(self):
         arglist = []
@@ -74,12 +74,12 @@ class TestAddRouterAgent(TestNetworkAgent):
     _agent = network_fakes.create_one_network_agent()
 
     def setUp(self):
-        super(TestAddRouterAgent, self).setUp()
+        super().setUp()
 
         self.network_client.get_agent = mock.Mock(return_value=self._agent)
         self.network_client.find_router = mock.Mock(return_value=self._router)
 
-        self.cmd = network_agent.AddRouterToAgent(self.app, self.namespace)
+        self.cmd = network_agent.AddRouterToAgent(self.app, None)
 
     def test_add_no_options(self):
         arglist = []
@@ -119,11 +119,11 @@ class TestDeleteNetworkAgent(TestNetworkAgent):
     network_agents = network_fakes.create_network_agents(count=2)
 
     def setUp(self):
-        super(TestDeleteNetworkAgent, self).setUp()
+        super().setUp()
         self.network_client.delete_agent = mock.Mock(return_value=None)
 
         # Get the command object to test
-        self.cmd = network_agent.DeleteNetworkAgent(self.app, self.namespace)
+        self.cmd = network_agent.DeleteNetworkAgent(self.app, None)
 
     def test_network_agent_delete(self):
         arglist = [
@@ -218,7 +218,7 @@ class TestListNetworkAgent(TestNetworkAgent):
         )
 
     def setUp(self):
-        super(TestListNetworkAgent, self).setUp()
+        super().setUp()
         self.network_client.agents = mock.Mock(
             return_value=self.network_agents
         )
@@ -245,7 +245,7 @@ class TestListNetworkAgent(TestNetworkAgent):
         )
 
         # Get the command object to test
-        self.cmd = network_agent.ListNetworkAgent(self.app, self.namespace)
+        self.cmd = network_agent.ListNetworkAgent(self.app, None)
 
     def test_network_agents_list(self):
         arglist = []
@@ -369,15 +369,13 @@ class TestRemoveNetworkFromAgent(TestNetworkAgent):
     agent = network_fakes.create_one_network_agent()
 
     def setUp(self):
-        super(TestRemoveNetworkFromAgent, self).setUp()
+        super().setUp()
 
         self.network_client.get_agent = mock.Mock(return_value=self.agent)
         self.network_client.find_network = mock.Mock(return_value=self.net)
         self.network_client.name = self.network_client.find_network.name
 
-        self.cmd = network_agent.RemoveNetworkFromAgent(
-            self.app, self.namespace
-        )
+        self.cmd = network_agent.RemoveNetworkFromAgent(self.app, None)
 
     def test_show_no_options(self):
         arglist = []
@@ -428,14 +426,12 @@ class TestRemoveRouterAgent(TestNetworkAgent):
     _agent = network_fakes.create_one_network_agent()
 
     def setUp(self):
-        super(TestRemoveRouterAgent, self).setUp()
+        super().setUp()
 
         self.network_client.get_agent = mock.Mock(return_value=self._agent)
         self.network_client.find_router = mock.Mock(return_value=self._router)
 
-        self.cmd = network_agent.RemoveRouterFromAgent(
-            self.app, self.namespace
-        )
+        self.cmd = network_agent.RemoveRouterFromAgent(self.app, None)
 
     def test_remove_no_options(self):
         arglist = []
@@ -475,14 +471,14 @@ class TestSetNetworkAgent(TestNetworkAgent):
     _network_agent = network_fakes.create_one_network_agent()
 
     def setUp(self):
-        super(TestSetNetworkAgent, self).setUp()
+        super().setUp()
         self.network_client.update_agent = mock.Mock(return_value=None)
         self.network_client.get_agent = mock.Mock(
             return_value=self._network_agent
         )
 
         # Get the command object to test
-        self.cmd = network_agent.SetNetworkAgent(self.app, self.namespace)
+        self.cmd = network_agent.SetNetworkAgent(self.app, None)
 
     def test_set_nothing(self):
         arglist = [
@@ -591,13 +587,13 @@ class TestShowNetworkAgent(TestNetworkAgent):
     )
 
     def setUp(self):
-        super(TestShowNetworkAgent, self).setUp()
+        super().setUp()
         self.network_client.get_agent = mock.Mock(
             return_value=self._network_agent
         )
 
         # Get the command object to test
-        self.cmd = network_agent.ShowNetworkAgent(self.app, self.namespace)
+        self.cmd = network_agent.ShowNetworkAgent(self.app, None)
 
     def test_show_no_options(self):
         arglist = []

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

@@ -22,8 +22,8 @@ from openstackclient.tests.unit.network.v2 import fakes as network_fakes
 
 class TestAutoAllocatedTopology(network_fakes.TestNetworkV2):
     def setUp(self):
-        super(TestAutoAllocatedTopology, self).setUp()
-        self.projects_mock = self.app.client_manager.identity.projects
+        super().setUp()
+        self.projects_mock = self.identity_client.projects
 
 
 class TestCreateAutoAllocatedTopology(TestAutoAllocatedTopology):
@@ -45,10 +45,10 @@ class TestCreateAutoAllocatedTopology(TestAutoAllocatedTopology):
     )
 
     def setUp(self):
-        super(TestCreateAutoAllocatedTopology, self).setUp()
+        super().setUp()
 
         self.cmd = network_auto_allocated_topology.CreateAutoAllocatedTopology(
-            self.app, self.namespace
+            self.app, None
         )
         self.network_client.get_auto_allocated_topology = mock.Mock(
             return_value=self.topology
@@ -150,10 +150,10 @@ class TestValidateAutoAllocatedTopology(TestAutoAllocatedTopology):
     )
 
     def setUp(self):
-        super(TestValidateAutoAllocatedTopology, self).setUp()
+        super().setUp()
 
         self.cmd = network_auto_allocated_topology.CreateAutoAllocatedTopology(
-            self.app, self.namespace
+            self.app, None
         )
         self.network_client.validate_auto_allocated_topology = mock.Mock(
             return_value=self.topology
@@ -223,10 +223,10 @@ class TestDeleteAutoAllocatedTopology(TestAutoAllocatedTopology):
     )
 
     def setUp(self):
-        super(TestDeleteAutoAllocatedTopology, self).setUp()
+        super().setUp()
 
         self.cmd = network_auto_allocated_topology.DeleteAutoAllocatedTopology(
-            self.app, self.namespace
+            self.app, None
         )
         self.network_client.delete_auto_allocated_topology = mock.Mock(
             return_value=None

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

@@ -12,22 +12,17 @@
 #
 
 from unittest import mock
-from unittest.mock import call
 
 from osc_lib import exceptions
 
+from openstackclient.api import compute_v2
 from openstackclient.network.v2 import network
 from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
 from openstackclient.tests.unit import utils as tests_utils
 
 
-# Tests for Nova network
-#
-
-
-@mock.patch('openstackclient.api.compute_v2.APIv2.network_create')
+@mock.patch.object(compute_v2, 'create_network')
 class TestCreateNetworkCompute(compute_fakes.TestComputev2):
-    # The network to create.
     _network = compute_fakes.create_one_network()
 
     columns = (
@@ -101,11 +96,10 @@ class TestCreateNetworkCompute(compute_fakes.TestComputev2):
     )
 
     def setUp(self):
-        super(TestCreateNetworkCompute, self).setUp()
+        super().setUp()
 
         self.app.client_manager.network_endpoint_enabled = False
 
-        # Get the command object to test
         self.cmd = network.CreateNetwork(self.app, None)
 
     def test_network_create_no_options(self, net_mock):
@@ -113,7 +107,6 @@ class TestCreateNetworkCompute(compute_fakes.TestComputev2):
         arglist = []
         verifylist = []
 
-        # Missing required args should raise exception here
         self.assertRaises(
             tests_utils.ParserException,
             self.check_parser,
@@ -131,7 +124,6 @@ class TestCreateNetworkCompute(compute_fakes.TestComputev2):
             ('name', self._network['label']),
         ]
 
-        # Missing required args should raise exception here
         self.assertRaises(
             tests_utils.ParserException,
             self.check_parser,
@@ -156,35 +148,29 @@ class TestCreateNetworkCompute(compute_fakes.TestComputev2):
         columns, data = self.cmd.take_action(parsed_args)
 
         net_mock.assert_called_once_with(
-            **{
-                'subnet': self._network['cidr'],
-                'name': self._network['label'],
-            }
+            self.compute_sdk_client,
+            subnet=self._network['cidr'],
+            name=self._network['label'],
         )
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, data)
 
 
-@mock.patch('openstackclient.api.compute_v2.APIv2.network_delete')
+@mock.patch.object(compute_v2, 'delete_network')
+@mock.patch.object(compute_v2, 'find_network')
 class TestDeleteNetworkCompute(compute_fakes.TestComputev2):
     def setUp(self):
-        super(TestDeleteNetworkCompute, self).setUp()
+        super().setUp()
 
         self.app.client_manager.network_endpoint_enabled = False
 
-        # The networks to delete
         self._networks = compute_fakes.create_networks(count=3)
 
-        # Return value of utils.find_resource()
-        self.compute_client.api.network_find = compute_fakes.get_networks(
-            networks=self._networks
-        )
-
-        # Get the command object to test
         self.cmd = network.DeleteNetwork(self.app, None)
 
-    def test_network_delete_one(self, net_mock):
-        net_mock.return_value = mock.Mock(return_value=None)
+    def test_network_delete_one(self, find_net_mock, delete_net_mock):
+        find_net_mock.side_effect = self._networks
+        delete_net_mock.return_value = mock.Mock(return_value=None)
         arglist = [
             self._networks[0]['label'],
         ]
@@ -195,35 +181,44 @@ class TestDeleteNetworkCompute(compute_fakes.TestComputev2):
 
         result = self.cmd.take_action(parsed_args)
 
-        net_mock.assert_called_once_with(
-            self._networks[0]['label'],
+        delete_net_mock.assert_called_once_with(
+            self.compute_sdk_client,
+            self._networks[0]['id'],
         )
         self.assertIsNone(result)
 
-    def test_network_delete_multi(self, net_mock):
-        net_mock.return_value = mock.Mock(return_value=None)
-        arglist = []
-        for n in self._networks:
-            arglist.append(n['id'])
+    def test_network_delete_multi(self, find_net_mock, delete_net_mock):
+        find_net_mock.side_effect = self._networks
+        delete_net_mock.return_value = mock.Mock(return_value=None)
+        arglist = [
+            self._networks[0]['id'],
+            self._networks[1]['id'],
+        ]
         verifylist = [
             ('network', arglist),
         ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         result = self.cmd.take_action(parsed_args)
 
-        calls = []
-        for n in self._networks:
-            calls.append(call(n['id']))
-        net_mock.assert_has_calls(calls)
+        delete_net_mock.assert_has_calls(
+            [
+                mock.call(self.compute_sdk_client, self._networks[0]['id']),
+                mock.call(self.compute_sdk_client, self._networks[1]['id']),
+            ]
+        )
         self.assertIsNone(result)
 
-    def test_network_delete_multi_with_exception(self, net_mock):
-        net_mock.return_value = mock.Mock(return_value=None)
-        net_mock.side_effect = [
-            mock.Mock(return_value=None),
-            exceptions.CommandError,
+    def test_network_delete_multi_with_exception(
+        self, find_net_mock, delete_net_mock
+    ):
+        find_net_mock.side_effect = [
+            self._networks[0],
+            exceptions.NotFound('foo'),
+            self._networks[1],
         ]
+        delete_net_mock.return_value = mock.Mock(return_value=None)
+
         arglist = [
             self._networks[0]['id'],
             'xxxx-yyyy-zzzz',
@@ -234,20 +229,30 @@ class TestDeleteNetworkCompute(compute_fakes.TestComputev2):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        try:
-            self.cmd.take_action(parsed_args)
-            self.fail('CommandError should be raised.')
-        except exceptions.CommandError as e:
-            self.assertEqual('2 of 3 networks failed to delete.', str(e))
-
-        net_mock.assert_any_call(self._networks[0]['id'])
-        net_mock.assert_any_call(self._networks[1]['id'])
-        net_mock.assert_any_call('xxxx-yyyy-zzzz')
+        exc = self.assertRaises(
+            exceptions.CommandError,
+            self.cmd.take_action,
+            parsed_args,
+        )
+        self.assertEqual('1 of 3 networks failed to delete.', str(exc))
+
+        find_net_mock.assert_has_calls(
+            [
+                mock.call(self.compute_sdk_client, self._networks[0]['id']),
+                mock.call(self.compute_sdk_client, 'xxxx-yyyy-zzzz'),
+                mock.call(self.compute_sdk_client, self._networks[1]['id']),
+            ]
+        )
+        delete_net_mock.assert_has_calls(
+            [
+                mock.call(self.compute_sdk_client, self._networks[0]['id']),
+                mock.call(self.compute_sdk_client, self._networks[1]['id']),
+            ]
+        )
 
 
-@mock.patch('openstackclient.api.compute_v2.APIv2.network_list')
+@mock.patch.object(compute_v2, 'list_networks')
 class TestListNetworkCompute(compute_fakes.TestComputev2):
-    # The networks going to be listed up.
     _networks = compute_fakes.create_networks(count=3)
 
     columns = (
@@ -267,11 +272,10 @@ class TestListNetworkCompute(compute_fakes.TestComputev2):
         )
 
     def setUp(self):
-        super(TestListNetworkCompute, self).setUp()
+        super().setUp()
 
         self.app.client_manager.network_endpoint_enabled = False
 
-        # Get the command object to test
         self.cmd = network.ListNetwork(self.app, None)
 
     def test_network_list_no_options(self, net_mock):
@@ -280,19 +284,15 @@ class TestListNetworkCompute(compute_fakes.TestComputev2):
         verifylist = []
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        # In base command class Lister in cliff, abstract method take_action()
-        # returns a tuple containing the column names and an iterable
-        # containing the data to be listed.
         columns, data = self.cmd.take_action(parsed_args)
 
-        net_mock.assert_called_once_with()
+        net_mock.assert_called_once_with(self.compute_sdk_client)
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, list(data))
 
 
-@mock.patch('openstackclient.api.compute_v2.APIv2.network_find')
+@mock.patch.object(compute_v2, 'find_network')
 class TestShowNetworkCompute(compute_fakes.TestComputev2):
-    # The network to show.
     _network = compute_fakes.create_one_network()
 
     columns = (
@@ -366,11 +366,10 @@ class TestShowNetworkCompute(compute_fakes.TestComputev2):
     )
 
     def setUp(self):
-        super(TestShowNetworkCompute, self).setUp()
+        super().setUp()
 
         self.app.client_manager.network_endpoint_enabled = False
 
-        # Get the command object to test
         self.cmd = network.ShowNetwork(self.app, None)
 
     def test_show_no_options(self, net_mock):
@@ -398,6 +397,8 @@ class TestShowNetworkCompute(compute_fakes.TestComputev2):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
 
-        net_mock.assert_called_once_with(self._network['label'])
+        net_mock.assert_called_once_with(
+            self.compute_sdk_client, self._network['label']
+        )
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, data)

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

@@ -26,12 +26,12 @@ from openstackclient.tests.unit import utils as tests_utils
 
 class TestNetworkFlavor(network_fakes.TestNetworkV2):
     def setUp(self):
-        super(TestNetworkFlavor, 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 TestAddNetworkFlavorToProfile(TestNetworkFlavor):
@@ -39,7 +39,7 @@ class TestAddNetworkFlavorToProfile(TestNetworkFlavor):
     service_profile = network_fakes.create_one_service_profile()
 
     def setUp(self):
-        super(TestAddNetworkFlavorToProfile, self).setUp()
+        super().setUp()
 
         self.network_client.find_flavor = mock.Mock(
             return_value=self.network_flavor
@@ -48,9 +48,7 @@ class TestAddNetworkFlavorToProfile(TestNetworkFlavor):
             return_value=self.service_profile
         )
 
-        self.cmd = network_flavor.AddNetworkFlavorToProfile(
-            self.app, self.namespace
-        )
+        self.cmd = network_flavor.AddNetworkFlavorToProfile(self.app, None)
 
     def test_show_no_options(self):
         arglist = []
@@ -103,13 +101,13 @@ class TestCreateNetworkFlavor(TestNetworkFlavor):
     )
 
     def setUp(self):
-        super(TestCreateNetworkFlavor, self).setUp()
+        super().setUp()
         self.network_client.create_flavor = mock.Mock(
             return_value=self.new_network_flavor
         )
 
         # Get the command object to test
-        self.cmd = network_flavor.CreateNetworkFlavor(self.app, self.namespace)
+        self.cmd = network_flavor.CreateNetworkFlavor(self.app, None)
 
         self.projects_mock.get.return_value = self.project
         self.domains_mock.get.return_value = self.domain
@@ -219,14 +217,14 @@ class TestDeleteNetworkFlavor(TestNetworkFlavor):
     _network_flavors = network_fakes.create_flavor(count=2)
 
     def setUp(self):
-        super(TestDeleteNetworkFlavor, self).setUp()
+        super().setUp()
         self.network_client.delete_flavor = mock.Mock(return_value=None)
         self.network_client.find_flavor = network_fakes.get_flavor(
             network_flavors=self._network_flavors
         )
 
         # Get the command object to test
-        self.cmd = network_flavor.DeleteNetworkFlavor(self.app, self.namespace)
+        self.cmd = network_flavor.DeleteNetworkFlavor(self.app, None)
 
     def test_network_flavor_delete(self):
         arglist = [
@@ -324,13 +322,13 @@ class TestListNetworkFlavor(TestNetworkFlavor):
         )
 
     def setUp(self):
-        super(TestListNetworkFlavor, self).setUp()
+        super().setUp()
         self.network_client.flavors = mock.Mock(
             return_value=self._network_flavors
         )
 
         # Get the command object to test
-        self.cmd = network_flavor.ListNetworkFlavor(self.app, self.namespace)
+        self.cmd = network_flavor.ListNetworkFlavor(self.app, None)
 
     def test_network_flavor_list(self):
         arglist = []
@@ -349,7 +347,7 @@ class TestRemoveNetworkFlavorFromProfile(TestNetworkFlavor):
     service_profile = network_fakes.create_one_service_profile()
 
     def setUp(self):
-        super(TestRemoveNetworkFlavorFromProfile, self).setUp()
+        super().setUp()
         self.network_client.find_flavor = mock.Mock(
             return_value=self.network_flavor
         )
@@ -361,7 +359,7 @@ class TestRemoveNetworkFlavorFromProfile(TestNetworkFlavor):
         )
 
         self.cmd = network_flavor.RemoveNetworkFlavorFromProfile(
-            self.app, self.namespace
+            self.app, None
         )
 
     def test_show_no_options(self):
@@ -413,13 +411,13 @@ class TestShowNetworkFlavor(TestNetworkFlavor):
     )
 
     def setUp(self):
-        super(TestShowNetworkFlavor, self).setUp()
+        super().setUp()
         self.network_client.find_flavor = mock.Mock(
             return_value=self.new_network_flavor
         )
 
         # Get the command object to test
-        self.cmd = network_flavor.ShowNetworkFlavor(self.app, self.namespace)
+        self.cmd = network_flavor.ShowNetworkFlavor(self.app, None)
 
     def test_show_no_options(self):
         arglist = []
@@ -457,14 +455,14 @@ class TestSetNetworkFlavor(TestNetworkFlavor):
     new_network_flavor = network_fakes.create_one_network_flavor()
 
     def setUp(self):
-        super(TestSetNetworkFlavor, self).setUp()
+        super().setUp()
         self.network_client.update_flavor = mock.Mock(return_value=None)
         self.network_client.find_flavor = mock.Mock(
             return_value=self.new_network_flavor
         )
 
         # Get the command object to test
-        self.cmd = network_flavor.SetNetworkFlavor(self.app, self.namespace)
+        self.cmd = network_flavor.SetNetworkFlavor(self.app, None)
 
     def test_set_nothing(self):
         arglist = [

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

@@ -21,12 +21,12 @@ from openstackclient.tests.unit.network.v2 import fakes as network_fakes
 
 class TestFlavorProfile(network_fakes.TestNetworkV2):
     def setUp(self):
-        super(TestFlavorProfile, self).setUp()
+        super().setUp()
 
         # Get the ProjectManager Mock
-        self.projects_mock = self.app.client_manager.identity.projects
+        self.projects_mock = self.identity_client.projects
         # Get the DomainManager Mock
-        self.domains_mock = self.app.client_manager.identity.domains
+        self.domains_mock = self.identity_client.domains
 
 
 class TestCreateFlavorProfile(TestFlavorProfile):
@@ -53,14 +53,14 @@ class TestCreateFlavorProfile(TestFlavorProfile):
     )
 
     def setUp(self):
-        super(TestCreateFlavorProfile, self).setUp()
+        super().setUp()
         self.network_client.create_service_profile = mock.Mock(
             return_value=self.new_flavor_profile
         )
         self.projects_mock.get.return_value = self.project
         # Get the command object to test
         self.cmd = network_flavor_profile.CreateNetworkFlavorProfile(
-            self.app, self.namespace
+            self.app, None
         )
 
     def test_create_all_options(self):
@@ -227,7 +227,7 @@ class TestDeleteFlavorProfile(TestFlavorProfile):
     _network_flavor_profiles = network_fakes.create_service_profile(count=2)
 
     def setUp(self):
-        super(TestDeleteFlavorProfile, self).setUp()
+        super().setUp()
         self.network_client.delete_service_profile = mock.Mock(
             return_value=None
         )
@@ -239,7 +239,7 @@ class TestDeleteFlavorProfile(TestFlavorProfile):
 
         # Get the command object to test
         self.cmd = network_flavor_profile.DeleteNetworkFlavorProfile(
-            self.app, self.namespace
+            self.app, None
         )
 
     def test_network_flavor_profile_delete(self):
@@ -346,14 +346,14 @@ class TestListFlavorProfile(TestFlavorProfile):
         )
 
     def setUp(self):
-        super(TestListFlavorProfile, self).setUp()
+        super().setUp()
         self.network_client.service_profiles = mock.Mock(
             return_value=self._network_flavor_profiles
         )
 
         # Get the command object to test
         self.cmd = network_flavor_profile.ListNetworkFlavorProfile(
-            self.app, self.namespace
+            self.app, None
         )
 
     def test_network_flavor_profile_list(self):
@@ -389,14 +389,14 @@ class TestShowFlavorProfile(TestFlavorProfile):
     )
 
     def setUp(self):
-        super(TestShowFlavorProfile, self).setUp()
+        super().setUp()
         self.network_client.find_service_profile = mock.Mock(
             return_value=self.network_flavor_profile
         )
 
         # Get the command object to test
         self.cmd = network_flavor_profile.ShowNetworkFlavorProfile(
-            self.app, self.namespace
+            self.app, None
         )
 
     def test_show_all_options(self):
@@ -422,7 +422,7 @@ class TestSetFlavorProfile(TestFlavorProfile):
     network_flavor_profile = network_fakes.create_one_service_profile()
 
     def setUp(self):
-        super(TestSetFlavorProfile, self).setUp()
+        super().setUp()
         self.network_client.update_service_profile = mock.Mock(
             return_value=None
         )
@@ -432,7 +432,7 @@ class TestSetFlavorProfile(TestFlavorProfile):
 
         # Get the command object to test
         self.cmd = network_flavor_profile.SetNetworkFlavorProfile(
-            self.app, self.namespace
+            self.app, None
         )
 
     def test_set_nothing(self):