From: fengyuanxing Date: Thu, 8 Mar 2018 02:28:18 +0000 (+0800) Subject: Delete reduntant code X-Git-Tag: v1.1.0~70 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F37%2F34637%2F1;p=vfc%2Fnfvo%2Flcm.git Delete reduntant code Change-Id: Iff12b5712fc56ff4925adb0e79ab0ff27135a32d Issue-ID: VFC-784 Signed-off-by: fengyuanxing --- diff --git a/lcm/pub/utils/scaleaspect.py b/lcm/pub/utils/scaleaspect.py index 7e9c6519..94c349e9 100644 --- a/lcm/pub/utils/scaleaspect.py +++ b/lcm/pub/utils/scaleaspect.py @@ -111,10 +111,6 @@ def check_scale_list(vnf_scale_list, ns_instanceId, aspect, step): return vnf_scale_list -def get_vnfInstanceIdByName(name): - return name - - def get_scale_vnf_data_list(filename, ns_instanceId, aspect, step, scale_type): vnf_scale_list = get_vnf_scale_info(filename, ns_instanceId, aspect, step) @@ -123,9 +119,6 @@ def get_scale_vnf_data_list(filename, ns_instanceId, aspect, step, scale_type): logger.debug("scaleVnfDataList = %s" % scaleVnfDataList) return scaleVnfDataList - # return Response(data={'error': e.message},status=status.HTTP_204_NO_CONTENT) - # return Response(data={'success': 'success'},status=status.HTTP_200_OK) - # Get the nsd id according to the ns instance id. def get_nsdId(ns_instanceId): @@ -239,8 +232,7 @@ def set_scaleVnfData_type(vnf_scale_list, scale_type): if vnf_scale_list is not None: for i in range(vnf_scale_list.__len__()): scaleVnfData = copy.deepcopy(scale_vnf_data_mapping) - scaleVnfData["vnfInstanceId"] = get_vnfInstanceIdByName( - vnf_scale_list[i]["vnfInstanceId"]) + scaleVnfData["vnfInstanceId"] = vnf_scale_list[i]["vnfInstanceId"] scaleVnfData["scaleByStepData"]["type"] = scale_type scaleVnfData["scaleByStepData"]["aspectId"] = vnf_scale_list[i]["vnf_scaleAspectId"] scaleVnfData["scaleByStepData"]["numberOfSteps"] = vnf_scale_list[i]["numberOfSteps"]