From: yangyan <yangyanyj@chinamobile.com>
Date: Tue, 8 May 2018 03:40:07 +0000 (+0800)
Subject: Fix scaling logic
X-Git-Tag: v1.1.0~20
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=9e4904a2fffaf3242547ae227c55eed88b04c43f;p=vfc%2Fnfvo%2Flcm.git

Fix scaling logic

Issue-ID: VFC-899
Change-Id: I5622864c82e3ad9f8893532c1f1985693bdc0e9d
Signed-off-by: yangyan <yangyanyj@chinamobile.com>
---

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(