diff options
Diffstat (limited to 'openstackclient/identity')
| -rw-r--r-- | openstackclient/identity/v2_0/project.py | 27 | ||||
| -rw-r--r-- | openstackclient/identity/v2_0/role.py | 18 |
2 files changed, 38 insertions, 7 deletions
diff --git a/openstackclient/identity/v2_0/project.py b/openstackclient/identity/v2_0/project.py index 7ead0890..2d66b400 100644 --- a/openstackclient/identity/v2_0/project.py +++ b/openstackclient/identity/v2_0/project.py @@ -63,6 +63,11 @@ class CreateProject(show.ShowOne): help=_('Property to add for this project ' '(repeat option to set multiple properties)'), ) + parser.add_argument( + '--or-show', + action='store_true', + help=_('Return existing project'), + ) return parser def take_action(self, parsed_args): @@ -76,12 +81,22 @@ class CreateProject(show.ShowOne): if parsed_args.property: kwargs = parsed_args.property.copy() - project = identity_client.tenants.create( - parsed_args.name, - description=parsed_args.description, - enabled=enabled, - **kwargs - ) + try: + project = identity_client.tenants.create( + parsed_args.name, + description=parsed_args.description, + enabled=enabled, + **kwargs + ) + except ksc_exc.Conflict as e: + if parsed_args.or_show: + project = utils.find_resource( + identity_client.tenants, + parsed_args.name, + ) + self.log.info('Returning existing project %s', project.name) + else: + raise e info = {} info.update(project._info) diff --git a/openstackclient/identity/v2_0/role.py b/openstackclient/identity/v2_0/role.py index 4c45004d..df69e857 100644 --- a/openstackclient/identity/v2_0/role.py +++ b/openstackclient/identity/v2_0/role.py @@ -21,6 +21,7 @@ import six from cliff import command from cliff import lister from cliff import show +from keystoneclient.openstack.common.apiclient import exceptions as ksc_exc from openstackclient.common import exceptions from openstackclient.common import utils @@ -81,12 +82,27 @@ class CreateRole(show.ShowOne): 'role_name', metavar='<role-name>', help=_('New role name')) + parser.add_argument( + '--or-show', + action='store_true', + help=_('Return existing role'), + ) return parser def take_action(self, parsed_args): self.log.debug('take_action(%s)', parsed_args) identity_client = self.app.client_manager.identity - role = identity_client.roles.create(parsed_args.role_name) + try: + role = identity_client.roles.create(parsed_args.role_name) + except ksc_exc.Conflict as e: + if parsed_args.or_show: + role = utils.find_resource( + identity_client.roles, + parsed_args.role_name, + ) + self.log.info('Returning existing role %s', role.name) + else: + raise e info = {} info.update(role._info) |