diff options
| author |   yangyan <yangyanyj@chinamobile.com> | 2018-05-08 11:40:07 +0800 |
|---|---|---|
| committer | yangyan <yangyanyj@chinamobile.com> | 2018-05-08 11:54:24 +0800 |
| commit | 9e4904a2fffaf3242547ae227c55eed88b04c43f (patch) | |
| tree | 65fda0efdcf937c603517c29a10a84d3da1a3bba | |
| parent | 5c800e217c5ba95f00e0ae54a6db15500e873c73 (diff) | |
Fix scaling logic
Issue-ID: VFC-899
Change-Id: I5622864c82e3ad9f8893532c1f1985693bdc0e9d
Signed-off-by: yangyan <yangyanyj@chinamobile.com>
| -rw-r--r-- | lcm/pub/utils/scaleaspect.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/lcm/pub/utils/scaleaspect.py b/lcm/pub/utils/scaleaspect.py index 9a50f7b2..c70d5fd7 100644 --- a/lcm/pub/utils/scaleaspect.py +++ b/lcm/pub/utils/scaleaspect.py @@ -19,7 +19,6 @@ import copy from lcm.pub.database.models import NfInstModel from lcm.pub.database.models import NSInstModel from lcm.ns.vnfs.const import VNF_STATUS -from lcm.pub.msapi import catalog from lcm.pub.utils.values import ignore_case_get @@ -159,7 +158,16 @@ def get_scale_vnf_data_info_list(scaleNsData, ns_InstanceId): nsd_id = get_nsdId(ns_InstanceId) # Gets the scalingmap json data from the package according to the ns instance id. - scalingmap_json = catalog.get_scalingmap_json_package(ns_InstanceId) + # scalingmap_json = catalog.get_scalingmap_json_package(ns_InstanceId) + base_path = os.path.dirname( + os.path.dirname( + os.path.dirname( + os.path.abspath(__file__) + ) + ) + ) + scalingmap_filename = base_path + "/ns/data/scalemapping.json" + scalingmap_json = get_json_data(scalingmap_filename) # Gets and checks the values of parameters. aspect, numberOfSteps, scale_type = check_and_set_params( |