python-openstackclient 7.4.0__py3-none-any.whl → 8.1.0__py3-none-any.whl

openstackclient/network/v2/subnet.py

@@ -15,6 +15,7 @@
 
 import copy
 import logging
+import typing as ty
 
 from cliff import columns as cliff_columns
 from osc_lib.cli import format_columns
@@ -84,8 +85,8 @@ def _get_common_parse_arguments(parser, is_create=True):
         action=parseractions.MultiKeyValueAction,
         required_keys=['start', 'end'],
         help=_(
-            "Allocation pool IP addresses for this subnet "
-            "e.g.: start=192.168.199.2,end=192.168.199.254 "
+            "Allocation pool IP addresses for this subnet, "
+            "for example, start=192.168.199.2,end=192.168.199.254 "
             "(repeat option to add multiple IP addresses)"
         ),
     )
@@ -127,10 +128,10 @@ def _get_common_parse_arguments(parser, is_create=True):
         action=parseractions.MultiKeyValueAction,
         required_keys=['destination', 'gateway'],
         help=_(
-            "Additional route for this subnet "
-            "e.g.: destination=10.10.0.0/16,gateway=192.168.71.254 "
+            "Additional route for this subnet, "
+            "for example, destination=10.10.0.0/16,gateway=192.168.71.254 "
             "destination: destination subnet (in CIDR notation) "
-            "gateway: nexthop IP address "
+            "gateway: next-hop IP address "
             "(repeat option to add multiple routes)"
         ),
     )
@@ -150,8 +151,8 @@ def _get_common_parse_arguments(parser, is_create=True):
         action='append',
         dest='service_types',
         help=_(
-            "Service type for this subnet "
-            "e.g.: network:floatingip_agent_gateway. "
+            "Service type for this subnet, "
+            "for example, network:floatingip_agent_gateway. "
             "Must be a valid device owner value for a network port "
             "(repeat option to set multiple service types)"
         ),
@@ -365,8 +366,8 @@ class CreateSubnet(command.ShowOne, common.NeutronCommandWithExtraArgs):
                 "<ip-address>: Specific IP address to use as the gateway, "
                 "'auto': Gateway address should automatically be chosen "
                 "from within the subnet itself, 'none': This subnet will "
