python-openstackclient 7.2.1__py3-none-any.whl → 7.3.1__py3-none-any.whl

openstackclient/identity/v3/service_provider.py

@@ -25,6 +25,29 @@ from openstackclient.i18n import _
 LOG = logging.getLogger(__name__)
 
 
+def _format_service_provider(sp):
+    column_headers = (
+        'id',
+        'enabled',
+        'description',
+        'auth_url',
+        'sp_url',
+        'relay_state_prefix',
+    )
+    columns = (
+        'id',
+        'is_enabled',
+        'description',
+        'auth_url',
+        'sp_url',
+        'relay_state_prefix',
+    )
+    return (
+        column_headers,
+        utils.get_item_properties(sp, columns),
+    )
+
+
 class CreateServiceProvider(command.ShowOne):
     _description = _("Create new service provider")
 
@@ -62,14 +85,14 @@ class CreateServiceProvider(command.ShowOne):
         enable_service_provider = parser.add_mutually_exclusive_group()
         enable_service_provider.add_argument(
             '--enable',
-            dest='enabled',
+            dest='is_enabled',
             action='store_true',
             default=True,
             help=_('Enable the service provider (default)'),
         )
         enable_service_provider.add_argument(
             '--disable',
-            dest='enabled',
+            dest='is_enabled',
             action='store_false',
             help=_('Disable the service provider'),
         )
@@ -77,17 +100,27 @@ class CreateServiceProvider(command.ShowOne):
         return parser
 
     def take_action(self, parsed_args):
-        service_client = self.app.client_manager.identity
-        sp = service_client.federation.service_providers.create(
-            id=parsed_args.service_provider_id,
-            auth_url=parsed_args.auth_url,
-            description=parsed_args.description,
-            enabled=parsed_args.enabled,
-            sp_url=parsed_args.service_provider_url,
-        )
+        service_client = self.app.client_manager.sdk_connection.identity
+
+        kwargs = {}
+
+        kwargs = {'id': parsed_args.service_provider_id}
+
+        if parsed_args.is_enabled is not None:
+            kwargs['is_enabled'] = parsed_args.is_enabled
 
-        sp._info.pop('links', None)
-        return zip(*sorted(sp._info.items()))
+        if parsed_args.description:
+            kwargs['description'] = parsed_args.description
+
+        if parsed_args.auth_url:
+            kwargs['auth_url'] = parsed_args.auth_url
+
+        if parsed_args.service_provider_url:
+            kwargs['sp_url'] = parsed_args.service_provider_url
+
+        sp = service_client.create_service_provider(**kwargs)
+
+        return _format_service_provider(sp)
 
 
 class DeleteServiceProvider(command.Command):
@@ -104,11 +137,11 @@ class DeleteServiceProvider(command.Command):
         return parser
 
     def take_action(self, parsed_args):
-        service_client = self.app.client_manager.identity
+        service_client = self.app.client_manager.sdk_connection.identity
         result = 0
         for i in parsed_args.service_provider:
             try:
