Merge "Initial add of Swift tests"
diff --git a/tempest/common/rest_client.py b/tempest/common/rest_client.py
index 55baa8a..fbe05e7 100644
--- a/tempest/common/rest_client.py
+++ b/tempest/common/rest_client.py
@@ -244,6 +244,11 @@
elif 'error' in resp_body: # Keystone errors
message = resp_body['error']['message']
raise exceptions.IdentityError(message)
+ elif 'message' in resp_body:
+ message = resp_body['message']
+ else:
+ message = resp_body
+
raise exceptions.ComputeFault(message)
if resp.status >= 400:
diff --git a/tempest/manager.py b/tempest/manager.py
index 6487d0c..ce7cf93 100644
--- a/tempest/manager.py
+++ b/tempest/manager.py
@@ -21,7 +21,10 @@
import glanceclient
import keystoneclient.v2_0.client
import novaclient.client
-import quantumclient.v2_0.client
+try:
+ import quantumclient.v2_0.client
+except ImportError:
+ pass
import tempest.config
from tempest import exceptions