From b98aee57c10917d5f57f2ed3cfae3ce67e33496c Mon Sep 17 00:00:00 2001 From: Min Min Ren Date: Wed, 9 Dec 2015 05:42:18 +0800 Subject: [PATCH] Fix "sevice show" cannot catch NoUniqueMatch Exception Fix a bug for "service show" subcommand cannot cache NoUniqueMatch Exception Change-Id: I393c5417de0fef424618b08119ddbc8fea27e114 Closes-Bug: #1524305 --- openstackclient/identity/common.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/openstackclient/identity/common.py b/openstackclient/identity/common.py index d0edb0bd5a..2afa41fb35 100644 --- a/openstackclient/identity/common.py +++ b/openstackclient/identity/common.py @@ -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):