additional_params[k] = "!!yaml " + safe_dump(v)
if descriptor:
- # check that enough parameters are supplied for the initial-config-primitive
- # TODO: check for cloud-init
- if member_vnf_index:
- if kdu_name:
- initial_primitives = None
- elif vdu_id:
- vdud = next(x for x in descriptor["vdu"] if x["id"] == vdu_id)
- initial_primitives = deep_get(vdud, ("vdu-configuration", "initial-config-primitive"))
- else:
- vnf_configurations = get_iterable(descriptor.get("vnf-configuration"))
+ for df in descriptor.get("df", []):
+ # check that enough parameters are supplied for the initial-config-primitive
+ # TODO: check for cloud-init
+ if member_vnf_index:
initial_primitives = []
- for vnfc in vnf_configurations:
- for primitive in get_iterable(vnfc.get("initial-config-primitive")):
- initial_primitives.append(primitive)
- else:
- initial_primitives = deep_get(descriptor, ("ns-configuration", "initial-config-primitive"))
-
- for initial_primitive in get_iterable(initial_primitives):
- for param in get_iterable(initial_primitive.get("parameter")):
- if param["value"].startswith("<") and param["value"].endswith(">"):
- if param["value"] in ("<rw_mgmt_ip>", "<VDU_SCALE_INFO>", "<ns_config_info>"):
- continue
- if not additional_params or param["value"][1:-1] not in additional_params:
- raise EngineException("Parameter '{}' needed for vnfd[id={}]:vnf-configuration:"
- "initial-config-primitive[name={}] not supplied".
- format(param["value"], descriptor["id"],
- initial_primitive["name"]))
+ if "lcm-operations-configuration" in df \
+ and "operate-vnf-op-config" in df["lcm-operations-configuration"]:
+ for config in df["lcm-operations-configuration"]["operate-vnf-op-config"].get("day1-2", []):
+ for primitive in get_iterable(config.get("initial-config-primitive")):
+ initial_primitives.append(primitive)
+ else:
+ initial_primitives = deep_get(descriptor, ("ns-configuration", "initial-config-primitive"))
+
+ for initial_primitive in get_iterable(initial_primitives):
+ for param in get_iterable(initial_primitive.get("parameter")):
+ if param["value"].startswith("<") and param["value"].endswith(">"):
+ if param["value"] in ("<rw_mgmt_ip>", "<VDU_SCALE_INFO>", "<ns_config_info>"):
+ continue
+ if not additional_params or param["value"][1:-1] not in additional_params:
+ raise EngineException("Parameter '{}' needed for vnfd[id={}]:day1-2 configuration:"
+ "initial-config-primitive[name={}] not supplied".
+ format(param["value"], descriptor["id"],
+ initial_primitive["name"]))
return additional_params or None, other_params or None
step = "validating input parameters"
ns_request = self._remove_envelop(indata)
self._update_input_with_kwargs(ns_request, kwargs)
- self._validate_input_new(ns_request, session["force"])
+ ns_request = self._validate_input_new(ns_request, session["force"])
step = "getting nsd id='{}' from database".format(ns_request.get("nsdId"))
nsd = self._get_nsd_from_db(ns_request["nsdId"], session)
for cp in vnfd.get("ext-cpd", ()):
vnf_cp = {
"name": cp.get("id"),
- "connection-point-id": cp.get("int-cpd").get("cpd"),
- "connection-point-vdu-id": cp.get("int-cpd").get("vdu-id"),
+ "connection-point-id": cp.get("int-cpd", {}).get("cpd"),
+ "connection-point-vdu-id": cp.get("int-cpd", {}).get("vdu-id"),
"id": cp.get("id"),
# "ip-address", "mac-address" # filled by LCM
# vim-id # TODO it would be nice having a vim port id
net["external-connection-point-ref"] = all_k8s_cluster_nets_cpds[net.get("id")]
# update kdus
- # TODO: Change for multiple df support
- all_kdu_profiles = vnfd.get("df", [[]])[0].get("kdu-profile", ())
- all_kdu_profiles_models = {profile.get("name"): profile.get("kdu-model-id") for profile in all_kdu_profiles}
- all_kdu_models = vnfd.get("kdu-model", ())
- all_kdu_models = {model.get("id"): model for model in all_kdu_models}
for kdu in get_iterable(vnfd.get("kdu")):
additional_params, kdu_params = self._format_additional_params(ns_request,
vnf_index,
kdur = {
"additionalParams": additional_params,
"k8s-namespace": kdu_k8s_namespace,
- "kdu-name": kdu.get("name"),
+ "kdu-name": kdu["name"],
# TODO "name": "" Name of the VDU in the VIM
"ip-address": None, # mgmt-interface filled by LCM
"k8s-cluster": {},
}
if kdu_params and kdu_params.get("config-units"):
kdur["config-units"] = kdu_params["config-units"]
-
- kdu_model_data = all_kdu_models[all_kdu_profiles_models[kdur["name"]]]
- kdur[kdu_model_data.get("kdu-model-type")] = kdu_model or kdu_model_data
+ if kdu.get("helm-version"):
+ kdur["helm-version"] = kdu["helm-version"]
+ for k8s_type in ("helm-chart", "juju-bundle"):
+ if kdu.get(k8s_type):
+ kdur[k8s_type] = kdu_model or kdu[k8s_type]
if not vnfr_descriptor.get("kdur"):
vnfr_descriptor["kdur"] = []
vnfr_descriptor["kdur"].append(kdur)
vnfd_mgmt_cp = vnfd.get("mgmt-cp")
+
for vdu in vnfd.get("vdu", ()):
additional_params, vdu_params = self._format_additional_params(
ns_request, vnf_index, vdu_id=vdu["id"], descriptor=vnfd)
"connection-point-id": icp["id"],
"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", ()):
indata["member_vnf_index"] = indata.pop("vnf_member_index") # for backward compatibility
if indata.get("member_vnf_index"):
vnfd = self._get_vnfd_from_vnf_member_index(indata["member_vnf_index"], nsr["_id"])
+ try:
+ configs = vnfd.get("df")[0]["lcm-operations-configuration"]["operate-vnf-op-config"]["day1-2"]
+ except Exception:
+ configs = []
+
if indata.get("vdu_id"):
self._check_valid_vdu(vnfd, indata["vdu_id"])
- # TODO: Change the [0] as vdu-configuration is now a list
- descriptor_configuration = vnfd.get("vdu-configuration", [{}])[0].get("config-primitive")
+ 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"])
- # TODO: Change the [0] as kdu-configuration is now a list
- descriptor_configuration = vnfd.get("kdu-configuration", [{}])[0].get("config-primitive")
+ descriptor_configuration = utils.find_in_list(
+ configs,
+ lambda config: config["id"] == indata.get("kdu_name")
+ ).get("config-primitive")
else:
- # TODO: Change the [0] as vnf-configuration is now a list
- descriptor_configuration = vnfd.get("vnf-configuration", [{}])[0].get("config-primitive")
+ descriptor_configuration = utils.find_in_list(
+ configs,
+ lambda config: config["id"] == vnfd["id"]
+ ).get("config-primitive")
else: # use a NSD
descriptor_configuration = nsd.get("ns-configuration", {}).get("config-primitive")
vnfr_update[vnfr_update_text + ".mac-address"] = increment_ip_mac(
iface_inst_param.get("mac-address"), vdur.get("count-index", 0))
vnfr_update[vnfr_update_text + ".fixed-mac"] = True
+ if iface_inst_param.get("floating-ip-required"):
+ vnfr_update[vnfr_update_text + ".floating-ip-required"] = True
# get vnf.internal-vld.internal-conection-point instantiation params to update vnfr.vdur.interfaces
# TODO update vld with the ip-profile
for ivld_inst_param in get_iterable(vnf_inst_params.get("internal-vld")):
slice_request = self._remove_envelop(indata)
# Override descriptor with query string kwargs
self._update_input_with_kwargs(slice_request, kwargs)
- self._validate_input_new(slice_request, session["force"])
+ slice_request = self._validate_input_new(slice_request, session["force"])
# look for nstd
step = "getting nstd id='{}' from database".format(slice_request.get("nstId"))