From 280acd2dff27d49d7606877edc3f17482f7444f6 Mon Sep 17 00:00:00 2001
From: Tobias Urdin <tobias.urdin@binero.se>
Date: Wed, 18 Nov 2020 11:46:44 +0100
Subject: [PATCH] Fix failing to parse json error msg

It assumes its a requests response but could
be a HTTPResponse from urllib.

Story: 2008789
Task: 42183

Change-Id: I7306d167a17284c7f478ec1c1599a8d4b32040c2
(cherry picked from commit f7551a6bac103070ff456098fe2631409620d492)
---
 magnumclient/common/httpclient.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/magnumclient/common/httpclient.py b/magnumclient/common/httpclient.py
index e4e5a8ad..c6e8b824 100644
--- a/magnumclient/common/httpclient.py
+++ b/magnumclient/common/httpclient.py
@@ -69,6 +69,9 @@ def _extract_error_json(body, resp):
         try:
             body_json = resp.json()
             return _extract_error_json_text(body_json)
+        except AttributeError:
+            body_json = jsonutils.loads(body)
+            return _extract_error_json_text(body_json)
         except ValueError:
             return {}
     else: