From: Pedro Escaleira <escaleira@av.it.pt>
Date: Wed, 30 Mar 2022 23:08:05 +0000 (+0100)
Subject: Bug 1951 fixed to update the deploy_params_kdu dict instead of overwriting it
X-Git-Tag: v10.1.1-rc1~7
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=b1679e47e00d8e015867568d5a5215ddb9e75a43;p=osm%2FLCM.git

Bug 1951 fixed to update the deploy_params_kdu dict instead of overwriting it

Change-Id: I47ffa741679a6942bd3f4e46ec0a382e8a55422c
Signed-off-by: Pedro Escaleira <escaleira@av.it.pt>
---

diff --git a/osm_lcm/ns.py b/osm_lcm/ns.py
index ab1ee3b..28e5005 100644
--- a/osm_lcm/ns.py
+++ b/osm_lcm/ns.py
@@ -2293,7 +2293,9 @@ class NsLcm(LcmBase):
                     kdur_list = []
                     for kdur in vnfr["kdur"]:
                         if kdur.get("additionalParams"):
-                            kdur["additionalParams"] = json.loads(kdur["additionalParams"])
+                            kdur["additionalParams"] = json.loads(
+                                kdur["additionalParams"]
+                            )
                         kdur_list.append(kdur)
                     vnfr["kdur"] = kdur_list
 
@@ -2491,8 +2493,8 @@ class NsLcm(LcmBase):
                         )
                         deploy_params_kdu = {"OSM": get_osm_params(db_vnfr)}
                         if kdur.get("additionalParams"):
-                            deploy_params_kdu = parse_yaml_strings(
-                                kdur["additionalParams"]
+                            deploy_params_kdu.update(
+                                parse_yaml_strings(kdur["additionalParams"].copy())
                             )
 
                         self._deploy_n2vc(
@@ -4687,7 +4689,9 @@ class NsLcm(LcmBase):
                     kdur_list = []
                     for kdur in db_vnfr["kdur"]:
                         if kdur.get("additionalParams"):
-                            kdur["additionalParams"] = json.loads(kdur["additionalParams"])
+                            kdur["additionalParams"] = json.loads(
+                                kdur["additionalParams"]
+                            )
                         kdur_list.append(kdur)
                     db_vnfr["kdur"] = kdur_list
                 step = "Getting vnfd from database"