commit 3d7c5c78e0cb2d27bdcdacaf8afb963b9525c58f
author Jenkins <jenkins@review.openstack.org> Wed Oct 10 20:49:22 2012 +0000
committer Gerrit Code Review <review@openstack.org> Wed Oct 10 20:49:22 2012 +0000
tree fec57ad6a419f03be6bd1a367ea7aa90e946758e
parent a4b709c80a467a9aefb271b4f09f8f8c76d204df
parent bff52239502ff9107d4c0e7b2955786dd50dc2bc

Merge "Handle ImportError's when quantumclient is missing"

tempest/common/rest_client.py

diff --git a/tempest/common/rest_client.py b/tempest/common/rest_client.py
index 71f887f..798b561 100644
--- a/tempest/common/rest_client.py
+++ b/tempest/common/rest_client.py
@@ -241,6 +241,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: