From 32f7dde401e6b0504ed3c1d9cb04d10c3074f0d4 Mon Sep 17 00:00:00 2001
From: Yusuke Hayashi <hayashi-yusuke@jp.fujitsu.com>
Date: Sun, 9 Aug 2015 06:24:05 -0700
Subject: [PATCH] Fix incorrect exception message in cinderclient

Incorrect exception message was output
from get_volume_api_from_url(url) in cinderclient.client.

Here is example:

<Invalid input>
"http://fakeurl/v9/tenants"

<Exception message>
cinderclient.exceptions.UnsupportedVersion:
Invalid client version 'v2'. must be one of: v1, v2

=> Although input does not include 'v2',
   exception message reports that invalid version v2 is included.

Change-Id: I73ff1581b1ce609b3c64a8a6d88d41a2cc2ed56f
Closes-Bug: #1482988
---
 cinderclient/client.py | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/cinderclient/client.py b/cinderclient/client.py
index b68c0605f..430537c8f 100644
--- a/cinderclient/client.py
+++ b/cinderclient/client.py
@@ -22,6 +22,7 @@ from __future__ import print_function
 
 import logging
 import re
+import six
 
 from keystoneclient import access
 from keystoneclient import adapter
@@ -32,6 +33,7 @@ import requests
 from cinderclient import exceptions
 from cinderclient.openstack.common import importutils
 from cinderclient.openstack.common import strutils
+from cinderclient.openstack.common.gettextutils import _
 
 osprofiler_web = importutils.try_import("osprofiler.web")
 
@@ -72,8 +74,8 @@ def get_volume_api_from_url(url):
         if version in components:
             return version[1:]
 
-    msg = "Invalid client version '%s'. must be one of: %s" % (
-        (version, ', '.join(_VALID_VERSIONS)))
+    msg = (_("Invalid url: '%(url)s'. It must include one of: %(version)s.")
+        % {'url': url, 'version': ', '.join(_VALID_VERSIONS)})
     raise exceptions.UnsupportedVersion(msg)
 
 
@@ -110,7 +112,14 @@ class SessionClient(adapter.LegacyJsonAdapter):
         return self._cs_request(url, 'DELETE', **kwargs)
 
     def get_volume_api_version_from_endpoint(self):
-        return get_volume_api_from_url(self.get_endpoint())
+        try:
+            version = get_volume_api_from_url(self.get_endpoint())
+        except exceptions.UnsupportedVersion as e:
+            msg = (_("Service catalog returned invalid url.\n"
+                     "%s") % six.text_type(e.message))
+            raise exceptions.UnsupportedVersion(msg)
+
+        return version
 
     def authenticate(self, auth=None):
         self.invalidate(auth)
@@ -314,7 +323,20 @@ class HTTPClient(object):
         return self._cs_request(url, 'DELETE', **kwargs)
 
     def get_volume_api_version_from_endpoint(self):
-        return get_volume_api_from_url(self.management_url)
+        try:
+            version = get_volume_api_from_url(self.management_url)
+        except exceptions.UnsupportedVersion as e:
+            if self.management_url == self.bypass_url:
+                msg = (_("Invalid url was specified in --bypass-url or "
+                         "environment variable CINDERCLIENT_BYPASS_URL.\n"
+                         "%s") % six.text_type(e.message))
+            else:
+                msg = (_("Service catalog returned invalid url.\n"
+                         "%s") % six.text_type(e.message))
+
+            raise exceptions.UnsupportedVersion(msg)
+
+        return version
 
     def _extract_service_catalog(self, url, resp, body, extract_token=True):
         """See what the auth service told us and process the response.