diff options
author | helenyao <yaohelan@huawei.com> | 2017-04-11 10:12:38 +0800 |
---|---|---|
committer | helenyao <yaohelan@huawei.com> | 2017-04-11 14:59:32 +0800 |
commit | 07357814657be19cfb610959f6d1dcc2ce03189d (patch) | |
tree | e0a06a6ef0f8528e680e7564264e31709470acb2 /opnfv/deployment | |
parent | 5731d9dc5838c6b7f499d4469a0034db5942d13b (diff) |
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>
Diffstat (limited to 'opnfv/deployment')
-rw-r--r-- | opnfv/deployment/compass/adapter.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/opnfv/deployment/compass/adapter.py b/opnfv/deployment/compass/adapter.py index 856c7fc..38aa452 100644 --- a/opnfv/deployment/compass/adapter.py +++ b/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, |