X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_nbi%2Finstance_topics.py;h=da0ba9a7d679a359e23f112e4bb9b621a2cede90;hb=64b8a3520857ad86f0998c300be58f5d38ee84c4;hp=bf0e3a918d64409333cc858ac1bb62c1d27bfac2;hpb=510da5359ab2d826a1f27f538e116452212600d3;p=osm%2FNBI.git diff --git a/osm_nbi/instance_topics.py b/osm_nbi/instance_topics.py index bf0e3a9..da0ba9a 100644 --- a/osm_nbi/instance_topics.py +++ b/osm_nbi/instance_topics.py @@ -522,9 +522,14 @@ class NsrTopic(BaseTopic): if kdu_params and kdu_params.get("k8s-namespace"): kdu_k8s_namespace = kdu_params["k8s-namespace"] + kdu_deployment_name = "" + if kdu_params and kdu_params.get("kdu-deployment-name"): + kdu_deployment_name = kdu_params.get("kdu-deployment-name") + kdur = { "additionalParams": additional_params, "k8s-namespace": kdu_k8s_namespace, + "kdu-deployment-name": kdu_deployment_name, "kdu-name": kdu["name"], # TODO "name": "" Name of the VDU in the VIM "ip-address": None, # mgmt-interface filled by LCM @@ -550,7 +555,15 @@ class NsrTopic(BaseTopic): vdu_config = utils.find_in_list(configs, lambda config: config["id"] == vdu["id"]) except Exception: vdu_config = None - + + try: + vdu_instantiation_level = utils.find_in_list( + vnfd.get("df")[0]["instantiation-level"][0]["vdu-level"], + lambda a_vdu_profile: a_vdu_profile["vdu-id"] == vdu["id"] + ) + except Exception: + vdu_instantiation_level = None + if vdu_config: external_connection_ee = utils.filter_in_list( vdu_config.get("execution-environment-list", []), @@ -689,7 +702,11 @@ class NsrTopic(BaseTopic): if nsr_flavor_desc: vdur["ns-flavor-id"] = nsr_flavor_desc["id"] - count = int(vdu.get("count", 1)) + if vdu_instantiation_level: + count = vdu_instantiation_level.get("number-of-instances") + else: + count = 1 + for index in range(0, count): vdur = deepcopy(vdur) for iface in vdur["interfaces"]: