"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
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", []),
"name": icp.get("id"),
}
- if "port-security-enabled" in icp:
- vdu_icp["port-security-enabled"] = icp["port-security-enabled"]
-
- if "port-security-disable-strategy" in icp:
- vdu_icp["port-security-disable-strategy"] = icp["port-security-disable-strategy"]
-
vdur["internal-connection-point"].append(vdu_icp)
for iface in icp.get("virtual-network-interface-requirement", ()):
vdu_iface = {x: iface[x] for x in iface_fields if iface.get(x) is not None}
vdu_iface["internal-connection-point-ref"] = vdu_icp["id"]
+ if "port-security-enabled" in icp:
+ vdu_iface["port-security-enabled"] = icp["port-security-enabled"]
+
+ if "port-security-disable-strategy" in icp:
+ vdu_iface["port-security-disable-strategy"] = icp["port-security-disable-strategy"]
+
for ext_cp in vnfd.get("ext-cpd", ()):
if not ext_cp.get("int-cpd"):
continue
continue
if icp["id"] == ext_cp["int-cpd"].get("cpd"):
vdu_iface["external-connection-point-ref"] = ext_cp.get("id")
+
+ if "port-security-enabled" in ext_cp:
+ vdu_iface["port-security-enabled"] = (
+ ext_cp["port-security-enabled"]
+ )
+
+ if "port-security-disable-strategy" in ext_cp:
+ vdu_iface["port-security-disable-strategy"] = (
+ ext_cp["port-security-disable-strategy"]
+ )
+
break
if vnfd_mgmt_cp and vdu_iface.get("external-connection-point-ref") == vnfd_mgmt_cp:
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"]:
descriptor_configuration = utils.find_in_list(
configs,
lambda config: config["id"] == indata["vdu_id"]
- ).get("config-primitive")
+ )
elif indata.get("kdu_name"):
self._check_valid_kdu(vnfd, indata["kdu_name"])
descriptor_configuration = utils.find_in_list(
configs,
lambda config: config["id"] == indata.get("kdu_name")
- ).get("config-primitive")
+ )
else:
descriptor_configuration = utils.find_in_list(
configs,
lambda config: config["id"] == vnfd["id"]
- ).get("config-primitive")
+ )
+ if descriptor_configuration is not None:
+ descriptor_configuration = descriptor_configuration.get("config-primitive")
else: # use a NSD
descriptor_configuration = nsd.get("ns-configuration", {}).get("config-primitive")
# 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")):
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)