projects
/
osm
/
LCM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 1950 fixed to update the deploy_params_kdu dict instead of overwriting it
[osm/LCM.git]
/
osm_lcm
/
ns.py
diff --git
a/osm_lcm/ns.py
b/osm_lcm/ns.py
index
17a892d
..
852cc54
100644
(file)
--- a/
osm_lcm/ns.py
+++ b/
osm_lcm/ns.py
@@
-2344,7
+2344,9
@@
class NsLcm(LcmBase):
kdur_list = []
for kdur in vnfr["kdur"]:
if kdur.get("additionalParams"):
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
kdur_list.append(kdur)
vnfr["kdur"] = kdur_list
@@
-2542,8
+2544,8
@@
class NsLcm(LcmBase):
)
deploy_params_kdu = {"OSM": get_osm_params(db_vnfr)}
if kdur.get("additionalParams"):
)
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(
)
self._deploy_n2vc(
@@
-4895,7
+4897,9
@@
class NsLcm(LcmBase):
kdur_list = []
for kdur in db_vnfr["kdur"]:
if kdur.get("additionalParams"):
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"
kdur_list.append(kdur)
db_vnfr["kdur"] = kdur_list
step = "Getting vnfd from database"