Code Review
/
vfc
/
gvnfm
/
vnflcm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
vfclcm upgrade from python2 to python3
[vfc/gvnfm/vnflcm.git]
/
lcm
/
lcm
/
pub
/
utils
/
toscautil.py
diff --git
a/lcm/lcm/pub/utils/toscautil.py
b/lcm/lcm/pub/utils/toscautil.py
index
1d41f79
..
40178d4
100644
(file)
--- a/
lcm/lcm/pub/utils/toscautil.py
+++ b/
lcm/lcm/pub/utils/toscautil.py
@@
-44,7
+44,7
@@
def find_related_node(node_id, src_json_model, requirement_name):
def convert_props(src_node, dest_node):
if 'properties' in src_node and src_node['properties']:
def convert_props(src_node, dest_node):
if 'properties' in src_node and src_node['properties']:
- for prop_name, prop_info in
src_node['properties'].items(
):
+ for prop_name, prop_info in
list(src_node['properties'].items()
):
if 'value' in prop_info:
dest_node['properties'][prop_name] = prop_info['value']
if 'value' in prop_info:
dest_node['properties'][prop_name] = prop_info['value']
@@
-57,7
+57,7
@@
def convert_inputs(src_json):
inputs = {}
if 'inputs' in src_json:
src_inputs = src_json['inputs']
inputs = {}
if 'inputs' in src_json:
src_inputs = src_json['inputs']
- for param_name, param_info in
src_inputs.items(
):
+ for param_name, param_info in
list(src_inputs.items()
):
input_param = {}
if 'type_name' in param_info:
input_param['type'] = param_info['type_name']
input_param = {}
if 'type_name' in param_info:
input_param['type'] = param_info['type_name']
@@
-137,7
+137,7
@@
def convert_router_node(src_node, src_node_list):
router_node['external_ip_addresses'] = []
if 'properties' not in relation:
continue
router_node['external_ip_addresses'] = []
if 'properties' not in relation:
continue
- for prop_name, prop_info in
relation['properties'].items(
):
+ for prop_name, prop_info in
list(relation['properties'].items()
):
if prop_name == 'router_ip_address':
router_node['external_ip_addresses'].append(prop_info['value'])
break
if prop_name == 'router_ip_address':
router_node['external_ip_addresses'].append(prop_info['value'])
break
@@
-235,7
+235,7
@@
def convert_vdu_node(src_node, src_node_list, src_json_model):
for capability in src_node['capabilities']:
if capability['name'] != 'nfv_compute':
continue
for capability in src_node['capabilities']:
if capability['name'] != 'nfv_compute':
continue
- for prop_name, prop_info in
capability['properties'].items(
):
+ for prop_name, prop_info in
list(capability['properties'].items()
):
if 'value' in prop_info:
vdu_node['nfv_compute'][prop_name] = prop_info['value']
if 'value' in prop_info:
vdu_node['nfv_compute'][prop_name] = prop_info['value']
@@
-288,7
+288,7
@@
def convert_vnffgs(src_json_inst, src_nodes):
def convert_common(src_json, target_json):
def convert_common(src_json, target_json):
- if isinstance(src_json,
(unicode, str)
):
+ if isinstance(src_json,
str
):
src_json_dict = json.loads(src_json)
else:
src_json_dict = src_json
src_json_dict = json.loads(src_json)
else:
src_json_dict = src_json
@@
-2676,4
+2676,4
@@
if __name__ == '__main__':
}
}
)
}
}
)
- print
convert_nsd_model(src_json
)
+ print
(convert_nsd_model(src_json)
)