Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bugfix: Convert the string list to list
[releng.git]
/
modules
/
opnfv
/
deployment
/
compass
/
adapter.py
diff --git
a/modules/opnfv/deployment/compass/adapter.py
b/modules/opnfv/deployment/compass/adapter.py
index
856c7fc
..
38aa452
100644
(file)
--- 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
# which accompanies this distribution, and is available at
# http://www.apache.org/licenses/LICENSE-2.0
+import json
import netaddr
import re
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)
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'
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,
roles = [x for x in [manager.Role.CONTROLLER,
manager.Role.COMPUTE,
manager.Role.ODL,