Catches HTTP 300 while printing responses

If glance v1 api is not enabled, and a request is made to it,
it gives a KeyError. This patch catches the 300 error and
displays error message.

Fixes bug 1046607

Change-Id: I0009a5deca3b5dd5ccaeaea90feee21274bfe090
This commit is contained in:
isethi
2012-09-07 20:54:09 +00:00
parent 61b359efa8
commit 5acd5a6a4a
2 changed files with 12 additions and 0 deletions
+2
View File
@@ -159,6 +159,8 @@ class HTTPClient(object):
elif resp.status in (301, 302, 305):
# Redirected. Reissue the request to the new location.
return self._http_request(resp['location'], method, **kwargs)
elif resp.status == 300:
raise exc.from_response(resp)
return resp, body_iter
+10
View File
@@ -52,6 +52,16 @@ class HTTPException(ClientException):
return "%s (HTTP %s)" % (self.__class__.__name__, self.code)
class HTTPMultipleChoices(HTTPException):
code = 300
def __str__(self):
self.details = ("Requested version of OpenStack Images API is not"
"available.")
return "%s (HTTP %s) %s" % (self.__class__.__name__, self.code,
self.details)
class BadRequest(HTTPException):
"""DEPRECATED"""
code = 400