Merge "Safely pop project parent id"
This commit is contained in:
commit
f6fc2db2ef
openstackclient/identity
@ -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)))
|
||||
|
@ -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)))
|
||||
|
Loading…
x
Reference in New Issue
Block a user