Remove RestClientException inheritance

The rest_client module doesn't raise AuthenticationFailur, so this
patch removes the inheritance.
In addition, this patch changes the order of exceptions for knowing
what exceptions the rest_client module raises.

Change-Id: Ia60ba728bdc650542602382eacbd35149717ecf7
This commit is contained in:
Ken'ichi Ohmichi 2015-01-19 02:29:56 +00:00
parent d1ef1333c0
commit 4ca14f609c
1 changed files with 45 additions and 45 deletions

View File

@ -51,10 +51,6 @@ class RestClientException(TempestException,
pass
class RFCViolation(RestClientException):
message = "RFC Violation"
class InvalidConfiguration(TempestException):
message = "Invalid Configuration"
@ -63,18 +59,6 @@ class InvalidCredentials(TempestException):
message = "Invalid Credentials"
class InvalidHttpSuccessCode(RestClientException):
message = "The success code is different than the expected one"
class NotFound(RestClientException):
message = "Object not found"
class Unauthorized(RestClientException):
message = 'Unauthorized'
class InvalidServiceTag(TempestException):
message = "Invalid service tag"
@ -123,15 +107,7 @@ class StackResourceBuildErrorException(TempestException):
"'%(resource_status_reason)s'")
class BadRequest(RestClientException):
message = "Bad request"
class UnprocessableEntity(RestClientException):
message = "Unprocessable entity"
class AuthenticationFailure(RestClientException):
class AuthenticationFailure(TempestException):
message = ("Authentication with user %(user)s and password "
"%(password)s failed auth using tenant %(tenant)s.")
@ -140,22 +116,6 @@ class EndpointNotFound(TempestException):
message = "Endpoint not found"
class RateLimitExceeded(RestClientException):
message = "Rate limit exceeded"
class OverLimit(RestClientException):
message = "Quota exceeded"
class ServerFault(RestClientException):
message = "Got server fault"
class NotImplemented(RestClientException):
message = "Got NotImplemented error"
class ImageFault(TempestException):
message = "Got image fault"
@ -164,10 +124,6 @@ class IdentityError(TempestException):
message = "Got identity error"
class Conflict(RestClientException):
message = "An object with that identifier already exists"
class SSHTimeout(TempestException):
message = ("Connection to the %(host)s via SSH timed out.\n"
"User: %(user)s, Password: %(password)s")
@ -187,6 +143,50 @@ class TearDownException(TempestException):
message = "%(num)d cleanUp operation failed"
class RFCViolation(RestClientException):
message = "RFC Violation"
class InvalidHttpSuccessCode(RestClientException):
message = "The success code is different than the expected one"
class NotFound(RestClientException):
message = "Object not found"
class Unauthorized(RestClientException):
message = 'Unauthorized'
class BadRequest(RestClientException):
message = "Bad request"
class UnprocessableEntity(RestClientException):
message = "Unprocessable entity"
class RateLimitExceeded(RestClientException):
message = "Rate limit exceeded"
class OverLimit(RestClientException):
message = "Quota exceeded"
class ServerFault(RestClientException):
message = "Got server fault"
class NotImplemented(RestClientException):
message = "Got NotImplemented error"
class Conflict(RestClientException):
message = "An object with that identifier already exists"
class ResponseWithNonEmptyBody(RFCViolation):
message = ("RFC Violation! Response with %(status)d HTTP Status Code "
"MUST NOT have a body")