openstack
/
python-openstackclient
Code Issues Proposed changes

Merge "Safely pop project parent id"

This commit is contained in:
Jenkins 2014-12-04 22:11:51 +00:00 committed by Gerrit Code Review
parent ac4950b46e 13672123fc
commit f6fc2db2ef
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openstackclient/identity/v2_0/project.py
View File

@ -98,9 +98,9 @@ class CreateProject(show.ShowOne):
else: else:
raise e raise e
info = {} # TODO(stevemar): Remove the line below when we support multitenancy
info.update(project._info) project._info.pop('parent_id', None)
return zip(*sorted(six.iteritems(info))) return zip(*sorted(six.iteritems(project._info)))
class DeleteProject(command.Command): class DeleteProject(command.Command):
@ -279,4 +279,6 @@ class ShowProject(show.ShowOne):
else: else:
raise e raise e
# TODO(stevemar): Remove the line below when we support multitenancy
info.pop('parent_id', None)
return zip(*sorted(six.iteritems(info))) return zip(*sorted(six.iteritems(info)))

4
openstackclient/identity/v3/project.py
View File

@ -111,6 +111,8 @@ class CreateProject(show.ShowOne):
raise e raise e
project._info.pop('links') 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))) return zip(*sorted(six.iteritems(project._info)))
@ -325,4 +327,6 @@ class ShowProject(show.ShowOne):
parsed_args.project) parsed_args.project)
project._info.pop('links') 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))) return zip(*sorted(six.iteritems(project._info)))