Merge "Remove links from federation related commands in identity v3"

Author: Jenkins

openstackclient/identity/v3/federation_protocol.py

@@ -61,6 +61,7 @@ def take_action(self, parsed_args):
         # user.
         info['identity_provider'] = parsed_args.identity_provider
         info['mapping'] = info.pop('mapping_id')
+        info.pop('links', None)
         return zip(*sorted(six.iteritems(info)))
 
 
@@ -179,4 +180,5 @@ def take_action(self, parsed_args):
             parsed_args.identity_provider, parsed_args.federation_protocol)
         info = dict(protocol._info)
         info['mapping'] = info.pop('mapping_id')
+        info.pop('links', None)
         return zip(*sorted(six.iteritems(info)))

openstackclient/identity/v3/identity_provider.py

@@ -65,9 +65,9 @@ def take_action(self, parsed_args):
             id=parsed_args.identity_provider_id,
             description=parsed_args.description,
             enabled=parsed_args.enabled)
-        info = {}
-        info.update(idp._info)
-        return zip(*sorted(six.iteritems(info)))
+
+        idp._info.pop('links', None)
+        return zip(*sorted(six.iteritems(idp._info)))
 
 
 class DeleteIdentityProvider(command.Command):
@@ -176,6 +176,5 @@ def take_action(self, parsed_args):
             identity_client.federation.identity_providers,
             parsed_args.identity_provider)
 
-        info = {}
-        info.update(identity_provider._info)
-        return zip(*sorted(six.iteritems(info)))
+        identity_provider._info.pop('links', None)
+        return zip(*sorted(six.iteritems(identity_provider._info)))

openstackclient/identity/v3/mapping.py

@@ -107,9 +107,8 @@ def take_action(self, parsed_args):
             mapping_id=parsed_args.mapping,
             rules=rules)
 
-        info = {}
-        info.update(mapping._info)
-        return zip(*sorted(six.iteritems(info)))
+        mapping._info.pop('links', None)
+        return zip(*sorted(six.iteritems(mapping._info)))
 
 
 class DeleteMapping(command.Command):
@@ -204,6 +203,5 @@ def take_action(self, parsed_args):
 
         mapping = identity_client.federation.mappings.get(parsed_args.mapping)
 
-        info = {}
-        info.update(mapping._info)
-        return zip(*sorted(six.iteritems(info)))
+        mapping._info.pop('links', None)
+        return zip(*sorted(six.iteritems(mapping._info)))