diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-12-04 22:11:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-12-04 22:11:51 +0000 |
| commit | f6fc2db2efa9ba2481724651438bb4e7234b5cf1 (patch) | |
| tree | 7c63e821a02b92818068393fa2202384b746b545 /openstackclient | |
| parent | ac4950b46e65e5b3e4a98a0b0ce2a2c80747b3e8 (diff) | |
| parent | 13672123fccdd76a62416b88443e78269a80343a (diff) | |
| download | python-openstackclient-f6fc2db2efa9ba2481724651438bb4e7234b5cf1.tar.gz | |
Merge "Safely pop project parent id"
Diffstat (limited to 'openstackclient')
| -rw-r--r-- | openstackclient/identity/v2_0/project.py | 8 | ||||
| -rw-r--r-- | openstackclient/identity/v3/project.py | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/openstackclient/identity/v2_0/project.py b/openstackclient/identity/v2_0/project.py index df759ce6..b2f99425 100644 --- a/openstackclient/identity/v2_0/project.py +++ b/openstackclient/identity/v2_0/project.py @@ -98,9 +98,9 @@ class CreateProject(show.ShowOne): else: raise e - info = {} - info.update(project._info) - return zip(*sorted(six.iteritems(info))) + # TODO(stevemar): Remove the line below when we support multitenancy + project._info.pop('parent_id', None) + return zip(*sorted(six.iteritems(project._info))) class DeleteProject(command.Command): @@ -279,4 +279,6 @@ class ShowProject(show.ShowOne): else: raise e + # TODO(stevemar): Remove the line below when we support multitenancy + info.pop('parent_id', None) return zip(*sorted(six.iteritems(info))) diff --git a/openstackclient/identity/v3/project.py b/openstackclient/identity/v3/project.py index e9adfe34..2c2d408e 100644 --- a/openstackclient/identity/v3/project.py +++ b/openstackclient/identity/v3/project.py @@ -111,6 +111,8 @@ class CreateProject(show.ShowOne): raise e project._info.pop('links') + # TODO(stevemar): Remove the line below when we support multitenancy + project._info.pop('parent_id', None) return zip(*sorted(six.iteritems(project._info))) @@ -325,4 +327,6 @@ class ShowProject(show.ShowOne): parsed_args.project) project._info.pop('links') + # TODO(stevemar): Remove the line below when we support multitenancy + project._info.pop('parent_id', None) return zip(*sorted(six.iteritems(project._info))) |