openstack/python-openstackclient
Code Issues Proposed changes

Merge "Fix "sevice show" cannot catch NoUniqueMatch Exception"

Browse Source
This commit is contained in:
Jenkins 2015-12-10 18:37:17 +00:00 committed by Gerrit Code Review
commit 823ba770e0
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openstackclient/identity/common.py
View File

@ -41,6 +41,11 @@ def find_service(identity_client, name_type_or_id):
msg = ("No service with a type, name or ID of '%s' exists."
% name_type_or_id)
raise exceptions.CommandError(msg)
except identity_exc.NoUniqueMatch:
msg = ("Multiple service matches found for '%s', "
"use an ID to be more specific."
% name_type_or_id)
raise exceptions.CommandError(msg)
def _get_domain_id_if_requested(identity_client, domain_name_or_id):