python-openstackclient 6.4.0__py3-none-any.whl → 6.5.0__py3-none-any.whl

openstackclient/tests/unit/image/v2/test_metadef_namespaces.py

@@ -21,30 +21,16 @@ class TestMetadefNamespaceCreate(image_fakes.TestImagev2):
 
     expected_columns = (
         'created_at',
-        'description',
         'display_name',
-        'id',
-        'is_protected',
-        'location',
-        'name',
         'namespace',
         'owner',
-        'resource_type_associations',
-        'updated_at',
         'visibility',
     )
     expected_data = (
         _metadef_namespace.created_at,
-        _metadef_namespace.description,
         _metadef_namespace.display_name,
-        _metadef_namespace.id,
-        _metadef_namespace.is_protected,
-        _metadef_namespace.location,
-        _metadef_namespace.name,
         _metadef_namespace.namespace,
         _metadef_namespace.owner,
-        _metadef_namespace.resource_type_associations,
-        _metadef_namespace.updated_at,
         _metadef_namespace.visibility,
     )
 
@@ -54,7 +40,7 @@ class TestMetadefNamespaceCreate(image_fakes.TestImagev2):
         self.image_client.create_metadef_namespace.return_value = (
             self._metadef_namespace
         )
-        self.cmd = metadef_namespaces.CreateMetadefNameSpace(self.app, None)
+        self.cmd = metadef_namespaces.CreateMetadefNamespace(self.app, None)
         self.datalist = self._metadef_namespace
 
     def test_namespace_create(self):
@@ -78,7 +64,7 @@ class TestMetadefNamespaceDelete(image_fakes.TestImagev2):
         self.image_client.delete_metadef_namespace.return_value = (
             self._metadef_namespace
         )
-        self.cmd = metadef_namespaces.DeleteMetadefNameSpace(self.app, None)
+        self.cmd = metadef_namespaces.DeleteMetadefNamespace(self.app, None)
         self.datalist = self._metadef_namespace
 
     def test_namespace_create(self):
@@ -111,7 +97,7 @@ class TestMetadefNamespaceList(image_fakes.TestImagev2):
         self.image_client.metadef_namespaces.return_value = iter(
             self._metadef_namespace
         )
-        self.cmd = metadef_namespaces.ListMetadefNameSpaces(self.app, None)
+        self.cmd = metadef_namespaces.ListMetadefNamespace(self.app, None)
         self.datalist = self._metadef_namespace
 
     def test_namespace_list_no_options(self):
@@ -136,7 +122,7 @@ class TestMetadefNamespaceSet(image_fakes.TestImagev2):
         self.image_client.update_metadef_namespace.return_value = (
             self._metadef_namespace
         )
-        self.cmd = metadef_namespaces.SetMetadefNameSpace(self.app, None)
+        self.cmd = metadef_namespaces.SetMetadefNamespace(self.app, None)
         self.datalist = self._metadef_namespace
 
     def test_namespace_set_no_options(self):
@@ -176,7 +162,7 @@ class TestMetadefNamespaceShow(image_fakes.TestImagev2):
         self.image_client.get_metadef_namespace.return_value = (
             self._metadef_namespace
         )
-        self.cmd = metadef_namespaces.ShowMetadefNameSpace(self.app, None)
+        self.cmd = metadef_namespaces.ShowMetadefNamespace(self.app, None)
 
     def test_namespace_show_no_options(self):
         arglist = [self._metadef_namespace.namespace]

openstackclient/tests/unit/integ/cli/test_shell.py

@@ -502,7 +502,6 @@ class TestIntegShellCliPrecedenceOCC(test_base.TestInteg):
         )
 
         # +env, -cli, +occ
-        print("auth_req: %s" % auth_req['auth'])
         self.assertEqual(
             test_shell.DEFAULT_USERNAME,
             auth_req['auth']['identity']['password']['user']['name'],
@@ -559,7 +558,6 @@ class TestIntegShellCliPrecedenceOCC(test_base.TestInteg):
         )
 
         # +env, +cli, +occ
