diff options
Diffstat (limited to 'lcm/lcm/nf/biz')
-rw-r--r-- | lcm/lcm/nf/biz/change_ext_conn.py | 10 | ||||
-rw-r--r-- | lcm/lcm/nf/biz/change_vnf_flavour.py | 8 | ||||
-rw-r--r-- | lcm/lcm/nf/biz/create_subscription.py | 2 | ||||
-rw-r--r-- | lcm/lcm/nf/biz/grant_vnf.py | 2 | ||||
-rw-r--r-- | lcm/lcm/nf/biz/heal_vnf.py | 8 | ||||
-rw-r--r-- | lcm/lcm/nf/biz/instantiate_vnf.py | 10 | ||||
-rw-r--r-- | lcm/lcm/nf/biz/operate_vnf.py | 6 | ||||
-rw-r--r-- | lcm/lcm/nf/biz/query_subscription.py | 4 | ||||
-rw-r--r-- | lcm/lcm/nf/biz/query_vnf_lcm_op_occ.py | 6 | ||||
-rw-r--r-- | lcm/lcm/nf/biz/scale_vnf.py | 10 | ||||
-rw-r--r-- | lcm/lcm/nf/biz/scale_vnf_to_level.py | 4 | ||||
-rw-r--r-- | lcm/lcm/nf/biz/terminate_vnf.py | 12 | ||||
-rw-r--r-- | lcm/lcm/nf/biz/update_vnf.py | 12 |
13 files changed, 48 insertions, 46 deletions
diff --git a/lcm/lcm/nf/biz/change_ext_conn.py b/lcm/lcm/nf/biz/change_ext_conn.py index 1b3f9479..b423a2ec 100644 --- a/lcm/lcm/nf/biz/change_ext_conn.py +++ b/lcm/lcm/nf/biz/change_ext_conn.py @@ -87,12 +87,12 @@ class ChangeExtConn(Thread): operation_state=OPERATION_STATE_TYPE.COMPLETED ) except NFLCMException as e: - logger.error(e.message) - self.change_ext_conn_failed_handle(e.message) + logger.error(e.args[0]) + self.change_ext_conn_failed_handle(e.args[0]) except Exception as e: - logger.error(e.message) + logger.error(e.args[0]) logger.error(traceback.format_exc()) - self.change_ext_conn_failed_handle(e.message) + self.change_ext_conn_failed_handle(e.args[0]) def pre_deal(self): logger.debug("Start pre deal for VNF change_ext_conn task") @@ -232,7 +232,7 @@ class ChangeExtConn(Thread): def query_inst_resource(self, inst_resource): logger.debug('Query resource begin') - for resource_type in RESOURCE_MAP.keys(): + for resource_type in list(RESOURCE_MAP.keys()): resource_table = globals().get(resource_type + 'InstModel') resource_insts = resource_table.objects.filter( instid=self.nf_inst_id diff --git a/lcm/lcm/nf/biz/change_vnf_flavour.py b/lcm/lcm/nf/biz/change_vnf_flavour.py index 69cdf834..4563e301 100644 --- a/lcm/lcm/nf/biz/change_vnf_flavour.py +++ b/lcm/lcm/nf/biz/change_vnf_flavour.py @@ -84,12 +84,12 @@ class ChangeVnfFlavour(Thread): operation_state=OPERATION_STATE_TYPE.COMPLETED ) except NFLCMException as e: - logger.error(e.message) - self.change_vnf_flavour_failed_handle(e.message) + logger.error(e.args[0]) + self.change_vnf_flavour_failed_handle(e.args[0]) except Exception as e: - logger.error(e.message) + logger.error(e.args[0]) logger.error(traceback.format_exc()) - self.change_vnf_flavour_failed_handle(e.message) + self.change_vnf_flavour_failed_handle(e.args[0]) def pre_deal(self): logger.debug("Start pre deal for VNF change_vnf_flavour task") diff --git a/lcm/lcm/nf/biz/create_subscription.py b/lcm/lcm/nf/biz/create_subscription.py index 164bf6c8..fe062729 100644 --- a/lcm/lcm/nf/biz/create_subscription.py +++ b/lcm/lcm/nf/biz/create_subscription.py @@ -40,6 +40,8 @@ class CreateSubscription: def __init__(self, data): self.data = data self.filter = ignore_case_get(self.data, "filter", {}) + logger.debug("self.data:%s" % self.data) + logger.debug("self.filter:%s" % self.filter) self.callback_uri = ignore_case_get(self.data, "callbackUri") self.authentication = ignore_case_get(self.data, "authentication", {}) self.notification_types = ignore_case_get(self.filter, "notificationTypes", []) diff --git a/lcm/lcm/nf/biz/grant_vnf.py b/lcm/lcm/nf/biz/grant_vnf.py index 83d94e50..80ff035c 100644 --- a/lcm/lcm/nf/biz/grant_vnf.py +++ b/lcm/lcm/nf/biz/grant_vnf.py @@ -108,7 +108,7 @@ def grant_resource(data, nf_inst_id, job_id, grant_type, vdus): if vnf.vimInfo and 'vimid' not in addition_paras: vim_info = json.loads(vnf.vimInfo) vimid = "" - for key in vim_info.iterkeys(): + for key in list(vim_info.keys()): vimid = key addition_paras['vimid'] = vimid logger.info('Grant request data=%s' % content_args) diff --git a/lcm/lcm/nf/biz/heal_vnf.py b/lcm/lcm/nf/biz/heal_vnf.py index c768f6b5..c338fe6c 100644 --- a/lcm/lcm/nf/biz/heal_vnf.py +++ b/lcm/lcm/nf/biz/heal_vnf.py @@ -100,12 +100,12 @@ class HealVnf(Thread): operation_state=OPERATION_STATE_TYPE.COMPLETED ) except NFLCMException as e: - logger.error(e.message) - self.vnf_heal_failed_handle(e.message) + logger.error(e.args[0]) + self.vnf_heal_failed_handle(e.args[0]) except Exception as e: - logger.error(e.message) + logger.error(e.args[0]) logger.error(traceback.format_exc()) - self.vnf_heal_failed_handle(e.message) + self.vnf_heal_failed_handle(e.args[0]) def pre_deal(self): logger.debug("Start pre deal for VNF heal_vnf task") diff --git a/lcm/lcm/nf/biz/instantiate_vnf.py b/lcm/lcm/nf/biz/instantiate_vnf.py index 0ecd95e1..57711f75 100644 --- a/lcm/lcm/nf/biz/instantiate_vnf.py +++ b/lcm/lcm/nf/biz/instantiate_vnf.py @@ -83,9 +83,9 @@ class InstantiateVnf(Thread): operation_state=OPERATION_STATE_TYPE.COMPLETED ) except NFLCMException as e: - self.vnf_inst_failed_handle(e.message) + self.vnf_inst_failed_handle(e.args[0]) except Exception as e: - logger.error(e.message) + logger.error(str(e)) logger.error(traceback.format_exc()) self.vnf_inst_failed_handle('unexpected exception') @@ -113,9 +113,9 @@ class InstantiateVnf(Thread): input_parameters = [] inputs = ignore_case_get(self.data, "additionalParams") if inputs: - if isinstance(inputs, (str, unicode)): + if isinstance(inputs, str): inputs = json.loads(inputs) - for key, val in inputs.items(): + for key, val in list(inputs.items()): input_parameters.append({"key": key, "value": val}) vnf_package = query_vnfpackage_by_id(self.vnfd_id) pkg_info = ignore_case_get(vnf_package, "packageInfo") @@ -198,7 +198,7 @@ class InstantiateVnf(Thread): resp = notify_lcm_to_nfvo(json.dumps(notification_content)) logger.info('Lcm notify end, response %s' % resp) except Exception as e: - logger.error("Lcm instantiate notify failed: %s", e.message) + logger.error("Lcm instantiate notify failed: %s", e.args[0]) NotificationsUtil().send_notification(notification_content) def vnf_inst_failed_handle(self, error_msg): diff --git a/lcm/lcm/nf/biz/operate_vnf.py b/lcm/lcm/nf/biz/operate_vnf.py index c0c8540b..17227923 100644 --- a/lcm/lcm/nf/biz/operate_vnf.py +++ b/lcm/lcm/nf/biz/operate_vnf.py @@ -75,11 +75,11 @@ class OperateVnf(Thread): OPERATION_STATE_TYPE.COMPLETED ) except NFLCMException as e: - self.vnf_operate_failed_handle(e.message) + self.vnf_operate_failed_handle(e.args[0]) except Exception as e: - logger.error(e.message) + logger.error(e.args[0]) logger.error(traceback.format_exc()) - self.vnf_operate_failed_handle(e.message) + self.vnf_operate_failed_handle(e.args[0]) def apply_grant(self): vdus = VmInstModel.objects.filter(instid=self.nf_inst_id) diff --git a/lcm/lcm/nf/biz/query_subscription.py b/lcm/lcm/nf/biz/query_subscription.py index aedb467d..f2270d0a 100644 --- a/lcm/lcm/nf/biz/query_subscription.py +++ b/lcm/lcm/nf/biz/query_subscription.py @@ -38,10 +38,10 @@ class QuerySubscription: def query_multi_subscriptions(self): query_data = {} logger.debug("QueryMultiSubscriptions--get--biz::> Check for filters in query params" % self.params) - for query, value in self.params.iteritems(): + for query, value in list(self.params.items()): if query in ROOT_FILTERS: query_data[ROOT_FILTERS[query] + '__icontains'] = value - for query, value in self.params.iteritems(): + for query, value in list(self.params.items()): if query in VNF_INSTANCE_FILTERS: query_data[VNF_INSTANCE_FILTERS[query] + '__icontains'] = value # Query the database with filters if the request has fields in request params, else fetch all records diff --git a/lcm/lcm/nf/biz/query_vnf_lcm_op_occ.py b/lcm/lcm/nf/biz/query_vnf_lcm_op_occ.py index 01d8b8db..b352f5c4 100644 --- a/lcm/lcm/nf/biz/query_vnf_lcm_op_occ.py +++ b/lcm/lcm/nf/biz/query_vnf_lcm_op_occ.py @@ -38,7 +38,7 @@ class QueryVnfLcmOpOcc: def query_multi_vnf_lcm_op_occ(self): query_data = {} logger.debug("QueryMultiVnfLcmOpOccs--get--biz::> Check for filters in query params" % self.params) - for query, value in self.params.iteritems(): + for query, value in list(self.params.items()): if query in FILTERS: query_data[FILTERS[query]] = value # Query the database with filters if the request has fields in request params, else fetch all records @@ -59,9 +59,9 @@ class QueryVnfLcmOpOcc: 'vnfInstanceId': lcm_op.vnf_instance_id, 'grantId': None, 'operation': lcm_op.operation, - 'isAutomaticInvocation': lcm_op.is_automatic_invocation, + 'isAutomaticInvocation': False if lcm_op.is_automatic_invocation == 'False' else True, 'operationParams': json.loads(lcm_op.operation_params), - 'isCancelPending': lcm_op.is_cancel_pending, + 'isCancelPending': False if lcm_op.is_cancel_pending == 'False' else True, 'cancelMode': lcm_op.cancel_mode, 'error': None if not lcm_op.error else json.loads(lcm_op.error), 'resourceChanges': None if not lcm_op.resource_changes else json.loads(lcm_op.resource_changes), diff --git a/lcm/lcm/nf/biz/scale_vnf.py b/lcm/lcm/nf/biz/scale_vnf.py index ad828dd0..2f5b31e8 100644 --- a/lcm/lcm/nf/biz/scale_vnf.py +++ b/lcm/lcm/nf/biz/scale_vnf.py @@ -75,12 +75,12 @@ class ScaleVnf(Thread): self.vnf_insts.update(status=INSTANTIATION_STATE.INSTANTIATED, lastuptime=now_time()) except NFLCMException as e: - logger.error(e.message) - self.vnf_scale_failed_handle(e.message) + logger.error(e.args[0]) + self.vnf_scale_failed_handle(e.args[0]) except Exception as e: - logger.error(e.message) + logger.error(e.args[0]) logger.error(traceback.format_exc()) - self.vnf_scale_failed_handle(e.message) + self.vnf_scale_failed_handle(e.args[0]) def scale_pre(self): self.scale_type = self.data.get("type") @@ -196,7 +196,7 @@ class ScaleVnf(Thread): def do_notify_del_vim_res(self, res_type, res_id): logger.debug('Scaling in [%s] resource, resourceid [%s]', res_type, res_id) - resource_type = RESOURCE_MAP.keys()[RESOURCE_MAP.values().index(res_type)] + resource_type = list(RESOURCE_MAP.keys())[list(RESOURCE_MAP.values()).index(res_type)] resource_table = globals().get(resource_type + 'InstModel') resource_table.objects.filter(instid=self.nf_inst_id, resourceid=res_id).delete() if res_type == "vm": diff --git a/lcm/lcm/nf/biz/scale_vnf_to_level.py b/lcm/lcm/nf/biz/scale_vnf_to_level.py index 0e856ecd..eff83b43 100644 --- a/lcm/lcm/nf/biz/scale_vnf_to_level.py +++ b/lcm/lcm/nf/biz/scale_vnf_to_level.py @@ -86,7 +86,7 @@ class ScaleVnfToLevel(ScaleVnf): if policy.get("type") != "tosca.policies.nfv.InstantiationLevels": continue levels = policy["properties"]["levels"] - for level_id, level_info in levels.items(): + for level_id, level_info in list(levels.items()): scale_aspect = level_info["scale_info"].get(self.aspect_id) scale_level_in_vnfd = scale_aspect["scale_level"] if scale_level_in_request == scale_level_in_vnfd: @@ -99,5 +99,5 @@ class ScaleVnfToLevel(ScaleVnf): continue levels = policy["properties"]["levels"] level_info = levels.get(self.instantiation_level_id) - return level_info.get("scale_info").keys()[0] + return list(level_info.get("scale_info").keys())[0] raise NFLCMException("Failed to get aspect_id in vnfd") diff --git a/lcm/lcm/nf/biz/terminate_vnf.py b/lcm/lcm/nf/biz/terminate_vnf.py index d9faac6e..2b04dc96 100644 --- a/lcm/lcm/nf/biz/terminate_vnf.py +++ b/lcm/lcm/nf/biz/terminate_vnf.py @@ -102,11 +102,11 @@ class TerminateVnf(Thread): "Terminate Vnf success." ) except NFLCMException as e: - self.vnf_term_failed_handle(e.message) + self.vnf_term_failed_handle(e.args[0]) except Exception as e: - logger.error(e.message) + logger.error(e.args[0]) logger.error(traceback.format_exc()) - self.vnf_term_failed_handle(e.message) + self.vnf_term_failed_handle(e.args[0]) def term_pre(self): vnf_insts = NfInstModel.objects.filter(nfinstid=self.nf_inst_id) @@ -123,7 +123,7 @@ class TerminateVnf(Thread): def query_inst_resource(self): logger.info('Query resource begin') - for resource_type in RESOURCE_MAP.keys(): + for resource_type in list(RESOURCE_MAP.keys()): resource_table = globals().get(resource_type + 'InstModel') resource_insts = resource_table.objects.filter(instid=self.nf_inst_id) for resource_inst in resource_insts: @@ -164,7 +164,7 @@ class TerminateVnf(Thread): def do_notify_delete(self, res_type, res_id): logger.debug('Deleting [%s] resource, resourceid [%s]' % (res_type, res_id)) - resource_type = RESOURCE_MAP.keys()[RESOURCE_MAP.values().index(res_type)] + resource_type = list(RESOURCE_MAP.keys())[list(RESOURCE_MAP.values()).index(res_type)] resource_table = globals().get(resource_type + 'InstModel') resource_table.objects.filter(instid=self.nf_inst_id, resourceid=res_id).delete() @@ -179,7 +179,7 @@ class TerminateVnf(Thread): logger.info('Lcm notify end, response: %s' % resp) NotificationsUtil().send_notification(self.notify_data) except Exception as e: - logger.error("Lcm terminate notify failed: %s", e.message) + logger.error("Lcm terminate notify failed: %s", e.args[0]) def vnf_term_failed_handle(self, error_msg): logger.error('VNF termination failed, detail message: %s' % error_msg) diff --git a/lcm/lcm/nf/biz/update_vnf.py b/lcm/lcm/nf/biz/update_vnf.py index 9ae7d663..0dfaa755 100644 --- a/lcm/lcm/nf/biz/update_vnf.py +++ b/lcm/lcm/nf/biz/update_vnf.py @@ -69,14 +69,14 @@ class UpdateVnf(Thread): JobUtil.add_job_status(self.job_id, 100, "Update VNF success.") except NFLCMException as e: - logger.error(e.message) - self.lcm_op_occ.notify_lcm(OPERATION_STATE_TYPE.FAILED, e.message) - JobUtil.add_job_status(self.job_id, 255, e.message) + logger.error(e.args[0]) + self.lcm_op_occ.notify_lcm(OPERATION_STATE_TYPE.FAILED, e.args[0]) + JobUtil.add_job_status(self.job_id, 255, e.args[0]) except Exception as e: - logger.error(e.message) + logger.error(e.args[0]) logger.error(traceback.format_exc()) - self.lcm_op_occ.notify_lcm(OPERATION_STATE_TYPE.FAILED, e.message) - JobUtil.add_job_status(self.job_id, 255, e.message) + self.lcm_op_occ.notify_lcm(OPERATION_STATE_TYPE.FAILED, e.args[0]) + JobUtil.add_job_status(self.job_id, 255, e.args[0]) def send_notification(self): notify_data = prepare_notification(nfinstid=self.nf_inst_id, |