Remove 'links' section from several v3 Identity objects

The links field in the returned objects from the v3 Identity
API aren't really useful, so let's remove them.
Managed to remove most of them from the core API.
I'll likely remove the extension/contribution (oauth/federation)
related ones in another patch.

Also in this patch the code for setting services and projects
was changed. Though not incorrect, it was not needed to copy
the entire returned object, we should just need to pass in
the fields we want to update.

Change-Id: I164ca9ad8b28fa10b291e9115ef40753e387c547

Author: Steve Martinelli

openstackclient/identity/v3/credential.py

@@ -73,6 +73,7 @@ def take_action(self, parsed_args):
             blob=parsed_args.data,
             project=project)
 
+        credential._info.pop('links')
         return zip(*sorted(six.iteritems(credential._info)))
 
 
@@ -193,4 +194,5 @@ def take_action(self, parsed_args):
         credential = utils.find_resource(identity_client.credentials,
                                          parsed_args.credential)
 
+        credential._info.pop('links')
         return zip(*sorted(six.iteritems(credential._info)))

openstackclient/identity/v3/domain.py

@@ -66,6 +66,7 @@ def take_action(self, parsed_args):
             enabled=parsed_args.enabled,
         )
 
+        domain._info.pop('links')
         return zip(*sorted(six.iteritems(domain._info)))
 
 
@@ -187,4 +188,5 @@ def take_action(self, parsed_args):
         domain = utils.find_resource(identity_client.domains,
                                      parsed_args.domain)
 
+        domain._info.pop('links')
         return zip(*sorted(six.iteritems(domain._info)))

openstackclient/identity/v3/endpoint.py

@@ -81,6 +81,7 @@ def take_action(self, parsed_args):
         )
 
         info = {}
+        endpoint._info.pop('links')
         info.update(endpoint._info)
         info['service_name'] = service.name
         info['service_type'] = service.type
@@ -258,6 +259,7 @@ def take_action(self, parsed_args):
         service = common.find_service(identity_client, endpoint.service_id)
 
         info = {}
+        endpoint._info.pop('links')
         info.update(endpoint._info)
         info['service_name'] = service.name
         info['service_type'] = service.type

openstackclient/identity/v3/group.py

@@ -138,9 +138,8 @@ def take_action(self, parsed_args):
             domain=domain,
             description=parsed_args.description)
 
-        info = {}
-        info.update(group._info)
-        return zip(*sorted(six.iteritems(info)))
+        group._info.pop('links')
+        return zip(*sorted(six.iteritems(group._info)))
 
 
 class DeleteGroup(command.Command):
@@ -340,4 +339,5 @@ def take_action(self, parsed_args):
             group = utils.find_resource(identity_client.groups,
                                         parsed_args.group)
 
+        group._info.pop('links')
         return zip(*sorted(six.iteritems(group._info)))

openstackclient/identity/v3/policy.py

@@ -55,6 +55,7 @@ def take_action(self, parsed_args):
             blob=blob, type=parsed_args.type
         )
 
+        policy._info.pop('links')
         return zip(*sorted(six.iteritems(policy._info)))
 
 
@@ -173,4 +174,5 @@ def take_action(self, parsed_args):
         policy = utils.find_resource(identity_client.policies,
                                      parsed_args.policy)
 
+        policy._info.pop('links')
         return zip(*sorted(six.iteritems(policy._info)))

openstackclient/identity/v3/project.py

@@ -94,9 +94,8 @@ def take_action(self, parsed_args):
             **kwargs
         )
 
-        info = {}
-        info.update(project._info)
-        return zip(*sorted(six.iteritems(info)))
+        project._info.pop('links')
+        return zip(*sorted(six.iteritems(project._info)))
 
 
 class DeleteProject(command.Command):
@@ -229,7 +228,7 @@ def take_action(self, parsed_args):
             parsed_args.project,
         )
 
-        kwargs = project._info
+        kwargs = {}
         if parsed_args.name:
             kwargs['name'] = parsed_args.name
         if parsed_args.domain:
@@ -243,13 +242,6 @@ def take_action(self, parsed_args):
             kwargs['enabled'] = False
         if parsed_args.property:
             kwargs.update(parsed_args.property)
-        if 'id' in kwargs:
-            del kwargs['id']
-        if 'domain_id' in kwargs:
-            # Hack around broken Identity API arg names
-            kwargs.update(
-                {'domain': kwargs.pop('domain_id')}
-            )
 
         identity_client.projects.update(project.id, **kwargs)
         return
