diff options
| author |   Bin Yang <bin.yang@windriver.com> | 2019-08-27 03:52:08 +0000 |
|---|---|---|
| committer | Bin Yang <bin.yang@windriver.com> | 2019-08-27 04:50:43 +0000 |
| commit | 7a31c2e438da2d165f473f7428cee7d2164312df (patch) | |
| tree | ace10c3428b58f2d8d2066978964ed80478279d6 /share/common | |
| parent | 4a42f215d7009fc825bbff5b120913f21660ee59 (diff) | |
Fix py3 related issue
Change-Id: I2b21aaab2cbf0df11b9940bf62585294dd1ce576
Issue-ID: MULTICLOUD-774
Signed-off-by: Bin Yang <bin.yang@windriver.com>
Diffstat (limited to 'share/common')
| -rw-r--r-- | share/common/msapi/helper.py | 2 | ||||
| -rw-r--r-- | share/common/utils/toscautil.py | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/share/common/msapi/helper.py b/share/common/msapi/helper.py index fa754aa6..c151d253 100644 --- a/share/common/msapi/helper.py +++ b/share/common/msapi/helper.py @@ -326,7 +326,7 @@ class MultiCloudThreadHelper(object): time.sleep(nexttimer // 1000000) nexttimer = 30*1000000 # initial interval in us to be updated:30 seconds # logger.debug("self.owner.backlog: %s, len: %s" % (self.owner.name, len(self.owner.backlog))) - for backlog_id, item in self.owner.backlog.items(): + for backlog_id, item in list(self.owner.backlog.items()): # logger.debug("evaluate backlog item: %s" % item) # check interval for repeatable backlog item now = MultiCloudThreadHelper.get_epoch_now_usecond() diff --git a/share/common/utils/toscautil.py b/share/common/utils/toscautil.py index 7be71fd8..a4128d7c 100644 --- a/share/common/utils/toscautil.py +++ b/share/common/utils/toscautil.py @@ -41,7 +41,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']: - 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'] @@ -54,7 +54,7 @@ def convert_inputs(src_json): 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'] @@ -126,7 +126,7 @@ def convert_router_node(src_node, src_node_list): 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 @@ -203,7 +203,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 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'] |