Support different format of fuel task info

As described in this bug: https://bugs.launchpad.net/fuel/+bug/1625518
json output of the task can be in different format: single dict or list
of dicts. During tests of https://gerrit.opnfv.org/gerrit/21807 only the
later one was visible, try to support both types of output.

Change-Id: I7d3e12270c8246b03bdc6c73d3be77a039df469f
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
(cherry picked from commit b2a63bfe5746729b4731a14d98c50fb7f59d875e)

diff --git a/deploy/cloud/deployment.py b/deploy/cloud/deployment.py
index 75bd4ef..ecccc24 100644 (file)
--- a/deploy/cloud/deployment.py
+++ b/deploy/cloud/deployment.py
@@ -179,8 +179,13 @@ class Deployment(object):
             out, _ = exec_cmd('fuel2 task show {} -f json'.format(id), False)
             task_info = json.loads(out)
             properties = {}
-            for d in task_info:
-                    properties.update({d['Field']: d['Value']})
+            # for 9.0 this can be list of dicts or dict
+            # see https://bugs.launchpad.net/fuel/+bug/1625518
+            if isinstance(task_info, list):
+                for d in task_info:
+                        properties.update({d['Field']: d['Value']})
+            else:
+                return task_info
             return properties
         except ValueError as e:
             err('Unable to fetch task info: {}'.format(e))