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

openstackclient/compute/v2/server_backup.py

@@ -33,7 +33,7 @@ class CreateServerBackup(command.ShowOne):
     }
 
     def get_parser(self, prog_name):
-        parser = super(CreateServerBackup, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
             metavar='<server>',

openstackclient/compute/v2/server_group.py

@@ -56,7 +56,7 @@ class CreateServerGroup(command.ShowOne):
     _description = _("Create a new server group.")
 
     def get_parser(self, prog_name):
-        parser = super(CreateServerGroup, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'name',
             metavar='<name>',
@@ -143,7 +143,7 @@ class DeleteServerGroup(command.Command):
     _description = _("Delete existing server group(s).")
 
     def get_parser(self, prog_name):
-        parser = super(DeleteServerGroup, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'server_group',
             metavar='<server-group>',
@@ -178,7 +178,7 @@ class ListServerGroup(command.Lister):
     _description = _("List all server groups.")
 
     def get_parser(self, prog_name):
-        parser = super(ListServerGroup, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             '--all-projects',
             action='store_true',
@@ -255,7 +255,7 @@ class ShowServerGroup(command.ShowOne):
     _description = _("Display server group details.")
 
     def get_parser(self, prog_name):
-        parser = super(ShowServerGroup, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'server_group',
             metavar='<server-group>',

openstackclient/compute/v2/server_image.py

@@ -38,7 +38,7 @@ class CreateServerImage(command.ShowOne):
     }
 
     def get_parser(self, prog_name):
-        parser = super(CreateServerImage, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
             metavar='<server>',

openstackclient/compute/v2/server_migration.py

@@ -28,7 +28,7 @@ class ListMigration(command.Lister):
     _description = _("""List server migrations""")
 
     def get_parser(self, prog_name):
-        parser = super(ListMigration, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             '--server',
             metavar='<server>',
@@ -252,7 +252,6 @@ def _get_migration_by_uuid(compute_client, server_id, migration_uuid):
     for migration in compute_client.server_migrations(server_id):
         if migration.uuid == migration_uuid:
             return migration
-            break
     else:
         msg = _('In-progress live migration %s is not found for server %s.')
         raise exceptions.CommandError(msg % (migration_uuid, server_id))
@@ -382,7 +381,7 @@ class AbortMigration(command.Command):
     """
 
     def get_parser(self, prog_name):
-        parser = super(AbortMigration, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
             metavar='<server>',
@@ -449,7 +448,7 @@ class ForceCompleteMigration(command.Command):
     """
 
     def get_parser(self, prog_name):
-        parser = super(ForceCompleteMigration, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
             metavar='<server>',

openstackclient/compute/v2/service.py

@@ -32,7 +32,7 @@ class DeleteService(command.Command):
     _description = _("Delete compute service(s)")
 
     def get_parser(self, prog_name):
-        parser = super(DeleteService, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             "service",
             metavar="<service>",
@@ -85,7 +85,7 @@ deployment."""
     )
 
     def get_parser(self, prog_name):
-        parser = super(ListService, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             "--host",
             metavar="<host>",
@@ -147,7 +147,7 @@ class SetService(command.Command):
     _description = _("Set compute service properties")
 
     def get_parser(self, prog_name):
-        parser = super(SetService, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument("host", metavar="<host>", help=_("Name of host"))
         parser.add_argument(
             "service",
@@ -198,7 +198,7 @@ class SetService(command.Command):
 
         :param host: the name of the compute service host
         :param binary: the compute service binary, e.g. nova-compute
-        :returns: novaclient.v2.services.Service dict-like object
+        :returns: The service.
         :raises: CommandError if no or multiple results were found
         """
         services = list(compute_client.services(host=host, binary=binary))

openstackclient/compute/v2/usage.py

@@ -109,7 +109,7 @@ class ListUsage(command.Lister):
     _description = _("List resource usage per project")
 
     def get_parser(self, prog_name):
-        parser = super(ListUsage, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             "--start",
             metavar="<start>",
@@ -182,7 +182,7 @@ class ListUsage(command.Lister):
                 project_cache[p.id] = p
         except Exception:
             # Just forget it if there's any trouble
-            pass
+            pass  # nosec: B110
 
         if parsed_args.formatter == 'table' and len(usage_list) > 0:
             self.app.stdout.write(
@@ -210,7 +210,7 @@ class ShowUsage(command.ShowOne):
     _description = _("Show resource usage for a single project")
 
     def get_parser(self, prog_name):
-        parser = super(ShowUsage, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             "--project",
             metavar="<project>",

openstackclient/identity/common.py

@@ -20,6 +20,7 @@ from keystoneclient.v3 import domains
 from keystoneclient.v3 import groups
 from keystoneclient.v3 import projects
 from keystoneclient.v3 import users
+from openstack import exceptions as sdk_exceptions
 from osc_lib import exceptions
 from osc_lib import utils
 
@@ -73,6 +74,39 @@ def find_service(identity_client, name_type_or_id):
         raise exceptions.CommandError(msg % name_type_or_id)
 
 
+def find_service_sdk(identity_client, name_type_or_id):
+    """Find a service by id, name or type."""
+
+    try:
+        # search for service name or ID
+        return identity_client.find_service(
+            name_type_or_id, ignore_missing=False
+        )
+    except sdk_exceptions.ResourceNotFound:
+        pass
+    except sdk_exceptions.DuplicateResource as e:
+        raise exceptions.CommandError(e.message)
+
+    # search for service type
+    services = identity_client.services()
+    result = None
+    for service in services:
+        if name_type_or_id == service.type:
+            if result:
+                msg = _(
+                    "Multiple service matches found for '%s', "
+                    "use an ID or name to be more specific."
+                )
+                raise exceptions.CommandError(msg % name_type_or_id)
+            result = service
+
+    if result is None:
+        msg = _("No service with a type, name or ID of '%s' exists.")
+        raise exceptions.CommandError(msg % name_type_or_id)
+
+    return result
+
+
 def get_resource(manager, name_type_or_id):
     # NOTE (vishakha): Due to bug #1799153 and for any another related case
     # where GET resource API does not support the filter by name,

openstackclient/identity/v2_0/catalog.py

@@ -39,7 +39,7 @@ class EndpointsColumn(cliff_columns.FormattableColumn):
             for endpoint_type in ['publicURL', 'internalURL', 'adminURL']:
                 url = ep.get(endpoint_type)
                 if url:
-                    ret += "  %s: %s\n" % (endpoint_type, url)
+                    ret += f"  {endpoint_type}: {url}\n"
         return ret
 
 
@@ -75,7 +75,7 @@ class ShowCatalog(command.ShowOne):
     _description = _("Display service catalog details")
 
     def get_parser(self, prog_name):
-        parser = super(ShowCatalog, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'service',
             metavar='<service>',

openstackclient/identity/v2_0/ec2creds.py

@@ -32,7 +32,7 @@ class CreateEC2Creds(command.ShowOne):
     _description = _("Create EC2 credentials")
 
     def get_parser(self, prog_name):
-        parser = super(CreateEC2Creds, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             '--project',
             metavar='<project>',
@@ -86,7 +86,7 @@ class DeleteEC2Creds(command.Command):
     _description = _("Delete EC2 credentials")
 
     def get_parser(self, prog_name):
-        parser = super(DeleteEC2Creds, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'access_keys',
             metavar='<access-key>',
@@ -138,7 +138,7 @@ class ListEC2Creds(command.Lister):
     _description = _("List EC2 credentials")
 
     def get_parser(self, prog_name):
-        parser = super(ListEC2Creds, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             '--user',
             metavar='<user>',
@@ -179,7 +179,7 @@ class ShowEC2Creds(command.ShowOne):
     _description = _("Display EC2 credentials details")
 
     def get_parser(self, prog_name):
-        parser = super(ShowEC2Creds, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'access_key',
             metavar='<access-key>',

openstackclient/identity/v2_0/endpoint.py

@@ -32,7 +32,7 @@ class CreateEndpoint(command.ShowOne):
     _description = _("Create new endpoint")
 
     def get_parser(self, prog_name):
-        parser = super(CreateEndpoint, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'service',
             metavar='<service>',
@@ -83,7 +83,7 @@ class DeleteEndpoint(command.Command):
     _description = _("Delete endpoint(s)")
 
     def get_parser(self, prog_name):
-        parser = super(DeleteEndpoint, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'endpoints',
             metavar='<endpoint-id>',
@@ -121,7 +121,7 @@ class ListEndpoint(command.Lister):
     _description = _("List endpoints")
 
     def get_parser(self, prog_name):
-        parser = super(ListEndpoint, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             '--long',
             action='store_true',
@@ -167,7 +167,7 @@ class ShowEndpoint(command.ShowOne):
     _description = _("Display endpoint details")
 
     def get_parser(self, prog_name):
-        parser = super(ShowEndpoint, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'endpoint_or_service',
             metavar='<endpoint>',

openstackclient/identity/v2_0/project.py

@@ -34,7 +34,7 @@ class CreateProject(command.ShowOne):
     _description = _("Create new project")
 
     def get_parser(self, prog_name):
-        parser = super(CreateProject, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'name',
             metavar='<project-name>',
@@ -108,7 +108,7 @@ class DeleteProject(command.Command):
     _description = _("Delete project(s)")
 
     def get_parser(self, prog_name):
-        parser = super(DeleteProject, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'projects',
             metavar='<project>',
@@ -150,7 +150,7 @@ class ListProject(command.Lister):
     _description = _("List projects")
 
     def get_parser(self, prog_name):
-        parser = super(ListProject, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             '--long',
             action='store_true',
@@ -193,7 +193,7 @@ class SetProject(command.Command):
     _description = _("Set project properties")
 
     def get_parser(self, prog_name):
-        parser = super(SetProject, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'project',
             metavar='<project>',
@@ -264,7 +264,7 @@ class ShowProject(command.ShowOne):
     _description = _("Display project details")
 
     def get_parser(self, prog_name):
-        parser = super(ShowProject, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'project',
             metavar='<project>',
@@ -322,7 +322,7 @@ class UnsetProject(command.Command):
     _description = _("Unset project properties")
 
     def get_parser(self, prog_name):
-        parser = super(UnsetProject, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'project',
             metavar='<project>',

openstackclient/identity/v2_0/role.py

@@ -32,7 +32,7 @@ class AddRole(command.ShowOne):
     _description = _("Add role to project:user")
 
     def get_parser(self, prog_name):
-        parser = super(AddRole, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'role',
             metavar='<role>',
@@ -75,7 +75,7 @@ class CreateRole(command.ShowOne):
     _description = _("Create new role")
 
     def get_parser(self, prog_name):
-        parser = super(CreateRole, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'role_name',
             metavar='<name>',
@@ -111,7 +111,7 @@ class DeleteRole(command.Command):
     _description = _("Delete role(s)")
 
     def get_parser(self, prog_name):
-        parser = super(DeleteRole, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'roles',
             metavar='<role>',
@@ -176,7 +176,7 @@ class RemoveRole(command.Command):
     _description = _("Remove role from project : user")
 
     def get_parser(self, prog_name):
-        parser = super(RemoveRole, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'role',
             metavar='<role>',
@@ -211,7 +211,7 @@ class ShowRole(command.ShowOne):
     _description = _("Display role details")
 
     def get_parser(self, prog_name):
-        parser = super(ShowRole, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'role',
             metavar='<role>',

openstackclient/identity/v2_0/role_assignment.py

@@ -24,7 +24,7 @@ class ListRoleAssignment(command.Lister):
     _description = _("List role assignments")
 
     def get_parser(self, prog_name):
-        parser = super(ListRoleAssignment, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             '--user',
             metavar='<user>',

openstackclient/identity/v2_0/service.py

@@ -32,7 +32,7 @@ class CreateService(command.ShowOne):
     _description = _("Create new service")
 
     def get_parser(self, prog_name):
-        parser = super(CreateService, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'type',
             metavar='<type>',
@@ -71,7 +71,7 @@ class DeleteService(command.Command):
     _description = _("Delete service(s)")
 
     def get_parser(self, prog_name):
-        parser = super(DeleteService, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'services',
             metavar='<service>',
@@ -110,7 +110,7 @@ class ListService(command.Lister):
     _description = _("List services")
 
     def get_parser(self, prog_name):
-        parser = super(ListService, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             '--long',
             action='store_true',
@@ -135,7 +135,7 @@ class ShowService(command.ShowOne):
     _description = _("Display service details")
 
     def get_parser(self, prog_name):
-        parser = super(ShowService, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'service',
             metavar='<service>',

openstackclient/identity/v2_0/token.py

@@ -28,7 +28,7 @@ class IssueToken(command.ShowOne):
     required_scope = False
 
     def get_parser(self, prog_name):
-        parser = super(IssueToken, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         return parser
 
     def take_action(self, parsed_args):
@@ -56,7 +56,7 @@ class RevokeToken(command.Command):
     _description = _("Revoke existing token")
 
     def get_parser(self, prog_name):
-        parser = super(RevokeToken, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'token',
             metavar='<token>',

openstackclient/identity/v2_0/user.py

@@ -42,7 +42,7 @@ class ProjectColumn(cliff_columns.FormattableColumn):
     """
 
     def __init__(self, value, project_cache=None):
-        super(ProjectColumn, self).__init__(value)
+        super().__init__(value)
         self.project_cache = project_cache or {}
 
     def human_readable(self):
@@ -59,7 +59,7 @@ class CreateUser(command.ShowOne):
     _description = _("Create new user")
 
     def get_parser(self, prog_name):
-        parser = super(CreateUser, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'name',
             metavar='<name>',
@@ -162,7 +162,7 @@ class DeleteUser(command.Command):
     _description = _("Delete user(s)")
 
     def get_parser(self, prog_name):
-        parser = super(DeleteUser, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'users',
             metavar='<user>',
@@ -205,7 +205,7 @@ class ListUser(command.Lister):
     _description = _("List users")
 
     def get_parser(self, prog_name):
-        parser = super(ListUser, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             '--project',
             metavar='<project>',
@@ -252,7 +252,7 @@ class ListUser(command.Lister):
                     project_cache[p.id] = p
             except Exception:
                 # Just forget it if there's any trouble
-                pass
+                pass  # nosec: B110
             formatters['tenantId'] = functools.partial(
                 ProjectColumn, project_cache=project_cache
             )
@@ -294,7 +294,7 @@ class SetUser(command.Command):
     _description = _("Set user properties")
 
     def get_parser(self, prog_name):
-        parser = super(SetUser, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'user',
             metavar='<user>',
@@ -392,7 +392,7 @@ class ShowUser(command.ShowOne):
     _description = _("Display user details")
 
     def get_parser(self, prog_name):
-        parser = super(ShowUser, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'user',
             metavar='<user>',

openstackclient/identity/v3/access_rule.py

@@ -32,7 +32,7 @@ class DeleteAccessRule(command.Command):
     _description = _("Delete access rule(s)")
 
     def get_parser(self, prog_name):
-        parser = super(DeleteAccessRule, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'access_rule',
             metavar='<access-rule>',
@@ -73,7 +73,7 @@ class ListAccessRule(command.Lister):
     _description = _("List access rules")
 
     def get_parser(self, prog_name):
-        parser = super(ListAccessRule, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             '--user',
             metavar='<user>',
@@ -110,7 +110,7 @@ class ShowAccessRule(command.ShowOne):
     _description = _("Display access rule details")
 
     def get_parser(self, prog_name):
-        parser = super(ShowAccessRule, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'access_rule',
             metavar='<access-rule>',