-                service_client.federation.service_providers.delete(i)
+                service_client.delete_service_provider(i)
             except Exception as e:
                 result += 1
                 LOG.error(
@@ -132,24 +165,32 @@ class ListServiceProvider(command.Lister):
     _description = _("List service providers")
 
     def take_action(self, parsed_args):
-        service_client = self.app.client_manager.identity
-        data = service_client.federation.service_providers.list()
-
-        column_headers = ('ID', 'Enabled', 'Description', 'Auth URL')
+        service_client = self.app.client_manager.sdk_connection.identity
+        data = service_client.service_providers()
+
+        column_headers = (
+            'ID',
+            'Enabled',
+            'Description',
+            'Auth URL',
+            'Service Provider URL',
+            'Relay State Prefix',
+        )
+        columns = (
+            'id',
+            'is_enabled',
+            'description',
+            'auth_url',
+            'sp_url',
+            'relay_state_prefix',
+        )
         return (
             column_headers,
-            (
-                utils.get_item_properties(
-                    s,
-                    column_headers,
-                    formatters={},
-                )
-                for s in data
-            ),
+            (utils.get_item_properties(s, columns) for s in data),
         )
 
 
-class SetServiceProvider(command.Command):
+class SetServiceProvider(command.ShowOne):
     _description = _("Set service provider properties")
 
     def get_parser(self, prog_name):
@@ -181,33 +222,44 @@ class SetServiceProvider(command.Command):
         enable_service_provider = parser.add_mutually_exclusive_group()
         enable_service_provider.add_argument(
             '--enable',
+            dest='is_enabled',
             action='store_true',
+            default=None,
             help=_('Enable the service provider'),
         )
         enable_service_provider.add_argument(
             '--disable',
-            action='store_true',
+            dest='is_enabled',
+            action='store_false',
+            default=None,
             help=_('Disable the service provider'),
         )
         return parser
 
     def take_action(self, parsed_args):
-        federation_client = self.app.client_manager.identity.federation
+        service_client = self.app.client_manager.sdk_connection.identity
 
-        enabled = None
-        if parsed_args.enable is True:
-            enabled = True
-        elif parsed_args.disable is True:
-            enabled = False
+        kwargs = {}
 
-        federation_client.service_providers.update(
+        if parsed_args.is_enabled is not None:
+            kwargs['is_enabled'] = parsed_args.is_enabled
+
+        if parsed_args.description:
+            kwargs['description'] = parsed_args.description
+
+        if parsed_args.auth_url:
+            kwargs['auth_url'] = parsed_args.auth_url
+
+        if parsed_args.service_provider_url:
+            kwargs['sp_url'] = parsed_args.service_provider_url
+
+        service_provider = service_client.update_service_provider(
             parsed_args.service_provider,
-            enabled=enabled,
-            description=parsed_args.description,
-            auth_url=parsed_args.auth_url,
-            sp_url=parsed_args.service_provider_url,
+            **kwargs,
         )
 
+        return _format_service_provider(service_provider)
+
 
 class ShowServiceProvider(command.ShowOne):
     _description = _("Display service provider details")
@@ -222,12 +274,10 @@ class ShowServiceProvider(command.ShowOne):
         return parser
 
     def take_action(self, parsed_args):
-        service_client = self.app.client_manager.identity
-        service_provider = utils.find_resource(
-            service_client.federation.service_providers,
+        service_client = self.app.client_manager.sdk_connection.identity
+        service_provider = service_client.find_service_provider(
             parsed_args.service_provider,
-            id=parsed_args.service_provider,
+            ignore_missing=False,
         )
 
-        service_provider._info.pop('links', None)
-        return zip(*sorted(service_provider._info.items()))
+        return _format_service_provider(service_provider)

openstackclient/identity/v3/trust.py

@@ -14,9 +14,10 @@
 """Identity v3 Trust action implementations"""
 
 import datetime
+import itertools
 import logging
 
-from keystoneclient import exceptions as identity_exc
+from openstack import exceptions as sdk_exceptions
 from osc_lib.command import command
 from osc_lib import exceptions
 from osc_lib import utils
@@ -28,6 +29,25 @@ from openstackclient.identity import common
 LOG = logging.getLogger(__name__)
 
 
+def _format_trust(trust):
+    columns = (
+        'expires_at',
+        'id',
+        'is_impersonation',
+        'project_id',
+        'redelegated_trust_id',
+        'redelegation_count',
+        'remaining_uses',
+        'roles',
+        'trustee_user_id',
+        'trustor_user_id',
+    )
+    return (
+        columns,
+        utils.get_item_properties(trust, columns),
+    )
+
+
 class CreateTrust(command.ShowOne):
     _description = _("Create new trust")
 
@@ -52,6 +72,7 @@ class CreateTrust(command.ShowOne):
         parser.add_argument(
             '--role',
             metavar='<role>',
+            dest='roles',
             action='append',
             default=[],
             help=_(
@@ -62,7 +83,7 @@ class CreateTrust(command.ShowOne):
         )
         parser.add_argument(
             '--impersonate',
-            dest='impersonate',
+            dest='is_impersonation',
             action='store_true',
             default=False,
             help=_(
@@ -92,58 +113,60 @@ class CreateTrust(command.ShowOne):
         return parser
 
     def take_action(self, parsed_args):
-        identity_client = self.app.client_manager.identity
+        identity_client = self.app.client_manager.sdk_connection.identity
+
+        kwargs = {}
 
         # NOTE(stevemar): Find the two users, project and roles that
         # are necessary for making a trust usable, the API dictates that
         # trustee, project and role are optional, but that makes the trust
         # pointless, and trusts are immutable, so let's enforce it at the
         # client level.
-        trustor_id = common.find_user(
-            identity_client, parsed_args.trustor, parsed_args.trustor_domain
-        ).id
-        trustee_id = common.find_user(
-            identity_client, parsed_args.trustee, parsed_args.trustee_domain
-        ).id
-        project_id = common.find_project(
-            identity_client, parsed_args.project, parsed_args.project_domain
-        ).id
+        try:
+            trustor_id = identity_client.find_user(
+                parsed_args.trustor, parsed_args.trustor_domain
+            ).id
+            kwargs['trustor_id'] = trustor_id
+        except sdk_exceptions.ForbiddenException:
+            kwargs['trustor_id'] = parsed_args.trustor
+
+        try:
+            trustee_id = identity_client.find_user(
+                parsed_args.trustee, parsed_args.trustee_domain
+            ).id
+            kwargs['trustee_id'] = trustee_id
+        except sdk_exceptions.ForbiddenException:
+            kwargs['trustee_id'] = parsed_args.trustee
+
+        try:
+            project_id = identity_client.find_project(
+                parsed_args.project, parsed_args.project_domain
+            ).id
+            kwargs['project_id'] = project_id
+        except sdk_exceptions.ForbiddenException:
+            kwargs['project_id'] = parsed_args.project
 
         role_ids = []
-        for role in parsed_args.role:
+        for role in parsed_args.roles:
             try:
-                role_id = utils.find_resource(
-                    identity_client.roles,
-                    role,
-                ).id
-            except identity_exc.Forbidden:
+                role_id = identity_client.find_role(role).id
+            except sdk_exceptions.ForbiddenException:
                 role_id = role
             role_ids.append(role_id)
+        kwargs['roles'] = role_ids
 
-        expires_at = None
         if parsed_args.expiration:
             expires_at = datetime.datetime.strptime(
                 parsed_args.expiration, '%Y-%m-%dT%H:%M:%S'
             )
+            kwargs['expires_at'] = expires_at
 
-        trust = identity_client.trusts.create(
-            trustee_id,
-            trustor_id,
-            impersonation=parsed_args.impersonate,
-            project=project_id,
-            role_ids=role_ids,
-            expires_at=expires_at,
-        )
-
-        trust._info.pop('roles_links', None)
-        trust._info.pop('links', None)
+        if parsed_args.is_impersonation:
+            kwargs['is_impersonation'] = parsed_args.is_impersonation
 
-        # Format roles into something sensible
-        roles = trust._info.pop('roles')
-        msg = ' '.join(r['name'] for r in roles)
-        trust._info['roles'] = msg
+        trust = identity_client.create_trust(**kwargs)
 
-        return zip(*sorted(trust._info.items()))
+        return _format_trust(trust)
 
 
 class DeleteTrust(command.Command):
@@ -160,13 +183,15 @@ class DeleteTrust(command.Command):
         return parser
 
     def take_action(self, parsed_args):
-        identity_client = self.app.client_manager.identity
+        identity_client = self.app.client_manager.sdk_connection.identity
 
         errors = 0
         for trust in parsed_args.trust:
             try:
-                trust_obj = utils.find_resource(identity_client.trusts, trust)
-                identity_client.trusts.delete(trust_obj.id)
+                trust_obj = identity_client.find_trust(
+                    trust, ignore_missing=False
+                )
+                identity_client.delete_trust(trust_obj.id)
             except Exception as e:
                 errors += 1
                 LOG.error(
@@ -220,7 +245,7 @@ class ListTrust(command.Lister):
         return parser
 
     def take_action(self, parsed_args):
-        identity_client = self.app.client_manager.identity
+        identity_client = self.app.client_manager.sdk_connection.identity
         auth_ref = self.app.client_manager.auth_ref
 
         if parsed_args.authuser and any(
@@ -243,38 +268,50 @@ class ListTrust(command.Lister):
             raise exceptions.CommandError(msg)
 
         if parsed_args.authuser:
-            if auth_ref:
-                user = common.find_user(identity_client, auth_ref.user_id)
-                # We need two calls here as we want trusts with
-                # either the trustor or the trustee set to current user
-                # using a single call would give us trusts with both
-                # trustee and trustor set to current user
-                data1 = identity_client.trusts.list(trustor_user=user)
-                data2 = identity_client.trusts.list(trustee_user=user)
-                data = set(data1 + data2)
+            # We need two calls here as we want trusts with
+            # either the trustor or the trustee set to current user
+            # using a single call would give us trusts with both
+            # trustee and trustor set to current user
+            data = list(
+                {
+                    x.id: x
+                    for x in itertools.chain(
+                        identity_client.trusts(
+                            trustor_user_id=auth_ref.user_id
+                        ),
+                        identity_client.trusts(
+                            trustee_user_id=auth_ref.user_id
+                        ),
+                    )
+                }.values()
+            )
         else:
             trustor = None
             if parsed_args.trustor:
-                trustor = common.find_user(
-                    identity_client,
-                    parsed_args.trustor,
-                    parsed_args.trustor_domain,
-                )
+                try:
+                    trustor_id = identity_client.find_user(
+                        parsed_args.trustor, parsed_args.trustor_domain
+                    ).id
+                    trustor = trustor_id
+                except sdk_exceptions.ForbiddenException:
+                    trustor = parsed_args.trustor
 
             trustee = None
             if parsed_args.trustee:
-                trustee = common.find_user(
-                    identity_client,
-                    parsed_args.trustor,
-                    parsed_args.trustor_domain,
-                )
-
-            data = self.app.client_manager.identity.trusts.list(
-                trustor_user=trustor,
-                trustee_user=trustee,
+                try:
+                    trustee_id = identity_client.find_user(
+                        parsed_args.trustee, parsed_args.trustee_domain
+                    ).id
+                    trustee = trustee_id
+                except sdk_exceptions.ForbiddenException:
+                    trustee = parsed_args.trustee
+
+            data = identity_client.trusts(
+                trustor_user_id=trustor,
+                trustee_user_id=trustee,
             )
 
-        columns = (
+        column_headers = (
             'ID',
             'Expires At',
             'Impersonation',
@@ -282,9 +319,17 @@ class ListTrust(command.Lister):
             'Trustee User ID',
             'Trustor User ID',
         )
+        columns = (
+            'id',
+            'expires_at',
+            'is_impersonation',
+            'project_id',
+            'trustee_user_id',
+            'trustor_user_id',
+        )
 
         return (
-            columns,
+            column_headers,
             (
                 utils.get_item_properties(
                     s,
@@ -309,15 +354,9 @@ class ShowTrust(command.ShowOne):
         return parser
 
     def take_action(self, parsed_args):
-        identity_client = self.app.client_manager.identity
-        trust = utils.find_resource(identity_client.trusts, parsed_args.trust)
-
-        trust._info.pop('roles_links', None)
-        trust._info.pop('links', None)
-
-        # Format roles into something sensible
-        roles = trust._info.pop('roles')
-        msg = ' '.join(r['name'] for r in roles)
-        trust._info['roles'] = msg
+        identity_client = self.app.client_manager.sdk_connection.identity
+        trust = identity_client.find_trust(
+            parsed_args.trust, ignore_missing=False
+        )
 
-        return zip(*sorted(trust._info.items()))
+        return _format_trust(trust)

openstackclient/image/v2/image.py

@@ -576,6 +576,9 @@ class CreateImage(command.ShowOne):
         if parsed_args.filename:
             fp.close()
 
+        # NOTE(pas-ha): create_image returns the image object as it was created
+        # before the data was uploaded, need a refresh to show the final state
+        image = image_client.get_image(image)
         return _format_image(image)
 
     def _take_action_volume(self, parsed_args):

openstackclient/network/v2/network.py

@@ -14,6 +14,7 @@
 
 from cliff import columns as cliff_columns
 from osc_lib.cli import format_columns
+from osc_lib import exceptions
 from osc_lib import utils
 from osc_lib.utils import tags as _tag
 
@@ -349,6 +350,25 @@ class CreateNetwork(
             ),
         )
 
+        vlan_qinq_grp = parser.add_mutually_exclusive_group()
+        vlan_qinq_grp.add_argument(
+            '--qinq-vlan',
+            action='store_true',
+            help=self.enhance_help_neutron(
+                _("Enable VLAN QinQ (S-Tag ethtype 0x8a88) " "for the network")
+            ),
+        )
+        vlan_qinq_grp.add_argument(
+            '--no-qinq-vlan',
+            action='store_true',
+            help=self.enhance_help_neutron(
+                _(
+                    "Disable VLAN QinQ (S-Tag ethtype 0x8a88) "
+                    "for the network"
+                )
+            ),
+        )
+
         _add_additional_network_options(parser)
         _tag.add_tag_option_to_parser_for_create(
             parser, _('network'), enhance_help=self.enhance_help_neutron
@@ -372,6 +392,19 @@ class CreateNetwork(
             attrs['vlan_transparent'] = True
         if parsed_args.no_transparent_vlan:
             attrs['vlan_transparent'] = False
+
+        if parsed_args.qinq_vlan:
+            attrs['vlan_qinq'] = True
+        if parsed_args.no_qinq_vlan:
+            attrs['vlan_qinq'] = False
+
+        if attrs.get('vlan_transparent') and attrs.get('vlan_qinq'):
+            msg = _(
+                "--transparent-vlan and --qinq-vlan can not be both enabled "
+                "for the network."
+            )
+            raise exceptions.CommandError(msg)
+
         attrs.update(
             self._parse_extra_properties(parsed_args.extra_properties)
         )

openstackclient/network/v2/network_flavor_profile.py

@@ -18,7 +18,6 @@ from osc_lib import exceptions
 from osc_lib import utils
 
 from openstackclient.i18n import _
-from openstackclient.identity import common as identity_common
 from openstackclient.network import common
 
 LOG = logging.getLogger(__name__)
@@ -29,7 +28,7 @@ def _get_columns(item):
         'is_enabled': 'enabled',
     }
 
-    hidden_columns = ['location', 'name', 'tenant_id']
+    hidden_columns = ['location', 'name', 'tenant_id', 'project_id']
     return utils.get_osc_show_columns_for_sdk_resource(
         item, column_map, hidden_columns
     )
@@ -47,14 +46,6 @@ def _get_attrs(client_manager, parsed_args):
         attrs['enabled'] = True
     if parsed_args.disable:
         attrs['enabled'] = False
-    if 'project' in parsed_args and parsed_args.project is not None:
-        identity_client = client_manager.identity
-        project_id = identity_common.find_project(
-            identity_client,
-            parsed_args.project,
-            parsed_args.project_domain,
-        ).id
-        attrs['project_id'] = project_id
 
     return attrs
 
@@ -68,12 +59,6 @@ class CreateNetworkFlavorProfile(
 
     def get_parser(self, prog_name):
         parser = super().get_parser(prog_name)
-        parser.add_argument(
-            '--project',
-            metavar="<project>",
-            help=_("Owner's project (name or ID)"),
-        )
-        identity_common.add_project_domain_option_to_parser(parser)
         parser.add_argument(
             '--description',
             metavar="<description>",
@@ -212,7 +197,6 @@ class SetNetworkFlavorProfile(common.NeutronCommandWithExtraArgs):
             metavar="<flavor-profile>",
             help=_("Flavor profile to update (ID only)"),
         )
-        identity_common.add_project_domain_option_to_parser(parser)
         parser.add_argument(
             '--description',
             metavar="<description>",