From: fengyuanxing Date: Tue, 6 Mar 2018 03:48:41 +0000 (+0800) Subject: Remove redundant code X-Git-Tag: v1.1.0~90^2 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=14b946e3014c7f0fbb1e1187b400e7ca6e099e63;p=vfc%2Fnfvo%2Flcm.git Remove redundant code Change-Id: Ied1f5150da3bc05fd1591f08787e91b09fd0c3b3 Issue-ID: VFC-784 Signed-off-by: fengyuanxing --- diff --git a/lcm/pub/utils/scaleaspect.py b/lcm/pub/utils/scaleaspect.py index c2481ca5..b0b5d383 100644 --- a/lcm/pub/utils/scaleaspect.py +++ b/lcm/pub/utils/scaleaspect.py @@ -222,7 +222,7 @@ def get_and_check_params(scaleNsByStepsData, ns_InstanceId): numberOfSteps = scaleNsByStepsData["numberOfSteps"] scale_type = scaleNsByStepsData["scalingDirection"] - return ns_InstanceId, aspect, numberOfSteps, scale_type + return aspect, numberOfSteps, scale_type def get_scale_vnf_data(scaleNsData, ns_InstanceId): @@ -232,7 +232,7 @@ def get_scale_vnf_data(scaleNsData, ns_InstanceId): os.path.abspath(__file__)))) filename = curdir_path + "/ns/data/scalemapping.json" logger.debug("filename = %s" % filename) - ns_InstanceId, aspect, numberOfSteps, scale_type = get_and_check_params( + aspect, numberOfSteps, scale_type = get_and_check_params( scaleNsData, ns_InstanceId) return get_vnf_data( filename, @@ -247,7 +247,7 @@ def get_scale_vnf_data_package(scaleNsData, ns_InstanceId): scalingmap_json = catalog.get_scalingmap_json_package(ns_InstanceId) logger.debug("scalingmap_json = %s" % scalingmap_json) - ns_InstanceId, aspect, numberOfSteps, scale_type = get_and_check_params( + aspect, numberOfSteps, scale_type = get_and_check_params( scaleNsData, ns_InstanceId) return get_vnf_data_package( scalingmap_json,