Merge "Cleanup exceptions"
diff --git a/tempest/common/rest_client.py b/tempest/common/rest_client.py
index 636e2bf..8d07545 100644
--- a/tempest/common/rest_client.py
+++ b/tempest/common/rest_client.py
@@ -261,7 +261,8 @@
elif resp.status == 401:
raise exceptions.AuthenticationFailure(user=user,
- password=password)
+ password=password,
+ tenant=project_name)
else:
self.LOG.error("Failed to obtain token using V3 authentication"
" (auth URL is '%s'), the response status is %s" %
diff --git a/tempest/exceptions.py b/tempest/exceptions.py
index 809037d..3b3f3eb 100644
--- a/tempest/exceptions.py
+++ b/tempest/exceptions.py
@@ -123,8 +123,7 @@
class RateLimitExceeded(TempestException):
- message = ("Rate limit exceeded.\nMessage: %(message)s\n"
- "Details: %(details)s")
+ message = "Rate limit exceeded"
class OverLimit(TempestException):
@@ -162,10 +161,6 @@
message = "The server is not reachable via the configured network"
-class SQLException(TempestException):
- message = "SQL error: %(message)s"
-
-
class TearDownException(TempestException):
message = "%(num)d cleanUp operation failed"
diff --git a/tempest/scenario/manager.py b/tempest/scenario/manager.py
index 12d81cc..59a3aeb 100644
--- a/tempest/scenario/manager.py
+++ b/tempest/scenario/manager.py
@@ -397,7 +397,8 @@
if new_status.lower() == error_status.lower():
message = ("%s failed to get to expected status. "
"In %s state.") % (thing, new_status)
- raise exceptions.BuildErrorException(message)
+ raise exceptions.BuildErrorException(message,
+ server_id=thing_id)
elif new_status == expected_status and expected_status is not None:
return True # All good.
LOG.debug("Waiting for %s to get to %s status. "
diff --git a/tempest/services/compute/xml/servers_client.py b/tempest/services/compute/xml/servers_client.py
index 68268a1..c16d4a3 100644
--- a/tempest/services/compute/xml/servers_client.py
+++ b/tempest/services/compute/xml/servers_client.py
@@ -381,7 +381,7 @@
server_status = body['status']
if server_status == 'ERROR' and not ignore_error:
- raise exceptions.BuildErrorException
+ raise exceptions.BuildErrorException(server_id=server_id)
if int(time.time()) - start_time >= self.build_timeout:
raise exceptions.TimeoutException