summaryrefslogtreecommitdiff
path: root/openstackclient/identity/v3/domain.py
diff options
context:
space:
mode:
authorSteve Martinelli <stevemar@ca.ibm.com>2014-11-14 01:59:14 -0500
committerSteve Martinelli <stevemar@ca.ibm.com>2014-11-18 04:58:13 +0000
commit79653afa7b7f4c3795f6fe3c972628729cb51b4d (patch)
tree6d81defe3c730143f6e89b9fe5d178f6a29d7952 /openstackclient/identity/v3/domain.py
parent7242113a8f8bcb8c227b259376e34e28ef6c2b52 (diff)
downloadpython-openstackclient-79653afa7b7f4c3795f6fe3c972628729cb51b4d.tar.gz
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
Diffstat (limited to 'openstackclient/identity/v3/domain.py')
-rw-r--r--openstackclient/identity/v3/domain.py26
1 files changed, 21 insertions, 5 deletions
diff --git a/openstackclient/identity/v3/domain.py b/openstackclient/identity/v3/domain.py
index d14da486..1233fea5 100644
--- a/openstackclient/identity/v3/domain.py
+++ b/openstackclient/identity/v3/domain.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 CreateDomain(show.ShowOne):
@@ -55,16 +57,30 @@ class CreateDomain(show.ShowOne):
dest='enabled',
action='store_false',
help='Disable domain')
+ parser.add_argument(
+ '--or-show',
+ action='store_true',
+ help=_('Return existing domain'),
+ )
return parser
def take_action(self, parsed_args):
self.log.debug('take_action(%s)', parsed_args)
identity_client = self.app.client_manager.identity
- domain = identity_client.domains.create(
- name=parsed_args.name,
- description=parsed_args.description,
- enabled=parsed_args.enabled,
- )
+
+ try:
+ domain = identity_client.domains.create(
+ name=parsed_args.name,
+ description=parsed_args.description,
+ enabled=parsed_args.enabled,
+ )
+ except ksc_exc.Conflict as e:
+ if parsed_args.or_show:
+ domain = utils.find_resource(identity_client.domains,
+ parsed_args.name)
+ self.log.info('Returning existing domain %s', domain.name)
+ else:
+ raise e
domain._info.pop('links')
return zip(*sorted(six.iteritems(domain._info)))