X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Finstance_topics.py;h=2264c69787cbbac4a65e0b92b8067728efc42031;hp=bf0e3a918d64409333cc858ac1bb62c1d27bfac2;hb=490d019c61da7d4f0718fe030d645bf936a616f0;hpb=9b33fa825aaf935e4f467b1a01f65c85d1b9b694

diff --git a/osm_nbi/instance_topics.py b/osm_nbi/instance_topics.py
index bf0e3a9..2264c69 100644
--- a/osm_nbi/instance_topics.py
+++ b/osm_nbi/instance_topics.py
@@ -471,6 +471,7 @@ class NsrTopic(BaseTopic):
             "vnfd-ref": vnfd_id,
             "vnfd-id": vnfd["_id"],  # not at OSM model, but useful
             "vim-account-id": None,
+            "vca-id": None,
             "vdur": [],
             "connection-point": [],
             "ip-address": None,  # mgmt-interface filled by LCM
@@ -550,7 +551,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 +698,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"]:
@@ -1159,12 +1172,15 @@ class NsLcmOpTopic(BaseTopic):
             # update vim-account-id
 
             vim_account = indata["vimAccountId"]
+            vca_id = indata.get("vcaId")
             # check instantiate parameters
             for vnf_inst_params in get_iterable(indata.get("vnf")):
                 if vnf_inst_params["member-vnf-index"] != member_vnf_index:
                     continue
                 if vnf_inst_params.get("vimAccountId"):
                     vim_account = vnf_inst_params.get("vimAccountId")
+                if vnf_inst_params.get("vcaId"):
+                    vca_id = vnf_inst_params.get("vcaId")
 
                 # get vnf.vdu.interface instantiation params to update vnfr.vdur.interfaces ip, mac
                 for vdu_inst_param in get_iterable(vnf_inst_params.get("vdu")):
@@ -1227,6 +1243,10 @@ class NsLcmOpTopic(BaseTopic):
             vnfr_update["vim-account-id"] = vim_account
             vnfr_update_rollback["vim-account-id"] = vnfr.get("vim-account-id")
 
+            if vca_id:
+                vnfr_update["vca-id"] = vca_id
+                vnfr_update_rollback["vca-id"] = vnfr.get("vca-id")
+
             # get pdu
             ifaces_forcing_vim_network = self._look_for_pdu(session, rollback, vnfr, vim_account, vnfr_update,
                                                             vnfr_update_rollback)