diff options
| author |   Fu Jinhua <fu.jinhua@zte.com.cn> | 2018-03-06 05:40:00 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-03-06 05:40:00 +0000 |
| commit | 7c7903f38388849373c738d22ece0d2a68640eb0 (patch) | |
| tree | 874a80bda90c729a69b10704e5e97d22378ba4a3 | |
| parent | 5b7bf2b5c6efbca681686e8ed272dd86e69fd88e (diff) | |
| parent | 14b946e3014c7f0fbb1e1187b400e7ca6e099e63 (diff) | |
Merge "Remove redundant code"
| -rw-r--r-- | lcm/pub/utils/scaleaspect.py | 6 |
1 files changed, 3 insertions, 3 deletions
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, |