From: tierno <alfonso.tiernosepulveda@telefonica.com>
Date: Tue, 20 Nov 2018 14:56:26 +0000 (+0000)
Subject: bug 583 on scalling with config primitives
X-Git-Tag: v5.0.0~6
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=4fa22b034a97505fcb56cf1fddc25e4d3e9b41d2;p=osm%2FLCM.git

bug 583 on scalling with config primitives

Change-Id: I4739d66259c60652f57093fd1f957a9f24d8402b
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
---

diff --git a/osm_lcm/lcm.py b/osm_lcm/lcm.py
index ff90ff1..7f3342d 100644
--- a/osm_lcm/lcm.py
+++ b/osm_lcm/lcm.py
@@ -28,8 +28,8 @@ min_RO_version = [0, 5, 72]
 min_n2vc_version = "0.0.2"
 min_common_version = "0.1.11"
 # uncomment if LCM is installed as library and installed, and get them from __init__.py
-lcm_version = '0.1.24'
-lcm_version_date = '2018-11-16'
+lcm_version = '0.1.25'
+lcm_version_date = '2018-11-20'
 
 
 class Lcm:
diff --git a/osm_lcm/ns.py b/osm_lcm/ns.py
index 4900287..bd6a6e3 100644
--- a/osm_lcm/ns.py
+++ b/osm_lcm/ns.py
@@ -1371,6 +1371,7 @@ class NsLcm(LcmBase):
             db_nslcmop = self.db.get_one("nslcmops", {"_id": nslcmop_id})
             step = "Getting nsr from database"
             db_nsr = self.db.get_one("nsrs", {"_id": nsr_id})
+            nsr_name = db_nsr["name"]
             old_operational_status = db_nsr["operational-status"]
             old_config_status = db_nsr["config-status"]
 
@@ -1505,7 +1506,7 @@ class NsLcm(LcmBase):
                                 "primitive".format(scaling_group, config_primitive))
                         scale_process = "VCA"
                         db_nsr_update["config-status"] = "configuring pre-scaling"
-                        result, result_detail = await self._ns_execute_primitive(nsr_lcm, vnf_index,
+                        result, result_detail = await self._ns_execute_primitive(nsr_lcm, nsr_name, vnf_index, None,
                                                                                  vnf_config_primitive, primitive_params)
                         self.logger.debug(logging_text + "vnf_config_primitive={} Done with result {} {}".format(
                             vnf_config_primitive, result, result_detail))
@@ -1626,7 +1627,7 @@ class NsLcm(LcmBase):
                         scale_process = "VCA"
                         db_nsr_update["config-status"] = "configuring post-scaling"
 
-                        result, result_detail = await self._ns_execute_primitive(nsr_lcm, vnf_index,
+                        result, result_detail = await self._ns_execute_primitive(nsr_lcm, nsr_name, vnf_index, None,
                                                                                  vnf_config_primitive, primitive_params)
                         self.logger.debug(logging_text + "vnf_config_primitive={} Done with result {} {}".format(
                             vnf_config_primitive, result, result_detail))