diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-10-13 03:26:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-10-13 03:26:27 +0000 |
| commit | 79a9331f95979c4ca3c2b8f8bcda7b5d6ef0ddd9 (patch) | |
| tree | 4bb1f070b5a27faefee90e49b4b91a6cc873b26c /openstackclient/identity/v3/project.py | |
| parent | 36212c43d880d0eaeb3df271cccb314802bf3372 (diff) | |
| parent | a8d4b0eebb563c8aad33300938b1b32347eb0050 (diff) | |
| download | python-openstackclient-79a9331f95979c4ca3c2b8f8bcda7b5d6ef0ddd9.tar.gz | |
Merge "Remove 'links' section from several v3 Identity objects"
Diffstat (limited to 'openstackclient/identity/v3/project.py')
| -rw-r--r-- | openstackclient/identity/v3/project.py | 15 |
1 files changed, 4 insertions, 11 deletions
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))) |