Add --or-show support for v3 identity resources

Add --or-show for the following:
  * v3 roles
  * v3 projects
  * v3 domains
  * v3 users
  * v3 groups

Closes-Bug: #1390389
Change-Id: Id4ef043e5fda6be49a515eb3fe138c813c393ec9

1 files changed, 16 insertions, 1 deletions

diff --git a/openstackclient/identity/v3/role.py b/openstackclient/identity/v3/role.py
index a3c24b7a..7801ca65 100644
--- a/openstackclient/identity/v3/role.py
+++ b/openstackclient/identity/v3/role.py
@@ -22,8 +22,10 @@ import sys
 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 utils
+from openstackclient.i18n import _  # noqa
 
 
 class AddRole(command.Command):
@@ -149,13 +151,26 @@ class CreateRole(show.ShowOne):
             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(name=parsed_args.name)
+        try:
+            role = identity_client.roles.create(name=parsed_args.name)
+        except ksc_exc.Conflict as e:
+            if parsed_args.or_show:
+                role = utils.find_resource(identity_client.roles,
+                                           parsed_args.name)
+                self.log.info('Returning existing role %s', role.name)
+            else:
+                raise e
 
         role._info.pop('links')
         return zip(*sorted(six.iteritems(role._info)))