-        print("auth_req: %s" % auth_req['auth'])
         self.assertEqual(
             'zarquon',
             auth_req['auth']['identity']['password']['user']['name'],

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

@@ -1761,6 +1761,7 @@ def create_one_port(attrs=None):
                 'subnet_id': 'subnet-id-' + uuid.uuid4().hex,
             }
         ],
+        'hardware_offload_type': None,
         'hints': {},
         'id': 'port-id-' + uuid.uuid4().hex,
         'mac_address': 'fa:16:3e:a9:4e:72',

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

@@ -1063,6 +1063,39 @@ class TestSetNetwork(TestNetwork):
         )
         self.assertIsNone(result)
 
+    def test_set_to_empty(self):
+        # Test if empty strings are accepted to clear any of the fields,
+        # so once they are set to a value its possible to clear them again.
+
+        arglist = [
+            self._network.name,
+            '--name',
+            '',
+            '--description',
+            '',
+            '--dns-domain',
+            '',
+        ]
+        verifylist = [
+            ('network', self._network.name),
+            ('description', ''),
+            ('name', ''),
+            ('dns_domain', ''),
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        result = self.cmd.take_action(parsed_args)
+
+        attrs = {
+            'name': '',
+            'description': '',
+            'dns_domain': '',
+        }
+        self.network_client.update_network.assert_called_once_with(
+            self._network, **attrs
+        )
+        self.assertIsNone(result)
+
     def test_set_nothing(self):
         arglist = [
             self._network.name,

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

@@ -9,9 +9,7 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
 
-import argparse
 import copy
 from unittest import mock
 from unittest.mock import call
@@ -23,7 +21,7 @@ import testtools
 from openstackclient.network.v2 import network_trunk
 from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes_v3
 from openstackclient.tests.unit.network.v2 import fakes as network_fakes
-from openstackclient.tests.unit import utils as tests_utils
+from openstackclient.tests.unit import utils as test_utils
 
 
 # Tests for Neutron trunks
@@ -104,7 +102,7 @@ class TestCreateNetworkTrunk(TestNetworkTrunk):
         verifylist = []
 
         self.assertRaises(
-            tests_utils.ParserException,
+            test_utils.ParserException,
             self.check_parser,
             self.cmd,
             arglist,
@@ -289,7 +287,7 @@ class TestCreateNetworkTrunk(TestNetworkTrunk):
             ),
         ]
 
-        with testtools.ExpectedException(argparse.ArgumentTypeError):
+        with testtools.ExpectedException(test_utils.ParserException):
             self.check_parser(self.cmd, arglist, verifylist)
 
 
@@ -432,7 +430,7 @@ class TestShowNetworkTrunk(TestNetworkTrunk):
         verifylist = []
 
         self.assertRaises(
-            tests_utils.ParserException,
+            test_utils.ParserException,
             self.check_parser,
             self.cmd,
             arglist,
@@ -755,7 +753,7 @@ class TestSetNetworkTrunk(TestNetworkTrunk):
             ),
         ]
 
-        with testtools.ExpectedException(argparse.ArgumentTypeError):
+        with testtools.ExpectedException(test_utils.ParserException):
             self.check_parser(self.cmd, arglist, verifylist)
 
         self.network_client.add_trunk_subports.assert_not_called()
