From 1e37dbde38983499bbbffa3b0adb68543bef809a Mon Sep 17 00:00:00 2001
From: David Weinholz <david-weinholz@web.de>
Date: Wed, 30 Sep 2020 14:26:32 +0200
Subject: [PATCH] fix(Cluster):get status works agian

---
 .env                                           |  5 ++++-
 .env.in                                        |  4 ++--
 VirtualMachineService/VirtualMachineHandler.py | 10 ++++++++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/.env b/.env
index 3aa80436..5d2c0f90 100644
--- a/.env
+++ b/.env
@@ -1,7 +1,10 @@
-CLOUD_CLIENT_TAG=0.1.0-beta.0.8.17
+CLOUD_CLIENT_TAG=0.1.0-beta.0.13.0
 ELASTIC_USER=elasticboi
 FILEBEAT_TAG=7.1.0
 ELASTIC_URL=https://portal-dev.denbi.de:443
+BIBIGRID_TAG=dev-30-9
+CLIENT_PORT=9090
+
 
 OS_AUTH_URL=https://openstack.cebitec.uni-bielefeld.de:5000/v3/
 OS_PROJECT_ID=3e552e42945c40aab02af3be9bc67a23
diff --git a/.env.in b/.env.in
index 681f62e5..5408b097 100644
--- a/.env.in
+++ b/.env.in
@@ -1,5 +1,5 @@
-CLOUD_CLIENT_TAG=
-BIBIGRID_TAG=
+CLOUD_CLIENT_TAG=0.1.0-beta.0.13.0
+BIBIGRID_TAG=dev-30-9
 CLIENT_PORT=
 FORC_API_KEY=
 ELASTIC_USER=
diff --git a/VirtualMachineService/VirtualMachineHandler.py b/VirtualMachineService/VirtualMachineHandler.py
index ae059044..4c771bdf 100644
--- a/VirtualMachineService/VirtualMachineHandler.py
+++ b/VirtualMachineService/VirtualMachineHandler.py
@@ -1888,8 +1888,14 @@ def get_cluster_status(self, cluster_id):
         response = req.get(
             url=request_url, json=body, headers=headers, verify=self.PRODUCTION
         )
-        LOG.info("Cluster {} status: {} ".format(cluster_id, response.content))
-        return response.json(strict=False)
+        #LOG.info("Cluster {} status: {} ".format(cluster_id, response.content))
+        json_resp=response.json(strict=False)
+        LOG.info(json_resp)
+        json_resp['log']=str(json_resp['log'])
+        json_resp['msg']=str(json_resp['msg'])
+
+
+        return json_resp
 
     def bibigrid_available(self):
         LOG.info("Checking if Bibigrid is available")