summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
8d625f1)
Change-Id: I47ffa741679a6942bd3f4e46ec0a382e8a55422c
Signed-off-by: Pedro Escaleira <escaleira@av.it.pt>
for flavor in target["flavor"]:
flavor["vim_info"] = {}
if db_nsr.get("affinity-or-anti-affinity-group"):
for flavor in target["flavor"]:
flavor["vim_info"] = {}
if db_nsr.get("affinity-or-anti-affinity-group"):
- target["affinity-or-anti-affinity-group"] = deepcopy(db_nsr["affinity-or-anti-affinity-group"])
- for affinity_or_anti_affinity_group in target["affinity-or-anti-affinity-group"]:
+ target["affinity-or-anti-affinity-group"] = deepcopy(
+ db_nsr["affinity-or-anti-affinity-group"]
+ )
+ for affinity_or_anti_affinity_group in target[
+ "affinity-or-anti-affinity-group"
+ ]:
affinity_or_anti_affinity_group["vim_info"] = {}
if db_nslcmop.get("lcmOperationType") != "instantiate":
affinity_or_anti_affinity_group["vim_info"] = {}
if db_nslcmop.get("lcmOperationType") != "instantiate":
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
)
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())
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"