@@ -949,7 +947,7 @@ class TestUnsetNetworkTrunk(TestNetworkTrunk):
             ('trunk', self._trunk['name']),
         ]
         self.assertRaises(
-            tests_utils.ParserException,
+            test_utils.ParserException,
             self.check_parser,
             self.cmd,
             arglist,

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

@@ -9,9 +9,7 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
 
-import argparse
 from unittest import mock
 from unittest.mock import call
 
@@ -23,7 +21,7 @@ from openstackclient.network.v2 import port
 from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
 from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
 from openstackclient.tests.unit.network.v2 import fakes as network_fakes
-from openstackclient.tests.unit import utils as tests_utils
+from openstackclient.tests.unit import utils as test_utils
 
 
 LIST_FIELDS_TO_RETRIEVE = ('id', 'name', 'mac_address', 'fixed_ips', 'status')
@@ -58,6 +56,7 @@ class TestPort(network_fakes.TestNetworkV2):
             'dns_name',
             'extra_dhcp_opts',
             'fixed_ips',
+            'hardware_offload_type',
             'hints',
             'id',
             'ip_allocation',
@@ -98,6 +97,7 @@ class TestPort(network_fakes.TestNetworkV2):
             fake_port.dns_name,
             format_columns.ListDictColumn(fake_port.extra_dhcp_opts),
             format_columns.ListDictColumn(fake_port.fixed_ips),
+            fake_port.hardware_offload_type,
             fake_port.hints,
             fake_port.id,
             fake_port.ip_allocation,
@@ -257,7 +257,7 @@ class TestCreatePort(TestPort):
             'test-port',
         ]
         self.assertRaises(
-            argparse.ArgumentTypeError,
+            test_utils.ParserException,
             self.check_parser,
             self.cmd,
             arglist,
@@ -273,7 +273,7 @@ class TestCreatePort(TestPort):
             'test-port',
         ]
         self.assertRaises(
-            argparse.ArgumentTypeError,
+            test_utils.ParserException,
             self.check_parser,
             self.cmd,
             arglist,
@@ -733,7 +733,7 @@ class TestCreatePort(TestPort):
             )
             if add_tags:
                 self.network_client.set_tags.assert_called_once_with(
-                    self._port, tests_utils.CompareBySet(['red', 'blue'])
+                    self._port, test_utils.CompareBySet(['red', 'blue'])
                 )
             else:
                 self.assertFalse(self.network_client.set_tags.called)
@@ -952,7 +952,7 @@ class TestCreatePort(TestPort):
             'test-port',
         ]
         self.assertRaises(
-            argparse.ArgumentTypeError,
+            test_utils.ParserException,
             self.check_parser,
             self.cmd,
             arglist,
@@ -976,7 +976,7 @@ class TestCreatePort(TestPort):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         self.assertRaises(
-            argparse.ArgumentTypeError,
+            exceptions.CommandError,
             self.cmd.take_action,
             parsed_args,
         )
@@ -998,7 +998,7 @@ class TestCreatePort(TestPort):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         self.assertRaises(
-            argparse.ArgumentTypeError,
+            exceptions.CommandError,
             self.cmd.take_action,
             parsed_args,
         )
@@ -1070,6 +1070,48 @@ class TestCreatePort(TestPort):
         self.assertCountEqual(self.columns, columns)
         self.assertCountEqual(self.data, data)
 
+    def _test_create_with_hardware_offload_type(self, hwol_type=None):
+        arglist = [
+            '--network',
+            self._port.network_id,
+            'test-port',
+        ]
+        if hwol_type:
+            arglist += ['--hardware-offload-type', hwol_type]
+
+        hardware_offload_type = None if not hwol_type else hwol_type
+        verifylist = [
+            (
+                'network',
+                self._port.network_id,
+            ),
+            ('name', 'test-port'),
+        ]
+        if hwol_type:
+            verifylist.append(('hardware_offload_type', hwol_type))
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        columns, data = self.cmd.take_action(parsed_args)
+
+        create_args = {
+            'admin_state_up': True,
+            'network_id': self._port.network_id,
+            'name': 'test-port',
+        }
+        if hwol_type:
+            create_args['hardware_offload_type'] = hardware_offload_type
+        self.network_client.create_port.assert_called_once_with(**create_args)
+
+        self.assertEqual(set(self.columns), set(columns))
+        self.assertCountEqual(self.data, data)
+
+    def test_create_with_hardware_offload_type_switchdev(self):
+        self._test_create_with_hardware_offload_type(hwol_type='switchdev')
+
+    def test_create_with_hardware_offload_type_null(self):
+        self._test_create_with_hardware_offload_type()
+
 
 class TestDeletePort(TestPort):
     # Ports to delete.
@@ -1905,7 +1947,7 @@ class TestSetPort(TestPort):
             'test-port',
         ]
         self.assertRaises(
-            argparse.ArgumentTypeError,
+            test_utils.ParserException,
             self.check_parser,
             self.cmd,
             arglist,
@@ -1919,7 +1961,7 @@ class TestSetPort(TestPort):
             'test-port',
         ]
         self.assertRaises(
-            argparse.ArgumentTypeError,
+            test_utils.ParserException,
             self.check_parser,
             self.cmd,
             arglist,
@@ -2285,7 +2327,7 @@ class TestSetPort(TestPort):
             'test-port',
         ]
         self.assertRaises(
-            tests_utils.ParserException,
+            test_utils.ParserException,
             self.check_parser,
             self.cmd,
             arglist,
@@ -2309,7 +2351,7 @@ class TestSetPort(TestPort):
 
         self.assertFalse(self.network_client.update_port.called)
         self.network_client.set_tags.assert_called_once_with(
-            self._port, tests_utils.CompareBySet(expected_args)
+            self._port, test_utils.CompareBySet(expected_args)
         )
         self.assertIsNone(result)
 
@@ -2358,7 +2400,7 @@ class TestSetPort(TestPort):
             'test-port',
         ]
         self.assertRaises(
-            argparse.ArgumentTypeError,
+            test_utils.ParserException,
             self.check_parser,
             self.cmd,
             arglist,
@@ -2377,7 +2419,7 @@ class TestSetPort(TestPort):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         self.assertRaises(
-            argparse.ArgumentTypeError,
+            exceptions.CommandError,
             self.cmd.take_action,
             parsed_args,
         )
@@ -2394,7 +2436,7 @@ class TestSetPort(TestPort):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         self.assertRaises(
-            argparse.ArgumentTypeError,
+            exceptions.CommandError,
             self.cmd.take_action,
             parsed_args,
         )
@@ -2477,7 +2519,7 @@ class TestShowPort(TestPort):
         verifylist = []
 
         self.assertRaises(
-            tests_utils.ParserException,
+            test_utils.ParserException,
             self.check_parser,
             self.cmd,
             arglist,
@@ -2756,7 +2798,7 @@ class TestUnsetPort(TestPort):
 
         self.assertFalse(self.network_client.update_port.called)
         self.network_client.set_tags.assert_called_once_with(
-            self._testport, tests_utils.CompareBySet(expected_args)
+            self._testport, test_utils.CompareBySet(expected_args)
         )
         self.assertIsNone(result)
 

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

@@ -108,6 +108,26 @@ class TestCreateSubnet(TestSubnet):
             }
         )
 
