diff options
| author | Steve Martinelli <stevemar@ca.ibm.com> | 2014-12-04 15:34:02 -0500 |
|---|---|---|
| committer | Steve Martinelli <stevemar@ca.ibm.com> | 2014-12-04 15:34:02 -0500 |
| commit | 13672123fccdd76a62416b88443e78269a80343a (patch) | |
| tree | e87bbf7f0755d557627d55f26994196947b1cb81 /openstackclient/identity | |
| parent | cc54f989ec53efdf61563d3682ea787c49c21410 (diff) | |
| download | python-openstackclient-13672123fccdd76a62416b88443e78269a80343a.tar.gz | |
Safely pop project parent id
Since we don't support multitenancy yet, we should just pop the
parent id of a project. When keystoneclient supports mulittenancy
we should bring everything in at once (CRUD), and these changes
should be removed.
Change-Id: I82c7c825502124a24ccdbadf09ecb2748887ca5d
Diffstat (limited to 'openstackclient/identity')
| -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))) |