From f50fbcaadfa1577eb4dfeeb577bf77a90d16e5e1 Mon Sep 17 00:00:00 2001
From: helenyao <yaohelan@huawei.com>
Date: Tue, 11 Apr 2017 10:12:38 +0800
Subject: Bugfix: Convert the string list to list
Compass information failed to be printed as the roles were string list
Change-Id: I38037dae099862a040b817b690d451951e0bb23b
Signed-off-by: helenyao <yaohelan@huawei.com>
---
modules/opnfv/deployment/compass/adapter.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/modules/opnfv/deployment/compass/adapter.py b/modules/opnfv/deployment/compass/adapter.py
index 856c7fc38..38aa45227 100644
--- a/modules/opnfv/deployment/compass/adapter.py
+++ b/modules/opnfv/deployment/compass/adapter.py
@@ -7,6 +7,7 @@
# which accompanies this distribution, and is available at
# http://www.apache.org/licenses/LICENSE-2.0
+import json
import netaddr
import re
@@ -161,9 +162,10 @@ class CompassAdapter(manager.DeploymentHandler):
fields = lines[i].strip().encode().rsplit('\t')
host_id = fields[0].strip().encode()
name = 'host{0}'.format(host_id)
- node_roles = fields[1].strip().encode().lower()
+ node_roles_str = fields[1].strip().encode().lower()
+ node_roles_list = json.loads(node_roles_str)
node_roles = [manager.Role.ODL if x == 'odl'
- else x for x in node_roles]
+ else x for x in node_roles_list]
roles = [x for x in [manager.Role.CONTROLLER,
manager.Role.COMPUTE,
manager.Role.ODL,
--
cgit