+        # An IPv6 subnet to be created with Prefix Delegation options specified
+        self._subnet_ipv6_pd = network_fakes.FakeSubnet.create_one_subnet(
+            attrs={
+                'project_id': self.project.id,
+                'cidr': '::/64',
+                'enable_dhcp': True,
+                'allocation_pools': [
+                    {
+                        'start': '::1',
+                        'end': '::ffff:ffff:ffff:ffff',
+                    },
+                ],
+                'ip_version': 6,
+                'gateway_ip': '::',
+                'ipv6_address_mode': 'slaac',
+                'ipv6_ra_mode': 'slaac',
+                'subnetpool_id': 'prefix_delegation',
+            }
+        )
+
         # The network to be returned from find_network
         self._network = network_fakes.create_one_network(
             attrs={
@@ -210,6 +230,29 @@ class TestCreateSubnet(TestSubnet):
             format_columns.ListColumn(self._subnet_ipv6.tags),
         )
 
+        self.data_ipv6_pd = (
+            subnet_v2.AllocationPoolsColumn(
+                self._subnet_ipv6_pd.allocation_pools
+            ),
+            self._subnet_ipv6_pd.cidr,
+            self._subnet_ipv6_pd.description,
+            format_columns.ListColumn(self._subnet_ipv6_pd.dns_nameservers),
+            self._subnet_ipv6_pd.enable_dhcp,
+            self._subnet_ipv6_pd.gateway_ip,
+            subnet_v2.HostRoutesColumn(self._subnet_ipv6_pd.host_routes),
+            self._subnet_ipv6_pd.id,
+            self._subnet_ipv6_pd.ip_version,
+            self._subnet_ipv6_pd.ipv6_address_mode,
+            self._subnet_ipv6_pd.ipv6_ra_mode,
+            self._subnet_ipv6_pd.name,
+            self._subnet_ipv6_pd.network_id,
+            self._subnet_ipv6_pd.project_id,
+            self._subnet_ipv6_pd.segment_id,
+            format_columns.ListColumn(self._subnet_ipv6_pd.service_types),
+            self._subnet_ipv6_pd.subnetpool_id,
+            format_columns.ListColumn(self._subnet_ipv6_pd.tags),
+        )
+
     def setUp(self):
         self._init_subnet_variables()
         super(TestCreateSubnet, self).setUp()
@@ -455,6 +498,55 @@ class TestCreateSubnet(TestSubnet):
         self.assertEqual(self.columns, columns)
         self.assertCountEqual(self.data_ipv6, data)
 
+    def test_create_options_subnet_ipv6_pd(self):
+        # Mock SDK calls for this test.
+        self.network_client.create_subnet.return_value = self._subnet_ipv6_pd
+        self._network.id = self._subnet_ipv6_pd.network_id
+
+        arglist = [
+            self._subnet_ipv6_pd.name,
+            "--network",
+            self._subnet_ipv6_pd.network_id,
+            "--ip-version",
+            str(self._subnet_ipv6_pd.ip_version),
+            "--ipv6-ra-mode",
+            self._subnet_ipv6_pd.ipv6_ra_mode,
+            "--ipv6-address-mode",
+            self._subnet_ipv6_pd.ipv6_address_mode,
+            "--dhcp",
+            "--use-prefix-delegation",
+        ]
+
+        verifylist = [
+            ('name', self._subnet_ipv6_pd.name),
+            ('network', self._subnet_ipv6_pd.network_id),
+            ('ip_version', self._subnet_ipv6_pd.ip_version),
+            ('ipv6_ra_mode', self._subnet_ipv6_pd.ipv6_ra_mode),
+            ('ipv6_address_mode', self._subnet_ipv6_pd.ipv6_address_mode),
+            ('dhcp', self._subnet_ipv6_pd.enable_dhcp),
+            ('use_prefix_delegation', True),
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        columns, data = self.cmd.take_action(parsed_args)
+
+        # Calling with --use-prefix-delegation will set the subnetpool_id
+        # to 'prefix_delegation'
+        self.network_client.create_subnet.assert_called_once_with(
+            **{
+                'enable_dhcp': self._subnet_ipv6_pd.enable_dhcp,
+                'ip_version': self._subnet_ipv6_pd.ip_version,
+                'ipv6_address_mode': self._subnet_ipv6_pd.ipv6_address_mode,
+                'ipv6_ra_mode': self._subnet_ipv6_pd.ipv6_ra_mode,
+                'name': self._subnet_ipv6_pd.name,
+                'network_id': self._subnet_ipv6_pd.network_id,
+                'subnetpool_id': self._subnet_ipv6_pd.subnetpool_id,
+            }
+        )
+        self.assertFalse(self.network_client.set_tags.called)
+        self.assertEqual(self.columns, columns)
+        self.assertCountEqual(self.data_ipv6_pd, data)
+
     def test_create_with_network_segment(self):
         # Mock SDK calls for this test.
         self._network.id = self._subnet.network_id

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

@@ -9,9 +9,7 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
 
-import argparse
 from unittest import mock
 from unittest.mock import call
 
@@ -21,7 +19,7 @@ from osc_lib import exceptions
 from openstackclient.network.v2 import subnet_pool
 from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes_v3
 from openstackclient.tests.unit.network.v2 import fakes as network_fakes
-from openstackclient.tests.unit import utils as tests_utils
+from openstackclient.tests.unit import utils as test_utils
 
 
 class TestSubnetPool(network_fakes.TestNetworkV2):
@@ -98,7 +96,7 @@ class TestCreateSubnetPool(TestSubnetPool):
         verifylist = []
 
         self.assertRaises(
-            tests_utils.ParserException,
+            test_utils.ParserException,
             self.check_parser,
             self.cmd,
             arglist,
@@ -115,7 +113,7 @@ class TestCreateSubnetPool(TestSubnetPool):
             ('name', self._subnet_pool.name),
         ]
         self.assertRaises(
-            tests_utils.ParserException,
+            test_utils.ParserException,
             self.check_parser,
             self.cmd,
             arglist,
@@ -196,7 +194,7 @@ class TestCreateSubnetPool(TestSubnetPool):
         ]
 
         self.assertRaises(
-            argparse.ArgumentTypeError,
+            test_utils.ParserException,
             self.check_parser,
             self.cmd,
             arglist,
@@ -368,7 +366,7 @@ class TestCreateSubnetPool(TestSubnetPool):
         )
         if add_tags:
             self.network_client.set_tags.assert_called_once_with(
-                self._subnet_pool, tests_utils.CompareBySet(['red', 'blue'])
+                self._subnet_pool, test_utils.CompareBySet(['red', 'blue'])
             )
         else:
             self.assertFalse(self.network_client.set_tags.called)
@@ -837,7 +835,7 @@ class TestSetSubnetPool(TestSubnetPool):
         ]
 
         self.assertRaises(
-            argparse.ArgumentTypeError,
+            test_utils.ParserException,
             self.check_parser,
             self.cmd,
             arglist,
@@ -902,7 +900,7 @@ class TestSetSubnetPool(TestSubnetPool):
 
         # Exclusive arguments will conflict here.
         self.assertRaises(
-            tests_utils.ParserException,
+            test_utils.ParserException,
             self.check_parser,
             self.cmd,
             arglist,
@@ -963,7 +961,7 @@ class TestSetSubnetPool(TestSubnetPool):
 
         # Exclusive arguments will conflict here.
         self.assertRaises(
-            tests_utils.ParserException,
+            test_utils.ParserException,
             self.check_parser,
             self.cmd,
             arglist,
@@ -1029,7 +1027,7 @@ class TestSetSubnetPool(TestSubnetPool):
 
         self.assertFalse(self.network_client.update_subnet_pool.called)
         self.network_client.set_tags.assert_called_once_with(
-            self._subnet_pool, tests_utils.CompareBySet(expected_args)
+            self._subnet_pool, test_utils.CompareBySet(expected_args)
         )
         self.assertIsNone(result)
 
@@ -1093,7 +1091,7 @@ class TestShowSubnetPool(TestSubnetPool):
         verifylist = []
 
         self.assertRaises(
-            tests_utils.ParserException,
+            test_utils.ParserException,
             self.check_parser,
             self.cmd,
             arglist,
@@ -1149,7 +1147,7 @@ class TestUnsetSubnetPool(TestSubnetPool):
 
         self.assertFalse(self.network_client.update_subnet_pool.called)
         self.network_client.set_tags.assert_called_once_with(
-            self._subnetpool, tests_utils.CompareBySet(expected_args)
+            self._subnetpool, test_utils.CompareBySet(expected_args)
         )
         self.assertIsNone(result)
 

openstackclient/tests/unit/test_shell.py

@@ -141,10 +141,6 @@ class TestShell(osc_lib_test_utils.TestShell):
     # Full name of the OpenStackShell class to test (cliff.app.App subclass)
     shell_class_name = "openstackclient.shell.OpenStackShell"
 
-    # TODO(dtroyer): remove this once the shell_class_patch patch is released
-    #                in osc-lib
-    app_patch = shell_class_name
-
     def setUp(self):
         super(TestShell, self).setUp()
         # TODO(dtroyer): remove this once the shell_class_patch patch is
@@ -162,7 +158,6 @@ class TestShell(osc_lib_test_utils.TestShell):
             )
             _cmd = cmd_options + " list role"
             osc_lib_test_utils.fake_execute(_shell, _cmd)
-            print("_shell: %s" % _shell)
 
             self.app.assert_called_with(["list", "role"])
             self.assertEqual(
@@ -178,7 +173,7 @@ class TestShell(osc_lib_test_utils.TestShell):
 
     def _assert_token_auth(self, cmd_options, default_args):
         with mock.patch(
-            self.app_patch + ".initialize_app",
+            self.shell_class_name + ".initialize_app",
             self.app,
         ):
             _shell = osc_lib_test_utils.make_shell(
@@ -186,7 +181,6 @@ class TestShell(osc_lib_test_utils.TestShell):
             )
             _cmd = cmd_options + " list role"
             osc_lib_test_utils.fake_execute(_shell, _cmd)
-            print("_shell: %s" % _shell)
 
             self.app.assert_called_with(["list", "role"])
             self.assertEqual(