Merge "Revise parse_exception in the client side"

2015-08-04 23:30:27 +00:00
parent 0f5dc297b7 1706db22ce
commit e8eaeb99d5
1 changed files with 9 additions and 5 deletions
--- a/senlinclient/common/exc.py
+++ b/senlinclient/common/exc.py
@@ -231,12 +231,16 @@ def parse_exception(exc):
    :param details: details of the exception.
    '''
    if isinstance(exc, sdkexc.HttpException):
-        record = {
-            'error': {
-                'code': exc.status_code,
-                'message': exc.details,
+        try:
+            record = jsonutils.loads(exc.details)
+        except Exception:
+            # If the exc.details is not in JSON format
+            record = {
+                'error': {
+                    'code': exc.status_code,
+                    'message': exc.details,
+                }
            }
-        }
    elif isinstance(exc, reqexc.RequestException):
        # Exceptions that are not captured by SDK
        code = exc.message[1].errno