-                "not use a gateway, e.g.: --gateway 192.168.9.1, "
-                "--gateway auto, --gateway none (default is 'auto')."
+                "not use a gateway. For example, --gateway 192.168.9.1, "
+                "--gateway auto or --gateway none (default is 'auto')."
             ),
         )
         parser.add_argument(
@@ -375,7 +376,7 @@ class CreateSubnet(command.ShowOne, common.NeutronCommandWithExtraArgs):
             default=4,
             choices=[4, 6],
             help=_(
-                "IP version (default is 4).  Note that when subnet pool is "
+                "IP version (default is 4). Note that when subnet pool is "
                 "specified, IP version is determined from the subnet pool "
                 "and this option is ignored."
             ),
@@ -400,7 +401,7 @@ class CreateSubnet(command.ShowOne, common.NeutronCommandWithExtraArgs):
             '--network-segment',
             metavar='<network-segment>',
             help=_(
-                "Network segment to associate with this subnet " "(name or ID)"
+                "Network segment to associate with this subnet (name or ID)"
             ),
         )
         parser.add_argument(
@@ -465,7 +466,7 @@ class DeleteSubnet(command.Command):
 
         if result > 0:
             total = len(parsed_args.subnet)
-            msg = _("%(result)s of %(total)s subnets failed " "to delete.") % {
+            msg = _("%(result)s of %(total)s subnets failed to delete.") % {
                 'result': result,
                 'total': total,
             }
@@ -513,10 +514,10 @@ class ListSubnet(command.Lister):
             action='append',
             dest='service_types',
             help=_(
-                "List only subnets of a given service type in output "
-                "e.g.: network:floatingip_agent_gateway. "
+                "List only subnets of a given service type in output, "
+                "for example, network:floatingip_agent_gateway. "
                 "Must be a valid device owner value for a network port "
-                "(repeat option to list multiple service types)"
+                "(repeat option to list multiple service types)."
             ),
         )
         parser.add_argument(
@@ -551,8 +552,8 @@ class ListSubnet(command.Lister):
             metavar='<subnet-range>',
             help=_(
                 "List only subnets of given subnet range "
-                "(in CIDR notation) in output "
-                "e.g.: --subnet-range 10.10.0.0/16"
+                "(in CIDR notation) in output. "
+                "For example, --subnet-range 10.10.0.0/16"
             ),
         )
         parser.add_argument(
@@ -560,7 +561,7 @@ class ListSubnet(command.Lister):
             metavar='<subnet-pool>',
             help=_(
                 "List only subnets which belong to a given subnet pool "
-                "in output (Name or ID)"
+                "in output (name or ID)"
             ),
         )
         _tag.add_tag_filtering_option_to_parser(parser, _('subnets'))
@@ -606,8 +607,8 @@ class ListSubnet(command.Lister):
         _tag.get_tag_filtering_args(parsed_args, filters)
         data = network_client.subnets(**filters)
 
-        headers = ('ID', 'Name', 'Network', 'Subnet')
-        columns = ('id', 'name', 'network_id', 'cidr')
+        headers: tuple[str, ...] = ('ID', 'Name', 'Network', 'Subnet')
+        columns: tuple[str, ...] = ('id', 'name', 'network_id', 'cidr')
         if parsed_args.long:
             headers += (
                 'Project',
@@ -684,8 +685,8 @@ class SetSubnet(common.NeutronCommandWithExtraArgs):
             help=_(
                 "Specify a gateway for the subnet. The options are: "
                 "<ip-address>: Specific IP address to use as the gateway, "
-                "'none': This subnet will not use a gateway, "
-                "e.g.: --gateway 192.168.9.1, --gateway none."
+                "'none': This subnet will not use a gateway. "
+                "For example, --gateway 192.168.9.1 or --gateway none."
             ),
         )
         parser.add_argument(
@@ -694,7 +695,7 @@ class SetSubnet(common.NeutronCommandWithExtraArgs):
             help=_(
                 "Network segment to associate with this subnet (name or "
                 "ID). It is only allowed to set the segment if the current "
-                "value is `None`, the network must also have only one "
+                "value is `None`. The network must also have only one "
                 "segment and only one subnet can exist on the network."
             ),
         )
@@ -774,7 +775,7 @@ class UnsetSubnet(common.NeutronUnsetCommandWithExtraArgs):
             required_keys=['start', 'end'],
             help=_(
                 'Allocation pool IP addresses to be removed from this '
-                'subnet e.g.: start=192.168.199.2,end=192.168.199.254 '
+                'subnet, for example, start=192.168.199.2,end=192.168.199.254 '
                 '(repeat option to unset multiple allocation pools)'
             ),
         )
@@ -800,10 +801,10 @@ class UnsetSubnet(common.NeutronUnsetCommandWithExtraArgs):
             action=parseractions.MultiKeyValueAction,
             required_keys=['destination', 'gateway'],
             help=_(
-                'Route to be removed from this subnet '
-                'e.g.: destination=10.10.0.0/16,gateway=192.168.71.254 '
+                'Route to be removed from this subnet, '
+                'for example, destination=10.10.0.0/16,gateway=192.168.71.254 '
                 'destination: destination subnet (in CIDR notation) '
-                'gateway: nexthop IP address '
+                'gateway: next-hop IP address '
                 '(repeat option to unset multiple host routes)'
             ),
         )
@@ -813,8 +814,8 @@ class UnsetSubnet(common.NeutronUnsetCommandWithExtraArgs):
             action='append',
             dest='service_types',
             help=_(
-                'Service type to be removed from this subnet '
-                'e.g.: network:floatingip_agent_gateway. '
+                'Service type to be removed from this subnet, '
+                'for example, network:floatingip_agent_gateway. '
                 'Must be a valid device owner value for a network port '
                 '(repeat option to unset multiple service types)'
             ),
@@ -831,7 +832,7 @@ class UnsetSubnet(common.NeutronUnsetCommandWithExtraArgs):
         client = self.app.client_manager.network
         obj = client.find_subnet(parsed_args.subnet, ignore_missing=False)
 
-        attrs = {}
+        attrs: dict[str, ty.Any] = {}
         if parsed_args.gateway:
             attrs['gateway_ip'] = None
         if parsed_args.dns_nameservers:

openstackclient/network/v2/subnet_pool.py

@@ -256,7 +256,7 @@ class DeleteSubnetPool(command.Command):
         if result > 0:
             total = len(parsed_args.subnet_pool)
             msg = _(
-                "%(result)s of %(total)s subnet pools failed " "to delete."
+                "%(result)s of %(total)s subnet pools failed to delete."
             ) % {'result': result, 'total': total}
             raise exceptions.CommandError(msg)
 