@@ -287,4 +279,5 @@ def take_action(self, parsed_args):
             project = utils.find_resource(identity_client.projects,
                                           parsed_args.project)
 
+        project._info.pop('links')
         return zip(*sorted(six.iteritems(project._info)))

openstackclient/identity/v3/role.py

@@ -157,6 +157,7 @@ def take_action(self, parsed_args):
 
         role = identity_client.roles.create(name=parsed_args.name)
 
+        role._info.pop('links')
         return zip(*sorted(six.iteritems(role._info)))
 
 
@@ -472,4 +473,5 @@ def take_action(self, parsed_args):
             parsed_args.role,
         )
 
+        role._info.pop('links')
         return zip(*sorted(six.iteritems(role._info)))

openstackclient/identity/v3/service.py

@@ -70,6 +70,7 @@ def take_action(self, parsed_args):
             enabled=enabled,
         )
 
+        service._info.pop('links')
         return zip(*sorted(six.iteritems(service._info)))
 
 
@@ -161,7 +162,7 @@ def take_action(self, parsed_args):
 
         service = common.find_service(identity_client, parsed_args.service)
 
-        kwargs = service._info
+        kwargs = {}
         if parsed_args.type:
             kwargs['type'] = parsed_args.type
         if parsed_args.name:
@@ -170,8 +171,6 @@ def take_action(self, parsed_args):
             kwargs['enabled'] = True
         if parsed_args.disable:
             kwargs['enabled'] = False
-        if 'id' in kwargs:
-            del kwargs['id']
 
         identity_client.services.update(
             service.id,
@@ -200,4 +199,5 @@ def take_action(self, parsed_args):
 
         service = common.find_service(identity_client, parsed_args.service)
 
+        service._info.pop('links')
         return zip(*sorted(six.iteritems(service._info)))

openstackclient/identity/v3/user.py

@@ -116,9 +116,8 @@ def take_action(self, parsed_args):
             enabled=enabled
         )
 
-        info = {}
-        info.update(user._info)
-        return zip(*sorted(six.iteritems(info)))
+        user._info.pop('links')
+        return zip(*sorted(six.iteritems(user._info)))
 
 
 class DeleteUser(command.Command):
@@ -382,4 +381,5 @@ def take_action(self, parsed_args):
             user = utils.find_resource(identity_client.users,
                                        parsed_args.user)
 
+        user._info.pop('links')
         return zip(*sorted(six.iteritems(user._info)))

openstackclient/tests/identity/v3/fakes.py

@@ -18,6 +18,7 @@
 from openstackclient.tests import fakes
 from openstackclient.tests import utils
 
+base_url = 'http://identity:5000/v3/'
 
 domain_id = 'd1'
 domain_name = 'oftheking'
@@ -28,6 +29,7 @@
     'name': domain_name,
     'description': domain_description,
     'enabled': True,
+    'links': base_url + 'domains/' + domain_id,
 }
 
 group_id = 'gr-010'
@@ -36,6 +38,7 @@
 GROUP = {
     'id': group_id,
     'name': group_name,
+    'links': base_url + 'groups/' + group_id,
 }
 
 mapping_id = 'test_mapping'
@@ -107,6 +110,7 @@
     'description': project_description,
     'enabled': True,
     'domain_id': domain_id,
+    'links': base_url + 'projects/' + project_id,
 }
 
 PROJECT_2 = {
@@ -115,6 +119,7 @@
     'description': project_description + 'plus four more',
     'enabled': True,
     'domain_id': domain_id,
+    'links': base_url + 'projects/' + project_id,
 }
 
 role_id = 'r1'
@@ -123,6 +128,7 @@
 ROLE = {
     'id': role_id,
     'name': role_name,
+    'links': base_url + 'roles/' + role_id,
 }
 
 service_id = 's-123'
@@ -134,6 +140,7 @@
     'name': service_name,
     'type': service_type,
     'enabled': True,
+    'links': base_url + 'services/' + service_id,
 }
 
 endpoint_id = 'e-123'
@@ -148,6 +155,7 @@
     'interface': endpoint_interface,
     'service_id': service_id,
     'enabled': True,
+    'links': base_url + 'endpoints/' + endpoint_id,
 }
 
 user_id = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa'
@@ -162,6 +170,7 @@
     'email': user_email,
     'enabled': True,
     'domain_id': domain_id,
+    'links': base_url + 'users/' + user_id,
 }
 
 token_expires = '2014-01-01T00:00:00Z'