diff options
Diffstat (limited to 'lcm/lcm/nf')
64 files changed, 202 insertions, 187 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, diff --git a/lcm/lcm/nf/serializers/_links.py b/lcm/lcm/nf/serializers/_links.py index 71828b09..ba7b7762 100644 --- a/lcm/lcm/nf/serializers/_links.py +++ b/lcm/lcm/nf/serializers/_links.py @@ -14,7 +14,7 @@ from rest_framework import serializers -from link import linkSerializer +from .link import linkSerializer class _LinksSerializer(serializers.Serializer): diff --git a/lcm/lcm/nf/serializers/affected_storages.py b/lcm/lcm/nf/serializers/affected_storages.py index 1c01fefb..a33a05ac 100644 --- a/lcm/lcm/nf/serializers/affected_storages.py +++ b/lcm/lcm/nf/serializers/affected_storages.py @@ -15,7 +15,7 @@ from rest_framework import serializers -from resource_handle import ResourceHandleSerializer +from .resource_handle import ResourceHandleSerializer from lcm.nf.const import CHANGE_TYPE CHANGE_TYPES = [ diff --git a/lcm/lcm/nf/serializers/affected_vls.py b/lcm/lcm/nf/serializers/affected_vls.py index 0b47b27f..7803219e 100644 --- a/lcm/lcm/nf/serializers/affected_vls.py +++ b/lcm/lcm/nf/serializers/affected_vls.py @@ -15,7 +15,7 @@ from rest_framework import serializers -from resource_handle import ResourceHandleSerializer +from .resource_handle import ResourceHandleSerializer from lcm.nf.const import CHANGE_TYPE CHANGE_TYPES = [ diff --git a/lcm/lcm/nf/serializers/affected_vnfcs.py b/lcm/lcm/nf/serializers/affected_vnfcs.py index 10d93473..0e06755e 100644 --- a/lcm/lcm/nf/serializers/affected_vnfcs.py +++ b/lcm/lcm/nf/serializers/affected_vnfcs.py @@ -15,7 +15,7 @@ from rest_framework import serializers -from resource_handle import ResourceHandleSerializer +from .resource_handle import ResourceHandleSerializer from lcm.nf.const import CHANGE_TYPE CHANGE_TYPES = [ diff --git a/lcm/lcm/nf/serializers/cp_protocol_data.py b/lcm/lcm/nf/serializers/cp_protocol_data.py index 495e35f0..1fcfb52b 100644 --- a/lcm/lcm/nf/serializers/cp_protocol_data.py +++ b/lcm/lcm/nf/serializers/cp_protocol_data.py @@ -14,7 +14,7 @@ from rest_framework import serializers -from ip_over_ethernet_address_data import IpOverEthernetAddressDataSerializer +from .ip_over_ethernet_address_data import IpOverEthernetAddressDataSerializer class CpProtocolDataSerializer(serializers.Serializer): diff --git a/lcm/lcm/nf/serializers/ext_cp_info.py b/lcm/lcm/nf/serializers/ext_cp_info.py index 0d427f82..52f513e4 100644 --- a/lcm/lcm/nf/serializers/ext_cp_info.py +++ b/lcm/lcm/nf/serializers/ext_cp_info.py @@ -14,7 +14,7 @@ from rest_framework import serializers -from cp_protocol_info import CpProtocolInfoSerializer +from .cp_protocol_info import CpProtocolInfoSerializer class ExtCpInfoSerializer(serializers.Serializer): diff --git a/lcm/lcm/nf/serializers/ext_link_port_data.py b/lcm/lcm/nf/serializers/ext_link_port_data.py index c6dafdd4..02d0bbc1 100644 --- a/lcm/lcm/nf/serializers/ext_link_port_data.py +++ b/lcm/lcm/nf/serializers/ext_link_port_data.py @@ -14,7 +14,7 @@ from rest_framework import serializers -from resource_handle import ResourceHandleSerializer +from .resource_handle import ResourceHandleSerializer class ExtLinkPortDataSerializer(serializers.Serializer): diff --git a/lcm/lcm/nf/serializers/ext_link_port_info.py b/lcm/lcm/nf/serializers/ext_link_port_info.py index e8821c5d..35fd3680 100644 --- a/lcm/lcm/nf/serializers/ext_link_port_info.py +++ b/lcm/lcm/nf/serializers/ext_link_port_info.py @@ -14,7 +14,7 @@ from rest_framework import serializers -from resource_handle import ResourceHandleSerializer +from .resource_handle import ResourceHandleSerializer class ExtlinkPortInfoSerializer(serializers.Serializer): diff --git a/lcm/lcm/nf/serializers/ext_managed_virtual_link_info.py b/lcm/lcm/nf/serializers/ext_managed_virtual_link_info.py index ae0107fb..b6fe9cf0 100644 --- a/lcm/lcm/nf/serializers/ext_managed_virtual_link_info.py +++ b/lcm/lcm/nf/serializers/ext_managed_virtual_link_info.py @@ -14,8 +14,8 @@ from rest_framework import serializers -from resource_handle import ResourceHandleSerializer -from vnf_link_port_info import VnfLinkPortInfoSerializer +from .resource_handle import ResourceHandleSerializer +from .vnf_link_port_info import VnfLinkPortInfoSerializer class ExtManagedVirtualLinkInfoSerializer(serializers.Serializer): diff --git a/lcm/lcm/nf/serializers/ext_virtual_link_data.py b/lcm/lcm/nf/serializers/ext_virtual_link_data.py index 612e00cb..62beee66 100644 --- a/lcm/lcm/nf/serializers/ext_virtual_link_data.py +++ b/lcm/lcm/nf/serializers/ext_virtual_link_data.py @@ -14,8 +14,8 @@ from rest_framework import serializers -from vnf_ext_cp_data import VnfExtCpDataSerializer -from ext_link_port_data import ExtLinkPortDataSerializer +from .vnf_ext_cp_data import VnfExtCpDataSerializer +from .ext_link_port_data import ExtLinkPortDataSerializer class ExtVirtualLinkDataSerizlizer(serializers.Serializer): diff --git a/lcm/lcm/nf/serializers/ext_virtual_link_info.py b/lcm/lcm/nf/serializers/ext_virtual_link_info.py index 90cc7c7f..3a8bbcf4 100644 --- a/lcm/lcm/nf/serializers/ext_virtual_link_info.py +++ b/lcm/lcm/nf/serializers/ext_virtual_link_info.py @@ -14,8 +14,8 @@ from rest_framework import serializers -from resource_handle import ResourceHandleSerializer -from ext_link_port_info import ExtlinkPortInfoSerializer +from .resource_handle import ResourceHandleSerializer +from .ext_link_port_info import ExtlinkPortInfoSerializer class ExtVirtualLinkInfoSerializer(serializers.Serializer): diff --git a/lcm/lcm/nf/serializers/instantiate_vnf_request.py b/lcm/lcm/nf/serializers/instantiate_vnf_request.py index 9290d84a..72376c49 100644 --- a/lcm/lcm/nf/serializers/instantiate_vnf_request.py +++ b/lcm/lcm/nf/serializers/instantiate_vnf_request.py @@ -14,9 +14,9 @@ from rest_framework import serializers -from ext_virtual_link_data import ExtVirtualLinkDataSerizlizer -from ext_managed_virtual_link_data import ExtManagedVirtualLinkDataSerizlizer -from vim_connection_info import VimConnectionInfoSerializer +from .ext_virtual_link_data import ExtVirtualLinkDataSerizlizer +from .ext_managed_virtual_link_data import ExtManagedVirtualLinkDataSerizlizer +from .vim_connection_info import VimConnectionInfoSerializer class InstantiateVnfRequestSerializer(serializers.Serializer): diff --git a/lcm/lcm/nf/serializers/instantiated_vnf_info.py b/lcm/lcm/nf/serializers/instantiated_vnf_info.py index cd6c93ec..86af9052 100644 --- a/lcm/lcm/nf/serializers/instantiated_vnf_info.py +++ b/lcm/lcm/nf/serializers/instantiated_vnf_info.py @@ -14,13 +14,13 @@ from rest_framework import serializers -from scale_info import ScaleInfoSerializer -from ext_cp_info import ExtCpInfoSerializer -from ext_virtual_link_info import ExtVirtualLinkInfoSerializer -from ext_managed_virtual_link_info import ExtManagedVirtualLinkInfoSerializer -from vnfc_resource_info import VnfcResourceInfoSerializer -from vnf_virtual_link_resource_info import VnfVirtualLinkResourceInfoSerializer -from virtual_storage_resource_info import VirtualStorageResourceInfoSerializer +from .scale_info import ScaleInfoSerializer +from .ext_cp_info import ExtCpInfoSerializer +from .ext_virtual_link_info import ExtVirtualLinkInfoSerializer +from .ext_managed_virtual_link_info import ExtManagedVirtualLinkInfoSerializer +from .vnfc_resource_info import VnfcResourceInfoSerializer +from .vnf_virtual_link_resource_info import VnfVirtualLinkResourceInfoSerializer +from .virtual_storage_resource_info import VirtualStorageResourceInfoSerializer class InstantiatedVnfInfoSerializer(serializers.Serializer): diff --git a/lcm/lcm/nf/serializers/ip_addresse.py b/lcm/lcm/nf/serializers/ip_addresse.py index f273c423..f266a459 100644 --- a/lcm/lcm/nf/serializers/ip_addresse.py +++ b/lcm/lcm/nf/serializers/ip_addresse.py @@ -10,7 +10,7 @@ # limitations under the License. from rest_framework import serializers -from address_range import AddressRangeSerializer +from .address_range import AddressRangeSerializer class IpAddresseSerializer(serializers.Serializer): diff --git a/lcm/lcm/nf/serializers/ip_over_ethernet_address_data.py b/lcm/lcm/nf/serializers/ip_over_ethernet_address_data.py index 562d5fb9..826082de 100644 --- a/lcm/lcm/nf/serializers/ip_over_ethernet_address_data.py +++ b/lcm/lcm/nf/serializers/ip_over_ethernet_address_data.py @@ -13,7 +13,7 @@ # limitations under the License. from rest_framework import serializers -from ip_addresse import IpAddresseSerializer +from .ip_addresse import IpAddresseSerializer class IpOverEthernetAddressDataSerializer(serializers.Serializer): diff --git a/lcm/lcm/nf/serializers/lccn_filter_data.py b/lcm/lcm/nf/serializers/lccn_filter_data.py index b016a4f0..30e0d9ab 100644 --- a/lcm/lcm/nf/serializers/lccn_filter_data.py +++ b/lcm/lcm/nf/serializers/lccn_filter_data.py @@ -14,7 +14,7 @@ from rest_framework import serializers -from vnf_instance_subscription_filter import VnfInstanceSubscriptionFilter +from .vnf_instance_subscription_filter import VnfInstanceSubscriptionFilter from lcm.nf.const import NOTIFICATION_TYPES, LCM_OPERATION_TYPES, LCM_OPERATION_STATE_TYPES diff --git a/lcm/lcm/nf/serializers/lccn_subscription.py b/lcm/lcm/nf/serializers/lccn_subscription.py index e29c6d10..a92d0394 100644 --- a/lcm/lcm/nf/serializers/lccn_subscription.py +++ b/lcm/lcm/nf/serializers/lccn_subscription.py @@ -14,8 +14,8 @@ from rest_framework import serializers -from link import linkSerializer -from lccn_filter_data import LifeCycleChangeNotificationsFilter +from .link import linkSerializer +from .lccn_filter_data import LifeCycleChangeNotificationsFilter class LinkSerializer(serializers.Serializer): diff --git a/lcm/lcm/nf/serializers/lccn_subscription_request.py b/lcm/lcm/nf/serializers/lccn_subscription_request.py index 445845ae..d8b14957 100644 --- a/lcm/lcm/nf/serializers/lccn_subscription_request.py +++ b/lcm/lcm/nf/serializers/lccn_subscription_request.py @@ -14,8 +14,8 @@ from rest_framework import serializers -from lccn_filter_data import LifeCycleChangeNotificationsFilter -from subscription_auth_data import SubscriptionAuthenticationSerializer +from .lccn_filter_data import LifeCycleChangeNotificationsFilter +from .subscription_auth_data import SubscriptionAuthenticationSerializer class LccnSubscriptionRequestSerializer(serializers.Serializer): diff --git a/lcm/lcm/nf/serializers/lccn_subscriptions.py b/lcm/lcm/nf/serializers/lccn_subscriptions.py index c4f70f66..5161a4f0 100644 --- a/lcm/lcm/nf/serializers/lccn_subscriptions.py +++ b/lcm/lcm/nf/serializers/lccn_subscriptions.py @@ -14,7 +14,7 @@ from rest_framework import serializers -from lccn_subscription import LccnSubscriptionSerializer +from .lccn_subscription import LccnSubscriptionSerializer class LccnSubscriptionsSerializer(serializers.ListSerializer): diff --git a/lcm/lcm/nf/serializers/notification_types.py b/lcm/lcm/nf/serializers/notification_types.py index d6755881..c87b76dd 100644 --- a/lcm/lcm/nf/serializers/notification_types.py +++ b/lcm/lcm/nf/serializers/notification_types.py @@ -14,14 +14,14 @@ from rest_framework import serializers -from affected_vnfcs import AffectedVnfcsSerializer -from affected_vls import AffectedVLsSerializer -from affected_storages import AffectedStoragesSerializer +from .affected_vnfcs import AffectedVnfcsSerializer +from .affected_vls import AffectedVLsSerializer +from .affected_storages import AffectedStoragesSerializer from lcm.nf.const import LCM_OPERATION_TYPES, LCM_OPERATION_STATE_TYPES -from link import linkSerializer -from response import ProblemDetailsSerializer -from ext_virtual_link_info import ExtVirtualLinkInfoSerializer -from vnf_info_modifications import VnfInfoModificationsSerializer +from .link import linkSerializer +from .response import ProblemDetailsSerializer +from .ext_virtual_link_info import ExtVirtualLinkInfoSerializer +from .vnf_info_modifications import VnfInfoModificationsSerializer class LccnLinksSerializer(serializers.Serializer): diff --git a/lcm/lcm/nf/serializers/virtual_storage_resource_info.py b/lcm/lcm/nf/serializers/virtual_storage_resource_info.py index 8ec23a37..5f5de12f 100644 --- a/lcm/lcm/nf/serializers/virtual_storage_resource_info.py +++ b/lcm/lcm/nf/serializers/virtual_storage_resource_info.py @@ -14,7 +14,7 @@ from rest_framework import serializers -from resource_handle import ResourceHandleSerializer +from .resource_handle import ResourceHandleSerializer class VirtualStorageResourceInfoSerializer(serializers.Serializer): diff --git a/lcm/lcm/nf/serializers/vnf_ext_cp_config.py b/lcm/lcm/nf/serializers/vnf_ext_cp_config.py index b9fedf0a..73336eaf 100644 --- a/lcm/lcm/nf/serializers/vnf_ext_cp_config.py +++ b/lcm/lcm/nf/serializers/vnf_ext_cp_config.py @@ -14,7 +14,7 @@ from rest_framework import serializers -from cp_protocol_data import CpProtocolDataSerializer +from .cp_protocol_data import CpProtocolDataSerializer class VnfExtCpConfigSerializer(serializers.Serializer): diff --git a/lcm/lcm/nf/serializers/vnf_ext_cp_data.py b/lcm/lcm/nf/serializers/vnf_ext_cp_data.py index 987569c9..9e6be889 100644 --- a/lcm/lcm/nf/serializers/vnf_ext_cp_data.py +++ b/lcm/lcm/nf/serializers/vnf_ext_cp_data.py @@ -14,7 +14,7 @@ from rest_framework import serializers -from vnf_ext_cp_config import VnfExtCpConfigSerializer +from .vnf_ext_cp_config import VnfExtCpConfigSerializer class VnfExtCpDataSerializer(serializers.Serializer): diff --git a/lcm/lcm/nf/serializers/vnf_info_modifications.py b/lcm/lcm/nf/serializers/vnf_info_modifications.py index 8098a6ca..8d82635c 100644 --- a/lcm/lcm/nf/serializers/vnf_info_modifications.py +++ b/lcm/lcm/nf/serializers/vnf_info_modifications.py @@ -15,7 +15,7 @@ from rest_framework import serializers -from vim_connection_info import VimConnectionInfoSerializer +from .vim_connection_info import VimConnectionInfoSerializer class VnfInfoModificationsSerializer(serializers.Serializer): diff --git a/lcm/lcm/nf/serializers/vnf_instance.py b/lcm/lcm/nf/serializers/vnf_instance.py index 2521e8ee..020ddf7b 100644 --- a/lcm/lcm/nf/serializers/vnf_instance.py +++ b/lcm/lcm/nf/serializers/vnf_instance.py @@ -15,9 +15,9 @@ from rest_framework import serializers -from vim_connection_info import VimConnectionInfoSerializer -from instantiated_vnf_info import InstantiatedVnfInfoSerializer -from _links import _LinksSerializer +from .vim_connection_info import VimConnectionInfoSerializer +from .instantiated_vnf_info import InstantiatedVnfInfoSerializer +from ._links import _LinksSerializer class VnfInstanceSerializer(serializers.Serializer): diff --git a/lcm/lcm/nf/serializers/vnf_instances.py b/lcm/lcm/nf/serializers/vnf_instances.py index f3132904..d9530fe5 100644 --- a/lcm/lcm/nf/serializers/vnf_instances.py +++ b/lcm/lcm/nf/serializers/vnf_instances.py @@ -10,7 +10,7 @@ # limitations under the License. from rest_framework import serializers -from vnf_instance import VnfInstanceSerializer +from .vnf_instance import VnfInstanceSerializer class VnfInstancesSerializer(serializers.ListSerializer): diff --git a/lcm/lcm/nf/serializers/vnf_lcm_op_occ.py b/lcm/lcm/nf/serializers/vnf_lcm_op_occ.py index 267f5f8d..45e2f514 100644 --- a/lcm/lcm/nf/serializers/vnf_lcm_op_occ.py +++ b/lcm/lcm/nf/serializers/vnf_lcm_op_occ.py @@ -15,13 +15,13 @@ from rest_framework import serializers -from affected_vnfcs import AffectedVnfcsSerializer -from affected_vls import AffectedVLsSerializer -from affected_storages import AffectedStoragesSerializer -from link import linkSerializer -from response import ProblemDetailsSerializer -from ext_virtual_link_info import ExtVirtualLinkInfoSerializer -from vnf_info_modifications import VnfInfoModificationsSerializer +from .affected_vnfcs import AffectedVnfcsSerializer +from .affected_vls import AffectedVLsSerializer +from .affected_storages import AffectedStoragesSerializer +from .link import linkSerializer +from .response import ProblemDetailsSerializer +from .ext_virtual_link_info import ExtVirtualLinkInfoSerializer +from .vnf_info_modifications import VnfInfoModificationsSerializer LCM_OPERATION_TYPES = [ diff --git a/lcm/lcm/nf/serializers/vnf_lcm_op_occs.py b/lcm/lcm/nf/serializers/vnf_lcm_op_occs.py index 6cb70906..1baa0975 100644 --- a/lcm/lcm/nf/serializers/vnf_lcm_op_occs.py +++ b/lcm/lcm/nf/serializers/vnf_lcm_op_occs.py @@ -13,7 +13,7 @@ # limitations under the License. from rest_framework import serializers -from vnf_lcm_op_occ import VNFLCMOpOccSerializer +from .vnf_lcm_op_occ import VNFLCMOpOccSerializer class VNFLCMOpOccsSerializer(serializers.ListSerializer): diff --git a/lcm/lcm/nf/serializers/vnf_link_port_info.py b/lcm/lcm/nf/serializers/vnf_link_port_info.py index 06201aef..331175ba 100644 --- a/lcm/lcm/nf/serializers/vnf_link_port_info.py +++ b/lcm/lcm/nf/serializers/vnf_link_port_info.py @@ -14,7 +14,7 @@ from rest_framework import serializers -from resource_handle import ResourceHandleSerializer +from .resource_handle import ResourceHandleSerializer class VnfLinkPortInfoSerializer(serializers.Serializer): diff --git a/lcm/lcm/nf/serializers/vnf_virtual_link_resource_info.py b/lcm/lcm/nf/serializers/vnf_virtual_link_resource_info.py index e5c9d4c4..c5e3675f 100644 --- a/lcm/lcm/nf/serializers/vnf_virtual_link_resource_info.py +++ b/lcm/lcm/nf/serializers/vnf_virtual_link_resource_info.py @@ -13,8 +13,8 @@ # limitations under the License. from rest_framework import serializers -from resource_handle import ResourceHandleSerializer -from vnf_link_port_info import VnfLinkPortInfoSerializer +from .resource_handle import ResourceHandleSerializer +from .vnf_link_port_info import VnfLinkPortInfoSerializer class VnfVirtualLinkResourceInfoSerializer(serializers.Serializer): diff --git a/lcm/lcm/nf/serializers/vnfc_cp_info.py b/lcm/lcm/nf/serializers/vnfc_cp_info.py index 693aba16..5e8e9f56 100644 --- a/lcm/lcm/nf/serializers/vnfc_cp_info.py +++ b/lcm/lcm/nf/serializers/vnfc_cp_info.py @@ -1,7 +1,7 @@ from rest_framework import serializers -from cp_protocol_info import CpProtocolInfoSerializer +from .cp_protocol_info import CpProtocolInfoSerializer class VnfcCpInfoSerializer(serializers.Serializer): diff --git a/lcm/lcm/nf/serializers/vnfc_resource_info.py b/lcm/lcm/nf/serializers/vnfc_resource_info.py index 3ad0c6f5..4a8e493f 100644 --- a/lcm/lcm/nf/serializers/vnfc_resource_info.py +++ b/lcm/lcm/nf/serializers/vnfc_resource_info.py @@ -14,8 +14,8 @@ from rest_framework import serializers -from resource_handle import ResourceHandleSerializer -from vnfc_cp_info import VnfcCpInfoSerializer +from .resource_handle import ResourceHandleSerializer +from .vnfc_cp_info import VnfcCpInfoSerializer class VnfcResourceInfoSerializer(serializers.Serializer): diff --git a/lcm/lcm/nf/tests/const.py b/lcm/lcm/nf/tests/const.py index 46b608b3..7debe6bc 100644 --- a/lcm/lcm/nf/tests/const.py +++ b/lcm/lcm/nf/tests/const.py @@ -125,17 +125,17 @@ inst_req_data = { vnfd_model_dict = { 'metadata': { - 'vendor': u'zte', + 'vendor': 'zte', 'is_shared': False, 'description': '', - 'domain_type': u'CN', - 'version': u'v4.14.10', + 'domain_type': 'CN', + 'version': 'v4.14.10', 'vmnumber_overquota_alarm': False, 'cross_dc': False, - 'vnf_type': u'SSS', - 'vnfd_version': u'V00000001', - 'id': u'sss-vnf-template', - 'name': u'sss-vnf-template' + 'vnf_type': 'SSS', + 'vnfd_version': 'V00000001', + 'id': 'sss-vnf-template', + 'name': 'sss-vnf-template' }, 'vdus': [ { @@ -182,7 +182,7 @@ vnfd_model_dict = { "inner_hugepage_size": "2048", "action": "add" }, - "image_file": u'sss', + "image_file": 'sss', "local_storages": [ "local_storage_id1", "local_storage_id2" @@ -304,7 +304,7 @@ vnfd_model_dict = { 'targets': { }, - 'policy_id': u'policy_scale_sss-vnf-template', + 'policy_id': 'policy_scale_sss-vnf-template', 'properties': { 'policy_file': '*-vnfd.zip/*-vnf-policy.xml' }, @@ -315,28 +315,28 @@ vnfd_model_dict = { { 'description': '', 'properties': { - 'name': u'opencos_sss_omm_img_release_20150723-1-disk1.vmdk', + 'name': 'opencos_sss_omm_img_release_20150723-1-disk1.vmdk', 'checksum': '', - 'disk_format': u'VMDK', - 'file_url': u'./zte-cn-sss-main-image/OMM/opencos_sss_omm_img_release_20150723-1-disk1.vmdk', + 'disk_format': 'VMDK', + 'file_url': './zte-cn-sss-main-image/OMM/opencos_sss_omm_img_release_20150723-1-disk1.vmdk', 'container_type': 'vm', 'version': '', 'hypervisor_type': 'kvm' }, - 'image_file_id': u'opencos_sss_omm_img_release_20150723-1-disk1' + 'image_file_id': 'opencos_sss_omm_img_release_20150723-1-disk1' }, { 'description': '', 'properties': { - 'name': u'sss.vmdk', + 'name': 'sss.vmdk', 'checksum': '', - 'disk_format': u'VMDK', - 'file_url': u'./zte-cn-sss-main-image/NE/sss.vmdk', + 'disk_format': 'VMDK', + 'file_url': './zte-cn-sss-main-image/NE/sss.vmdk', 'container_type': 'vm', 'version': '', 'hypervisor_type': 'kvm' }, - 'image_file_id': u'sss' + 'image_file_id': 'sss' } ], 'vls': [ @@ -567,7 +567,7 @@ c8_data_list_image = { "status": "active", "id": "5e2757c1-f846-4727-915c-9a872553ed75", "size": 862016, - "name": u'sss.vmdk' + "name": 'sss.vmdk' } ] } diff --git a/lcm/lcm/nf/tests/test_change_ext_conn.py b/lcm/lcm/nf/tests/test_change_ext_conn.py index 7efb416f..2fafc24c 100644 --- a/lcm/lcm/nf/tests/test_change_ext_conn.py +++ b/lcm/lcm/nf/tests/test_change_ext_conn.py @@ -90,21 +90,21 @@ class TestChangeExtConn(TestCase): response = self.client.post(url, data=self.req_data, format='json') - self.failUnlessEqual(status.HTTP_404_NOT_FOUND, response.status_code) + self.assertEqual(status.HTTP_404_NOT_FOUND, response.status_code) def test_change_ext_conn_conflict(self): url = "/api/vnflcm/v1/vnf_instances/12345/change_ext_conn" response = self.client.post(url, data=self.req_data, format='json') - self.failUnlessEqual(status.HTTP_409_CONFLICT, response.status_code) + self.assertEqual(status.HTTP_409_CONFLICT, response.status_code) def test_change_ext_conn_badreq(self): url = "/api/vnflcm/v1/vnf_instances/123/change_ext_conn" response = self.client.post(url, data={}, format='json') - self.failUnlessEqual(status.HTTP_400_BAD_REQUEST, response.status_code) + self.assertEqual(status.HTTP_400_BAD_REQUEST, response.status_code) @mock.patch.object(JobUtil, 'create_job') def test_change_ext_conn_inner_error(self, mock_run): diff --git a/lcm/lcm/nf/tests/test_change_flavour.py b/lcm/lcm/nf/tests/test_change_flavour.py index 15b53f02..442fd8d5 100644 --- a/lcm/lcm/nf/tests/test_change_flavour.py +++ b/lcm/lcm/nf/tests/test_change_flavour.py @@ -54,18 +54,18 @@ class TestFlavour(TestCase): response = self.client.post(url, data=self.req_data, format='json') - self.failUnlessEqual(status.HTTP_404_NOT_FOUND, response.status_code) + self.assertEqual(status.HTTP_404_NOT_FOUND, response.status_code) def test_change_flavour_conflict(self): url = "/api/vnflcm/v1/vnf_instances/12345/change_flavour" response = self.client.post(url, data=self.req_data, format='json') - self.failUnlessEqual(status.HTTP_409_CONFLICT, response.status_code) + self.assertEqual(status.HTTP_409_CONFLICT, response.status_code) def test_change_flavour_badreq(self): url = "/api/vnflcm/v1/vnf_instances/345/change_flavour" response = self.client.post(url, data={}, format='json') - self.failUnlessEqual(status.HTTP_400_BAD_REQUEST, response.status_code) + self.assertEqual(status.HTTP_400_BAD_REQUEST, response.status_code) diff --git a/lcm/lcm/nf/tests/test_create_vnf.py b/lcm/lcm/nf/tests/test_create_vnf.py index 77655346..39640b57 100644 --- a/lcm/lcm/nf/tests/test_create_vnf.py +++ b/lcm/lcm/nf/tests/test_create_vnf.py @@ -71,7 +71,7 @@ class TestNFInstantiate(TestCase): data=data, format='json' ) - self.failUnlessEqual( + self.assertEqual( status.HTTP_500_INTERNAL_SERVER_ERROR, response.status_code ) @@ -108,4 +108,5 @@ class TestNFInstantiate(TestCase): "vnfPkgId": "111", "instantiationState": "NOT_INSTANTIATED" } + self.assertEqual(status.HTTP_201_CREATED, response.status_code) self.assertEqual(expect_data, response.data) diff --git a/lcm/lcm/nf/tests/test_delete_vnf.py b/lcm/lcm/nf/tests/test_delete_vnf.py index 4253ed12..61d173eb 100644 --- a/lcm/lcm/nf/tests/test_delete_vnf.py +++ b/lcm/lcm/nf/tests/test_delete_vnf.py @@ -127,9 +127,9 @@ class TestNFTerminate(TestCase): create_time=now_time() ) response = self.client.delete("/api/vnflcm/v1/vnf_instances/1111") - self.failUnlessEqual(status.HTTP_204_NO_CONTENT, response.status_code) + self.assertEqual(status.HTTP_204_NO_CONTENT, response.status_code) self.assertEqual(None, response.data) def test_delete_vnf_identifier_when_vnf_not_exist(self): response = self.client.delete("/api/vnflcm/v1/vnf_instances/1111") - self.failUnlessEqual(status.HTTP_204_NO_CONTENT, response.status_code) + self.assertEqual(status.HTTP_204_NO_CONTENT, response.status_code) diff --git a/lcm/lcm/nf/tests/test_heal_vnf.py b/lcm/lcm/nf/tests/test_heal_vnf.py index d5c70da0..1bdcd9fc 100644 --- a/lcm/lcm/nf/tests/test_heal_vnf.py +++ b/lcm/lcm/nf/tests/test_heal_vnf.py @@ -52,7 +52,7 @@ class TestNFInstantiate(TestCase): def test_heal_vnf_not_found(self):
req_data = {}
response = self.client.post("/api/vnflcm/v1/vnf_instances/12/heal", data=req_data, format='json')
- self.failUnlessEqual(status.HTTP_404_NOT_FOUND, response.status_code)
+ self.assertEqual(status.HTTP_404_NOT_FOUND, response.status_code)
def test_heal_vnf_conflict(self):
req_data = {}
@@ -61,7 +61,7 @@ class TestNFInstantiate(TestCase): nf_name='VNF1',
status='NOT_INSTANTIATED').save()
response = self.client.post("/api/vnflcm/v1/vnf_instances/1267/heal", data=req_data, format='json')
- self.failUnlessEqual(status.HTTP_409_CONFLICT, response.status_code)
+ self.assertEqual(status.HTTP_409_CONFLICT, response.status_code)
NfInstModel.objects.filter(nfinstid='1267').delete()
def test_heal_vnf_badreq(self):
@@ -80,7 +80,7 @@ class TestNFInstantiate(TestCase): data={"additionalParams": "1"},
format='json')
NfInstModel.objects.filter(nfinstid='345').delete()
- self.failUnlessEqual(status.HTTP_400_BAD_REQUEST, response.status_code)
+ self.assertEqual(status.HTTP_400_BAD_REQUEST, response.status_code)
@mock.patch.object(HealVnf, 'run')
def test_heal_vnf_success(self, mock_run):
@@ -97,7 +97,7 @@ class TestNFInstantiate(TestCase): status='INSTANTIATED').save()
response = self.client.post("/api/vnflcm/v1/vnf_instances/12/heal", data=req_data, format='json')
mock_run.re.return_value = None
- self.failUnlessEqual(status.HTTP_202_ACCEPTED, response.status_code)
+ self.assertEqual(status.HTTP_202_ACCEPTED, response.status_code)
NfInstModel(nfinstid='12').delete()
@mock.patch.object(restcall, 'call_req')
diff --git a/lcm/lcm/nf/tests/test_instantiate_vnf.py b/lcm/lcm/nf/tests/test_instantiate_vnf.py index c624e05c..16351f98 100644 --- a/lcm/lcm/nf/tests/test_instantiate_vnf.py +++ b/lcm/lcm/nf/tests/test_instantiate_vnf.py @@ -76,7 +76,7 @@ class TestNFInstantiate(TestCase): data=inst_req_data,
format='json'
)
- self.failUnlessEqual(
+ self.assertEqual(
status.HTTP_202_ACCEPTED,
response.status_code
)
@@ -89,7 +89,7 @@ class TestNFInstantiate(TestCase): data=inst_req_data,
format='json'
)
- self.failUnlessEqual(
+ self.assertEqual(
status.HTTP_404_NOT_FOUND,
response.status_code,
response.content
@@ -108,7 +108,7 @@ class TestNFInstantiate(TestCase): data=inst_req_data,
format='json'
)
- self.failUnlessEqual(
+ self.assertEqual(
status.HTTP_409_CONFLICT,
response.status_code,
response.content
diff --git a/lcm/lcm/nf/tests/test_operate_vnf.py b/lcm/lcm/nf/tests/test_operate_vnf.py index cffcf37d..17408c2e 100644 --- a/lcm/lcm/nf/tests/test_operate_vnf.py +++ b/lcm/lcm/nf/tests/test_operate_vnf.py @@ -55,7 +55,7 @@ class TestNFOperate(TestCase): data=req_data,
format='json'
)
- self.failUnlessEqual(status.HTTP_404_NOT_FOUND, response.status_code)
+ self.assertEqual(status.HTTP_404_NOT_FOUND, response.status_code)
def test_operate_vnf_conflict(self):
req_data = {
@@ -71,7 +71,7 @@ class TestNFOperate(TestCase): data=req_data,
format='json'
)
- self.failUnlessEqual(status.HTTP_409_CONFLICT, response.status_code)
+ self.assertEqual(status.HTTP_409_CONFLICT, response.status_code)
NfInstModel(
nfinstid='12',
nf_name='VNF1',
@@ -98,7 +98,7 @@ class TestNFOperate(TestCase): format='json'
)
NfInstModel.objects.filter(nfinstid='345').delete()
- self.failUnlessEqual(
+ self.assertEqual(
status.HTTP_400_BAD_REQUEST,
response.status_code
)
@@ -119,7 +119,7 @@ class TestNFOperate(TestCase): format='json'
)
mock_run.re.return_value = None
- self.failUnlessEqual(status.HTTP_202_ACCEPTED, response.status_code)
+ self.assertEqual(status.HTTP_202_ACCEPTED, response.status_code)
NfInstModel(
nfinstid='12',
nf_name='VNF1',
diff --git a/lcm/lcm/nf/tests/test_query_vnf.py b/lcm/lcm/nf/tests/test_query_vnf.py index e041216c..5d133de3 100644 --- a/lcm/lcm/nf/tests/test_query_vnf.py +++ b/lcm/lcm/nf/tests/test_query_vnf.py @@ -228,7 +228,7 @@ class ResourceTest(TestCase): insttype=1, instid='%s' % i).save() response = self.client.get("/api/vnflcm/v1/vnf_instances", format='json') - self.failUnlessEqual(status.HTTP_200_OK, response.status_code) + self.assertEqual(status.HTTP_200_OK, response.status_code) self.assertEqual(self.test_data_multi_vnf, response.data) def test_get_vnfs_not_exist(self): diff --git a/lcm/lcm/nf/tests/test_query_vnf_lcm_op.py b/lcm/lcm/nf/tests/test_query_vnf_lcm_op.py index 1711ddca..c69859a4 100644 --- a/lcm/lcm/nf/tests/test_query_vnf_lcm_op.py +++ b/lcm/lcm/nf/tests/test_query_vnf_lcm_op.py @@ -33,6 +33,7 @@ class TestVNFLcmOpOccs(TestCase): self.test_vnflcmop_with_exclude_default = vnflcmop_with_exclude_default self.test_multiple_vnf_lcm_op = copy.copy(multiple_vnf_lcm_op) self.test_multiple_vnf_lcm_op.append(self.test_single_vnf_lcm_op) + self.maxdiff = None def tearDown(self): pass @@ -69,6 +70,7 @@ class TestVNFLcmOpOccs(TestCase): response.status_code, status.HTTP_200_OK ) + self.maxDiff = None self.assertEqual( [self.test_single_vnf_lcm_op], response.data @@ -147,9 +149,9 @@ class TestVNFLcmOpOccs(TestCase): response.status_code, status.HTTP_200_OK ) + self.maxDiff = None self.assertEqual( self.test_multiple_vnf_lcm_op, - response.data, response.data ) @@ -211,6 +213,7 @@ class TestVNFLcmOpOccs(TestCase): response.status_code, status.HTTP_200_OK ) + self.maxDiff = None self.assertEqual( self.test_vnflcmop_with_exclude_default, response.data @@ -248,6 +251,7 @@ class TestVNFLcmOpOccs(TestCase): response.status_code, status.HTTP_200_OK ) + self.maxDiff = None self.assertEqual( self.test_single_vnf_lcm_op, response.data diff --git a/lcm/lcm/nf/tests/test_scale_vnf.py b/lcm/lcm/nf/tests/test_scale_vnf.py index a43c475c..bb470fa8 100644 --- a/lcm/lcm/nf/tests/test_scale_vnf.py +++ b/lcm/lcm/nf/tests/test_scale_vnf.py @@ -44,14 +44,14 @@ class TestNfScale(TestCase): response = self.client.post(url, data=self.req_data, format='json') - self.failUnlessEqual(status.HTTP_404_NOT_FOUND, response.status_code) + self.assertEqual(status.HTTP_404_NOT_FOUND, response.status_code) def test_scale_vnf_conflict(self): url = "/api/vnflcm/v1/vnf_instances/12345/scale" response = self.client.post(url, data=self.req_data, format='json') - self.failUnlessEqual(status.HTTP_409_CONFLICT, response.status_code) + self.assertEqual(status.HTTP_409_CONFLICT, response.status_code) def test_scale_vnf_badreq(self): NfInstModel(nfinstid='678', @@ -69,4 +69,4 @@ class TestNfScale(TestCase): data={}, format='json') NfInstModel.objects.filter(nfinstid='678').delete() - self.failUnlessEqual(status.HTTP_400_BAD_REQUEST, response.status_code) + self.assertEqual(status.HTTP_400_BAD_REQUEST, response.status_code) diff --git a/lcm/lcm/nf/tests/test_scale_vnf_to_level.py b/lcm/lcm/nf/tests/test_scale_vnf_to_level.py index 7c7b98d8..0c06694a 100644 --- a/lcm/lcm/nf/tests/test_scale_vnf_to_level.py +++ b/lcm/lcm/nf/tests/test_scale_vnf_to_level.py @@ -44,14 +44,14 @@ class TestNfScaleToLevel(TestCase): response = self.client.post(url, data=self.req_data, format='json') - self.failUnlessEqual(status.HTTP_404_NOT_FOUND, response.status_code) + self.assertEqual(status.HTTP_404_NOT_FOUND, response.status_code) def test_scale_vnf_conflict(self): url = "/api/vnflcm/v1/vnf_instances/98765/scale_to_level" response = self.client.post(url, data=self.req_data, format='json') - self.failUnlessEqual(status.HTTP_409_CONFLICT, response.status_code) + self.assertEqual(status.HTTP_409_CONFLICT, response.status_code) def test_scale_to_level_badreq(self): NfInstModel(nfinstid='678', @@ -69,4 +69,4 @@ class TestNfScaleToLevel(TestCase): data={}, format='json') NfInstModel.objects.filter(nfinstid='678').delete() - self.failUnlessEqual(status.HTTP_400_BAD_REQUEST, response.status_code) + self.assertEqual(status.HTTP_400_BAD_REQUEST, response.status_code) diff --git a/lcm/lcm/nf/tests/test_subscribe_notification.py b/lcm/lcm/nf/tests/test_subscribe_notification.py index 70a309b8..237ef2dc 100644 --- a/lcm/lcm/nf/tests/test_subscribe_notification.py +++ b/lcm/lcm/nf/tests/test_subscribe_notification.py @@ -106,6 +106,13 @@ class TestSubscription(TestCase): def test_invalid_notification_type(self, mock_requests): dummy_subscription = { "callbackUri": "http://aurl.com", + "authentication": { + "authType": ["BASIC"], + "paramsBasic": { + "username": "username", + "password": "password" + } + }, "filter": { "notificationTypes": ["VnfIdentifierDeletionNotification"], "operationTypes": [ diff --git a/lcm/lcm/nf/tests/test_terminate_vnf.py b/lcm/lcm/nf/tests/test_terminate_vnf.py index 4b235c14..79acbc7c 100644 --- a/lcm/lcm/nf/tests/test_terminate_vnf.py +++ b/lcm/lcm/nf/tests/test_terminate_vnf.py @@ -137,7 +137,7 @@ class TestNFTerminate(TestCase): data=req_data,
format='json'
)
- self.failUnlessEqual(
+ self.assertEqual(
status.HTTP_202_ACCEPTED,
response.status_code,
response.content
@@ -155,7 +155,7 @@ class TestNFTerminate(TestCase): data=req_data,
format='json'
)
- self.failUnlessEqual(
+ self.assertEqual(
status.HTTP_404_NOT_FOUND,
response.status_code,
response.content
@@ -185,7 +185,7 @@ class TestNFTerminate(TestCase): data=req_data,
format='json'
)
- self.failUnlessEqual(
+ self.assertEqual(
status.HTTP_409_CONFLICT,
response.status_code,
response.content
diff --git a/lcm/lcm/nf/tests/test_update_vnf.py b/lcm/lcm/nf/tests/test_update_vnf.py index 3c122605..91f451b6 100644 --- a/lcm/lcm/nf/tests/test_update_vnf.py +++ b/lcm/lcm/nf/tests/test_update_vnf.py @@ -40,7 +40,7 @@ class TestNFUpdate(TestCase): response = self.client.patch("/api/vnflcm/v1/vnf_instances/1111", data=self.upd_data, format='json') - self.failUnlessEqual(status.HTTP_404_NOT_FOUND, response.status_code) + self.assertEqual(status.HTTP_404_NOT_FOUND, response.status_code) def test_update_vnf_etag_not_match(self): instanceid = "19" @@ -62,7 +62,7 @@ class TestNFUpdate(TestCase): "If-Match": "test_etag" }) NfInstModel.objects.filter(nfinstid=instanceid).delete() - self.failUnlessEqual(status.HTTP_412_PRECONDITION_FAILED, response.status_code) + self.assertEqual(status.HTTP_412_PRECONDITION_FAILED, response.status_code) @mock.patch.object(UpdateVnf, 'run') def test_update_vnf_etag_match(self, mock_run): @@ -87,7 +87,7 @@ class TestNFUpdate(TestCase): "If-Match": etag }) NfInstModel.objects.filter(nfinstid=instanceid).delete() - self.failUnlessEqual(status.HTTP_202_ACCEPTED, response.status_code) + self.assertEqual(status.HTTP_202_ACCEPTED, response.status_code) @mock.patch.object(restcall, 'call_req') def test_update_vnf_success(self, mock_call_req): @@ -107,4 +107,4 @@ class TestNFUpdate(TestCase): UpdateVnf(self.upd_data, instanceid, job_id).run() name = NfInstModel.objects.filter(nfinstid=instanceid).get().nf_name NfInstModel.objects.filter(nfinstid=instanceid).delete() - self.failUnlessEqual("vnf new name", name) + self.assertEqual("vnf new name", name) diff --git a/lcm/lcm/nf/views/common.py b/lcm/lcm/nf/views/common.py index e24a8bce..6bab28fb 100644 --- a/lcm/lcm/nf/views/common.py +++ b/lcm/lcm/nf/views/common.py @@ -51,43 +51,43 @@ def view_safe_call_with_log(logger): try: return func(*args, **kwargs) except NFLCMExceptionSeeOther as e: - logger.error(e.message) + logger.error(e.args[0]) resp = Response(status=status.HTTP_303_SEE_OTHER) - resp["Location"] = e.message + resp["Location"] = e.args[0] # resp["Location"] = "subscriptions/%s" % e.id return resp except NFLCMExceptionNotFound as e: - logger.error(e.message) + logger.error(e.args[0]) return make_error_resp( - detail=e.message, + detail=e.args[0], status=status.HTTP_404_NOT_FOUND ) except NFLCMExceptionBadRequest as e: - logger.error(e.message) + logger.error(e.args[0]) return make_error_resp( - detail=e.message, + detail=e.args[0], status=status.HTTP_400_BAD_REQUEST ) except NFLCMExceptionConflict as e: - logger.error(e.message) + logger.error(e.args[0]) return make_error_resp( - detail=e.message, + detail=e.args[0], status=status.HTTP_409_CONFLICT ) except NFLCMExceptionPreconditionFailed as e: - logger.error(e.message) + logger.error(e.args[0]) return make_error_resp( - detail=e.message, + detail=e.args[0], status=status.HTTP_412_PRECONDITION_FAILED ) except NFLCMException as e: - logger.error(e.message) + logger.error(e.args[0]) return make_error_resp( - detail=e.message, + detail=e.args[0], status=status.HTTP_500_INTERNAL_SERVER_ERROR ) except Exception as e: - logger.error(e.message) + logger.error(e.args[0]) logger.error(traceback.format_exc()) return make_error_resp( detail='Unexpected exception', @@ -143,7 +143,7 @@ def deal_indivdual_query(res_serializer, query_fun, *args): if not resp_serializer.is_valid(): raise NFLCMException(resp_serializer.errors) - resp = Response(data=resp_serializer.data, status=status.HTTP_200_OK) + resp = Response(data=res, status=status.HTTP_200_OK) if res_serializer == VnfInstanceSerializer: CACHE_ETAG = "%s" % uuid.uuid1() logger.debug("set CACHE_ETAG = %s", CACHE_ETAG) diff --git a/lcm/lcm/nf/views/curd_vnf_views.py b/lcm/lcm/nf/views/curd_vnf_views.py index 29ca82b8..e8c19d67 100644 --- a/lcm/lcm/nf/views/curd_vnf_views.py +++ b/lcm/lcm/nf/views/curd_vnf_views.py @@ -54,7 +54,7 @@ class CreateVnfAndQueryVnfs(APIView): if not vnf_instances_serializer.is_valid(): raise NFLCMException(vnf_instances_serializer.errors) - return Response(data=vnf_instances_serializer.data, status=status.HTTP_200_OK) + return Response(data=resp_data, status=status.HTTP_200_OK) @swagger_auto_schema( request_body=CreateVnfReqSerializer(), @@ -71,15 +71,16 @@ class CreateVnfAndQueryVnfs(APIView): raise NFLCMException(req_serializer.errors) nf_inst = CreateVnf(request.data).do_biz() - create_vnf_resp_serializer = VnfInstanceSerializer( - data={"id": nf_inst.nfinstid, - "vnfProvider": nf_inst.vendor, - "vnfdVersion": nf_inst.version, - "vnfPkgId": nf_inst.package_id, - "instantiationState": nf_inst.status}) + rsp_data = {"id": nf_inst.nfinstid, + "vnfProvider": nf_inst.vendor, + "vnfdVersion": nf_inst.version, + "vnfPkgId": nf_inst.package_id, + "instantiationState": nf_inst.status} + create_vnf_resp_serializer = VnfInstanceSerializer(data=rsp_data) if not create_vnf_resp_serializer.is_valid(): raise NFLCMException(create_vnf_resp_serializer.errors) - return Response(data=create_vnf_resp_serializer.data, status=status.HTTP_201_CREATED) + + return Response(data=rsp_data, status=status.HTTP_201_CREATED) class DeleteVnfAndQueryVnf(APIView): diff --git a/lcm/lcm/nf/views/lcm_op_occs_view.py b/lcm/lcm/nf/views/lcm_op_occs_view.py index 5235ee08..ecb9b173 100644 --- a/lcm/lcm/nf/views/lcm_op_occs_view.py +++ b/lcm/lcm/nf/views/lcm_op_occs_view.py @@ -67,11 +67,11 @@ class QueryMultiVnfLcmOpOccs(APIView): logger.debug("QueryMultiVnfLcmOpOccs--get::> Remove default fields if exclude_default" + " is specified") # TODO(bharath): Add support for "fields", "exclude_fields" in query parameters - if 'exclude_default' in request.query_params.keys(): + if 'exclude_default' in list(request.query_params.keys()): for field in EXCLUDE_DEFAULT: - for lcm_op in vnf_lcm_op_occs_serializer.data: + for lcm_op in resp_data: del lcm_op[field] - return Response(data=vnf_lcm_op_occs_serializer.data, status=status.HTTP_200_OK) + return Response(data=resp_data, status=status.HTTP_200_OK) class QuerySingleVnfLcmOpOcc(APIView): diff --git a/lcm/lcm/nf/views/subscriptions_view.py b/lcm/lcm/nf/views/subscriptions_view.py index c5496277..95b37725 100644 --- a/lcm/lcm/nf/views/subscriptions_view.py +++ b/lcm/lcm/nf/views/subscriptions_view.py @@ -62,7 +62,7 @@ class SubscriptionsView(APIView): if not lccn_subscription_request_serializer.is_valid():
raise NFLCMExceptionBadRequest(lccn_subscription_request_serializer.errors)
subscription = CreateSubscription(
- lccn_subscription_request_serializer.data).do_biz()
+ request.data).do_biz()
lccn_notifications_filter = {
"notificationTypes": ast.literal_eval(subscription.notification_types),
"operationTypes": ast.literal_eval(subscription.operation_types),
@@ -78,7 +78,7 @@ class SubscriptionsView(APIView): sub_resp_serializer = LccnSubscriptionSerializer(data=subscription_data)
if not sub_resp_serializer.is_valid():
raise NFLCMException(sub_resp_serializer.errors)
- return Response(data=sub_resp_serializer.data, status=status.HTTP_201_CREATED)
+ return Response(data=subscription_data, status=status.HTTP_201_CREATED)
@swagger_auto_schema(
responses={
|