summaryrefslogtreecommitdiff
path: root/openstackclient/identity
diff options
context:
space:
mode:
Diffstat (limited to 'openstackclient/identity')
-rw-r--r--openstackclient/identity/v3/credential.py2
-rw-r--r--openstackclient/identity/v3/domain.py2
-rw-r--r--openstackclient/identity/v3/endpoint.py2
-rw-r--r--openstackclient/identity/v3/group.py6
-rw-r--r--openstackclient/identity/v3/policy.py2
-rw-r--r--openstackclient/identity/v3/project.py15
-rw-r--r--openstackclient/identity/v3/role.py2
-rw-r--r--openstackclient/identity/v3/service.py6
-rw-r--r--openstackclient/identity/v3/user.py6
9 files changed, 23 insertions, 20 deletions
diff --git a/openstackclient/identity/v3/credential.py b/openstackclient/identity/v3/credential.py
index f1e17b85..4d688954 100644
--- a/openstackclient/identity/v3/credential.py
+++ b/openstackclient/identity/v3/credential.py
@@ -73,6 +73,7 @@ class CreateCredential(show.ShowOne):
blob=parsed_args.data,
project=project)
+ credential._info.pop('links')
return zip(*sorted(six.iteritems(credential._info)))
@@ -193,4 +194,5 @@ class ShowCredential(show.ShowOne):
credential = utils.find_resource(identity_client.credentials,
parsed_args.credential)
+ credential._info.pop('links')
return zip(*sorted(six.iteritems(credential._info)))
diff --git a/openstackclient/identity/v3/domain.py b/openstackclient/identity/v3/domain.py
index 49397afc..d14da486 100644
--- a/openstackclient/identity/v3/domain.py
+++ b/openstackclient/identity/v3/domain.py
@@ -66,6 +66,7 @@ class CreateDomain(show.ShowOne):
enabled=parsed_args.enabled,
)
+ domain._info.pop('links')
return zip(*sorted(six.iteritems(domain._info)))
@@ -187,4 +188,5 @@ class ShowDomain(show.ShowOne):
domain = utils.find_resource(identity_client.domains,
parsed_args.domain)
+ domain._info.pop('links')
return zip(*sorted(six.iteritems(domain._info)))
diff --git a/openstackclient/identity/v3/endpoint.py b/openstackclient/identity/v3/endpoint.py
index 39798b2d..0c077c5a 100644
--- a/openstackclient/identity/v3/endpoint.py
+++ b/openstackclient/identity/v3/endpoint.py
@@ -81,6 +81,7 @@ class CreateEndpoint(show.ShowOne):
)
info = {}
+ endpoint._info.pop('links')
info.update(endpoint._info)
info['service_name'] = service.name
info['service_type'] = service.type
@@ -258,6 +259,7 @@ class ShowEndpoint(show.ShowOne):
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
diff --git a/openstackclient/identity/v3/group.py b/openstackclient/identity/v3/group.py
index bdb4e029..d2ffca27 100644
--- a/openstackclient/identity/v3/group.py
+++ b/openstackclient/identity/v3/group.py
@@ -138,9 +138,8 @@ class CreateGroup(show.ShowOne):
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 @@ class ShowGroup(show.ShowOne):
group = utils.find_resource(identity_client.groups,
parsed_args.group)
+ group._info.pop('links')
return zip(*sorted(six.iteritems(group._info)))
diff --git a/openstackclient/identity/v3/policy.py b/openstackclient/identity/v3/policy.py
index 87f3cbe9..802880bf 100644
--- a/openstackclient/identity/v3/policy.py
+++ b/openstackclient/identity/v3/policy.py
@@ -55,6 +55,7 @@ class CreatePolicy(show.ShowOne):
blob=blob, type=parsed_args.type
)
+ policy._info.pop('links')
return zip(*sorted(six.iteritems(policy._info)))
@@ -173,4 +174,5 @@ class ShowPolicy(show.ShowOne):
policy = utils.find_resource(identity_client.policies,
parsed_args.policy)
+ policy._info.pop('links')
return zip(*sorted(six.iteritems(policy._info)))
diff --git a/openstackclient/identity/v3/project.py b/openstackclient/identity/v3/project.py
index 7b3c281c..1cdeb150 100644
--- a/openstackclient/identity/v3/project.py
+++ b/openstackclient/identity/v3/project.py
@@ -94,9 +94,8 @@ class CreateProject(show.ShowOne):
**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 @@ class SetProject(command.Command):
parsed_args.project,
)
- kwargs = project._info
+ kwargs = {}
if parsed_args.name:
kwargs['name'] = parsed_args.name
if parsed_args.domain:
@@ -243,13 +242,6 @@ class SetProject(command.Command):
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 @@ class ShowProject(show.ShowOne):
project = utils.find_resource(identity_client.projects,
parsed_args.project)
+ project._info.pop('links')
return zip(*sorted(six.iteritems(project._info)))
diff --git a/openstackclient/identity/v3/role.py b/openstackclient/identity/v3/role.py
index d8de7c22..a3c24b7a 100644
--- a/openstackclient/identity/v3/role.py
+++ b/openstackclient/identity/v3/role.py
@@ -157,6 +157,7 @@ class CreateRole(show.ShowOne):
role = identity_client.roles.create(name=parsed_args.name)
+ role._info.pop('links')
return zip(*sorted(six.iteritems(role._info)))
@@ -472,4 +473,5 @@ class ShowRole(show.ShowOne):
parsed_args.role,
)
+ role._info.pop('links')
return zip(*sorted(six.iteritems(role._info)))
diff --git a/openstackclient/identity/v3/service.py b/openstackclient/identity/v3/service.py
index 88301edc..4f622269 100644
--- a/openstackclient/identity/v3/service.py
+++ b/openstackclient/identity/v3/service.py
@@ -70,6 +70,7 @@ class CreateService(show.ShowOne):
enabled=enabled,
)
+ service._info.pop('links')
return zip(*sorted(six.iteritems(service._info)))
@@ -161,7 +162,7 @@ class SetService(command.Command):
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 @@ class SetService(command.Command):
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 @@ class ShowService(show.ShowOne):
service = common.find_service(identity_client, parsed_args.service)
+ service._info.pop('links')
return zip(*sorted(six.iteritems(service._info)))
diff --git a/openstackclient/identity/v3/user.py b/openstackclient/identity/v3/user.py
index 10921219..9a3e00b8 100644
--- a/openstackclient/identity/v3/user.py
+++ b/openstackclient/identity/v3/user.py
@@ -116,9 +116,8 @@ class CreateUser(show.ShowOne):
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 @@ class ShowUser(show.ShowOne):
user = utils.find_resource(identity_client.users,
parsed_args.user)
+ user._info.pop('links')
return zip(*sorted(six.iteritems(user._info)))
View Lorry Controller Status