Fix scaling logic

[vfc/nfvo/lcm.git] / lcm / pub / utils / scaleaspect.py

diff --git a/lcm/pub/utils/scaleaspect.py b/lcm/pub/utils/scaleaspect.py
index 9a50f7b..c70d5fd 100644 (file)
--- 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(