@@ -290,7 +290,7 @@ class ListSubnetPool(command.Lister):
             '--default',
             action='store_true',
             help=_(
-                "List subnet pools used as the default external " "subnet pool"
+                "List subnet pools used as the default external subnet pool"
             ),
         )
         default_group.add_argument(
@@ -356,8 +356,8 @@ class ListSubnetPool(command.Lister):
         _tag.get_tag_filtering_args(parsed_args, filters)
         data = network_client.subnet_pools(**filters)
 
-        headers = ('ID', 'Name', 'Prefixes')
-        columns = ('id', 'name', 'prefixes')
+        headers: tuple[str, ...] = ('ID', 'Name', 'Prefixes')
+        columns: tuple[str, ...] = ('id', 'name', 'prefixes')
         if parsed_args.long:
             headers += (
                 'Default Prefix Length',

openstackclient/object/client.py

@@ -19,12 +19,11 @@ from osc_lib import utils
 
 from openstackclient.api import object_store_v1
 
+# global variables used when building the shell
 DEFAULT_API_VERSION = '1'
 API_VERSION_OPTION = 'os_object_api_version'
 API_NAME = 'object_store'
-API_VERSIONS = {
-    '1': 'openstackclient.object.client.ObjectClientv1',
-}
+API_VERSIONS = ('1',)
 
 
 def make_client(instance):

openstackclient/object/v1/container.py

@@ -148,10 +148,9 @@ class ListContainer(command.Lister):
         return parser
 
     def take_action(self, parsed_args):
+        columns: tuple[str, ...] = ('Name',)
         if parsed_args.long:
-            columns = ('Name', 'Bytes', 'Count')
-        else:
-            columns = ('Name',)
+            columns += ('Bytes', 'Count')
 
         kwargs = {}
         if parsed_args.prefix:

openstackclient/object/v1/object.py

@@ -162,16 +162,9 @@ class ListObject(command.Lister):
         return parser
 
     def take_action(self, parsed_args):
+        columns: tuple[str, ...] = ('Name',)
         if parsed_args.long:
-            columns = (
-                'Name',
-                'Bytes',
-                'Hash',
-                'Content Type',
-                'Last Modified',
-            )
-        else:
-            columns = ('Name',)
+            columns += ('Bytes', 'Hash', 'Content Type', 'Last Modified')
 
         kwargs = {}
         if parsed_args.prefix:

openstackclient/shell.py

@@ -88,17 +88,34 @@ class OpenStackShell(shell.OpenStackShell):
                     # this throws an exception if invalid
                     skip_old_check = mod_check_api_version(version_opt)
 
+                # NOTE(stephenfin): API_VERSIONS has traditionally been a
+                # dictionary but the values are only used internally and are
+                # ignored for the modules using SDK. So we now support tuples
+                # instead.
                 mod_versions = getattr(mod, 'API_VERSIONS', None)
-                if not skip_old_check and mod_versions:
+                if mod_versions is not None and not isinstance(
+                    mod_versions, dict | tuple
+                ):
+                    raise TypeError(
+                        f'Plugin {mod} has incompatible API_VERSIONS. '
+                        f'Expected: tuple, dict. Got: {type(mod_versions)}. '
+                        f'Please report this to your package maintainer.'
+                    )
+
+                if mod_versions and not skip_old_check:
                     if version_opt not in mod_versions:
                         sorted_versions = sorted(
-                            mod.API_VERSIONS.keys(),
+                            list(mod.API_VERSIONS),
                             key=lambda s: list(map(int, s.split('.'))),
                         )
                         self.log.warning(
-                            "{} version {} is not in supported versions: {}".format(
-                                api, version_opt, ', '.join(sorted_versions)
-                            )
+                            "%(name)s API version %(version)s is not in "
+                            "supported versions: %(supported)s",
+                            {
+                                'name': api,
+                                'version': version_opt,
+                                'supported': ', '.join(sorted_versions),
+                            },
                         )
 
                 # Command groups deal only with major versions

openstackclient/tests/functional/base.py

@@ -36,8 +36,8 @@ def execute(cmd, *, fail_ok=False):
 
     proc = subprocess.Popen(cmdlist, stdout=stdout, stderr=stderr, env=env)
 
-    result_out, result_err = proc.communicate()
-    result_out = result_out.decode('utf-8')
+    result_out_b, result_err = proc.communicate()
+    result_out = result_out_b.decode('utf-8')
     LOG.debug('stdout: %s', result_out)
     LOG.debug('stderr: %s', result_err)
 
@@ -97,7 +97,11 @@ class TestCase(testtools.TestCase):
         )
 
         if parse_output:
-            return json.loads(output)
+            try:
+                return json.loads(output)
+            except json.JSONDecodeError:
+                print(f'failed to decode: {output}')
+                raise
         else:
             return output
 

openstackclient/tests/functional/common/test_quota.py

@@ -25,7 +25,7 @@ class QuotaTests(base.TestCase):
     test runs as these may run in parallel and otherwise step on each other.
     """
 
-    PROJECT_NAME = None
+    PROJECT_NAME: str
 
     @classmethod
     def setUpClass(cls):
@@ -250,6 +250,8 @@ class QuotaTests(base.TestCase):
             row_headers = [str(r) for r in row.keys()]
             self.assertEqual(sorted(expected_headers), sorted(row_headers))
             resources.append(row['Resource'])
+            for header in expected_headers[1:]:
+                self.assertIsInstance(row[header], int)
         # Ensure that returned quota has network quota...
         self.assertIn("networks", resources)
         # ...and compute quota

openstackclient/tests/functional/compute/v2/common.py

@@ -22,9 +22,9 @@ from openstackclient.tests.functional import base
 class ComputeTestCase(base.TestCase):
     """Common functional test bits for Compute commands"""
 
-    flavor_name = None
-    image_name = None
-    network_arg = None
+    flavor_name: str
+    image_name: str
+    network_arg: str
 
     def setUp(self):
         """Select common resources"""
@@ -34,7 +34,7 @@ class ComputeTestCase(base.TestCase):
         self.network_arg = self.get_network()
 
     @classmethod
-    def get_flavor(cls):
+    def get_flavor(cls) -> str:
         # NOTE(rtheis): Get cirros256 or m1.tiny flavors since functional
         #               tests may create other flavors.
         flavors = cls.openstack("flavor list", parse_output=True)
@@ -43,10 +43,13 @@ class ComputeTestCase(base.TestCase):
             if flavor['Name'] in ['m1.tiny', 'cirros256']:
                 server_flavor = flavor['Name']
                 break
+
+        assert server_flavor is not None
+
         return server_flavor
 
     @classmethod
-    def get_image(cls):
+    def get_image(cls) -> str:
         # NOTE(rtheis): Get first Cirros image since functional tests may
         #               create other images.  Image may be named '-uec' or
         #               '-disk'.
@@ -59,10 +62,13 @@ class ComputeTestCase(base.TestCase):
             ):
                 server_image = image['Name']
                 break
+
+        assert server_image is not None
+
         return server_image
 
     @classmethod
-    def get_network(cls):
+    def get_network(cls) -> str:
         try:
             # NOTE(rtheis): Get private network since functional tests may
             #               create other networks.

openstackclient/tests/functional/compute/v2/test_keypair.py

@@ -21,12 +21,18 @@ from openstackclient.tests.functional import base
 class KeypairBase(base.TestCase):
     """Methods for functional tests."""
 
-    def keypair_create(self, name=data_utils.rand_uuid()):
+    def keypair_create(self, name=data_utils.rand_uuid(), user=None):
         """Create keypair and add cleanup."""
-        raw_output = self.openstack('keypair create ' + name)
-        self.addCleanup(self.keypair_delete, name, True)
+        cmd = 'keypair create ' + name
+        if user is not None:
+            cmd += ' --user ' + user
+        raw_output = self.openstack(cmd)
+        self.addCleanup(
+            self.keypair_delete, name, ignore_exceptions=True, user=user
+        )
         if not raw_output:
             self.fail('Keypair has not been created!')
+        return name
 
     def keypair_list(self, params=''):
         """Return dictionary with list of keypairs."""
@@ -34,10 +40,13 @@ class KeypairBase(base.TestCase):
         keypairs = self.parse_show_as_object(raw_output)
         return keypairs
 
-    def keypair_delete(self, name, ignore_exceptions=False):
+    def keypair_delete(self, name, ignore_exceptions=False, user=None):
         """Try to delete keypair by name."""
         try:
-            self.openstack('keypair delete ' + name)
+            cmd = 'keypair delete ' + name
+            if user is not None:
+                cmd += ' --user ' + user
+            self.openstack(cmd)
         except exceptions.CommandFailed:
             if not ignore_exceptions:
                 raise
@@ -200,3 +209,30 @@ class KeypairTests(KeypairBase):
         items = self.parse_listing(raw_output)
         self.assert_table_structure(items, HEADERS)
         self.assertInOutput(self.KPName, raw_output)
+
+    def test_keypair_list_by_project(self):
+        """Test keypair list by project.
+
+        Test steps:
+        1) Create keypair for admin project in setUp
+        2) Create a new project
+        3) Create a new user
+        4) Associate the new user with the new project
+        5) Create keypair for the new user
+        6) List keypairs by the new project
+        7) Check that only the keypair from step 5 is returned
+        """
+        project_name = data_utils.rand_name('TestProject')
+        self.openstack(f'project create {project_name}')
+        self.addCleanup(self.openstack, f'project delete {project_name}')
+        user_name = data_utils.rand_name('TestUser')
+        self.openstack(f'user create {user_name}')
+        self.addCleanup(self.openstack, f'user delete {user_name}')
+        self.openstack(
+            f'role add --user {user_name} --project {project_name} member'
+        )
+        keypair_name = self.keypair_create(user=user_name)
+        raw_output = self.openstack(f'keypair list --project {project_name}')
+        items = self.parse_listing(raw_output)
+        self.assertEqual(1, len(items))
+        self.assertEqual(keypair_name, items[0]['Name'])

openstackclient/tests/functional/compute/v2/test_server.py

@@ -156,7 +156,7 @@ class ServerTests(common.ComputeTestCase):
         server_name3 = cmd_output['name']
 
         cmd_output = self.openstack(
-            'server list ' '--changes-since ' + updated_at2,
+            'server list --changes-since ' + updated_at2,
             parse_output=True,
         )
 
@@ -852,8 +852,7 @@ class ServerTests(common.ComputeTestCase):
             # it to the server at /dev/vdb and delete the volume when the
             # server is deleted.
             bdm_arg = (
-                f'--block-device-mapping '
-                f'vdb={self.image_name}:image:1:true '
+                f'--block-device-mapping vdb={self.image_name}:image:1:true '
             )
         else:
             # get image ID

openstackclient/tests/functional/compute/v2/test_server_event.py

@@ -93,7 +93,7 @@ class ServerEventTests(common.ComputeTestCase):
         # And verify we can get the event list after it's deleted
         # Test 'server event list' for deleting
         cmd_output = self.openstack(
-            '--os-compute-api-version 2.21 ' 'server event list ' + server_id,
+            '--os-compute-api-version 2.21 server event list ' + server_id,
             parse_output=True,
         )
         request_id = None

openstackclient/tests/functional/identity/v2/test_user.py

@@ -37,7 +37,7 @@ class UserTests(common.IdentityTests):
         new_username = data_utils.rand_name('NewTestUser')
         new_email = data_utils.rand_name() + '@example.com'
         raw_output = self.openstack(
-            'user set ' '--email {email} ' '--name {new_name} ' '{id}'.format(
+            'user set --email {email} --name {new_name} {id}'.format(
                 email=new_email, new_name=new_username, id=user['id']
             )
         )

openstackclient/tests/functional/identity/v3/common.py

@@ -187,8 +187,7 @@ class IdentityTests(base.TestCase):
                 f'domain set --disable {cls.domain_name}'
             )
             cls.openstack(
-                '--os-identity-api-version 3 '
-                f'domain delete {cls.domain_name}'
+                f'--os-identity-api-version 3 domain delete {cls.domain_name}'
             )
         finally:
             super().tearDownClass()
@@ -270,9 +269,7 @@ class IdentityTests(base.TestCase):
         if add_clean_up:
             self.addCleanup(
                 self.openstack,
-                'group delete '
-                f'--domain {self.domain_name} '
-                f'{group_name}',
+                f'group delete --domain {self.domain_name} {group_name}',
             )
         items = self.parse_show(raw_output)
         self.assert_show_fields(items, self.GROUP_FIELDS)
@@ -305,9 +302,7 @@ class IdentityTests(base.TestCase):
         if add_clean_up:
             self.addCleanup(
                 self.openstack,
-                'project delete '
-                f'--domain {self.domain_name} '
-                f'{project_name}',
+                f'project delete --domain {self.domain_name} {project_name}',
             )
         return project_name
 

openstackclient/tests/functional/identity/v3/test_application_credential.py

@@ -50,35 +50,35 @@ class ApplicationCredentialTests(common.IdentityTests):
     def _create_role_assignments(self):
         try:
             user = self.openstack(
-                'configuration show -f value' ' -c auth.username'
+                'configuration show -f value -c auth.username'
             )
         except Exception:
             user = self.openstack(
-                'configuration show -f value' ' -c auth.user_id'
+                'configuration show -f value -c auth.user_id'
             )
         try:
             user_domain = self.openstack(
-                'configuration show -f value' ' -c auth.user_domain_name'
+                'configuration show -f value -c auth.user_domain_name'
             )
         except Exception:
             user_domain = self.openstack(
-                'configuration show -f value' ' -c auth.user_domain_id'
+                'configuration show -f value -c auth.user_domain_id'
             )
         try:
             project = self.openstack(
-                'configuration show -f value' ' -c auth.project_name'
+                'configuration show -f value -c auth.project_name'
             )
         except Exception:
             project = self.openstack(
-                'configuration show -f value' ' -c auth.project_id'
+                'configuration show -f value -c auth.project_id'
             )
         try:
             project_domain = self.openstack(
-                'configuration show -f value' ' -c auth.project_domain_name'
+                'configuration show -f value -c auth.project_domain_name'
             )
         except Exception:
             project_domain = self.openstack(
-                'configuration show -f value' ' -c auth.project_domain_id'
+                'configuration show -f value -c auth.project_domain_id'
             )
         role1 = self._create_dummy_role()
         role2 = self._create_dummy_role()
@@ -130,7 +130,7 @@ class ApplicationCredentialTests(common.IdentityTests):
     def test_application_credential_delete(self):
         name = data_utils.rand_name('name')
         self.openstack(f'application credential create {name}')
-        raw_output = self.openstack('application credential delete ' f'{name}')
+        raw_output = self.openstack(f'application credential delete {name}')
         self.assertEqual(0, len(raw_output))
 
     def test_application_credential_list(self):
@@ -147,6 +147,6 @@ class ApplicationCredentialTests(common.IdentityTests):
             self.openstack,
             f'application credential delete {name}',
         )
-        raw_output = self.openstack('application credential show ' f'{name}')
+        raw_output = self.openstack(f'application credential show {name}')
         items = self.parse_show(raw_output)
         self.assert_show_fields(items, self.APPLICATION_CREDENTIAL_FIELDS)

openstackclient/tests/functional/identity/v3/test_endpoint.py

@@ -45,7 +45,7 @@ class EndpointTests(common.IdentityTests):
         endpoint_id = self._create_dummy_endpoint(add_clean_up=False)
         project_id = self._create_dummy_project(add_clean_up=False)
         raw_output = self.openstack(
-            'endpoint add project ' f'{endpoint_id} ' f'{project_id}'
+            f'endpoint add project {endpoint_id} {project_id}'
         )
         self.assertEqual(0, len(raw_output))
         raw_output = self.openstack(f'endpoint list --endpoint {endpoint_id}')
@@ -89,11 +89,11 @@ class EndpointTests(common.IdentityTests):
         endpoint_id = self._create_dummy_endpoint(add_clean_up=False)
         project_id = self._create_dummy_project(add_clean_up=False)
         raw_output = self.openstack(
-            'endpoint add project ' f'{endpoint_id} ' f'{project_id}'
+            f'endpoint add project {endpoint_id} {project_id}'
         )
         self.assertEqual(0, len(raw_output))
 
         raw_output = self.openstack(
-            'endpoint remove project ' f'{endpoint_id} ' f'{project_id}'
+            f'endpoint remove project {endpoint_id} {project_id}'
         )
         self.assertEqual(0, len(raw_output))

openstackclient/tests/functional/identity/v3/test_group.py

@@ -36,14 +36,14 @@ class GroupTests(common.IdentityTests):
     def test_group_delete(self):
         group_name = self._create_dummy_group(add_clean_up=False)
         raw_output = self.openstack(
-            'group delete ' f'--domain {self.domain_name} ' f'{group_name}'
+            f'group delete --domain {self.domain_name} {group_name}'
         )
         self.assertEqual(0, len(raw_output))
 
     def test_group_show(self):
         group_name = self._create_dummy_group()
         raw_output = self.openstack(
-            'group show ' f'--domain {self.domain_name} ' f'{group_name}'
+            f'group show --domain {self.domain_name} {group_name}'
         )
         items = self.parse_show(raw_output)
         self.assert_show_fields(items, self.GROUP_FIELDS)
@@ -59,7 +59,7 @@ class GroupTests(common.IdentityTests):
         )
         self.assertEqual(0, len(raw_output))
         raw_output = self.openstack(
-            'group show ' f'--domain {self.domain_name} ' f'{new_group_name}'
+            f'group show --domain {self.domain_name} {new_group_name}'
         )
         group = self.parse_show_as_object(raw_output)
         self.assertEqual(new_group_name, group['name'])