# import yaml
import logging
+from typing import Any, Dict, Tuple
from traceback import format_exc as traceback_format_exc
from osm_ng_ro.ns_thread import NsWorker, NsWorkerException, deep_get
from osm_ng_ro.validation import validate_input, deploy_schema
return db_content
+ @staticmethod
+ def _create_task(
+ deployment_info: Dict[str, Any],
+ target_id: str,
+ item: str,
+ action: str,
+ target_record: str,
+ target_record_id: str,
+ extra_dict: Dict[str, Any] = None,
+ ) -> Dict[str, Any]:
+ """Function to create task dict from deployment information.
+
+ Args:
+ deployment_info (Dict[str, Any]): [description]
+ target_id (str): [description]
+ item (str): [description]
+ action (str): [description]
+ target_record (str): [description]
+ target_record_id (str): [description]
+ extra_dict (Dict[str, Any], optional): [description]. Defaults to None.
+
+ Returns:
+ Dict[str, Any]: [description]
+ """
+ task = {
+ "target_id": target_id, # it will be removed before pushing at database
+ "action_id": deployment_info.get("action_id"),
+ "nsr_id": deployment_info.get("nsr_id"),
+ "task_id": f"{deployment_info.get('action_id')}:{deployment_info.get('task_index')}",
+ "status": "SCHEDULED",
+ "action": action,
+ "item": item,
+ "target_record": target_record,
+ "target_record_id": target_record_id,
+ }
+
+ if extra_dict:
+ task.update(extra_dict) # params, find_params, depends_on
+
+ deployment_info["task_index"] = deployment_info.get("task_index", 0) + 1
+
+ return task
+
+ @staticmethod
+ def _create_ro_task(
+ target_id: str,
+ task: Dict[str, Any],
+ ) -> Dict[str, Any]:
+ """Function to create an RO task from task information.
+
+ Args:
+ target_id (str): [description]
+ task (Dict[str, Any]): [description]
+
+ Returns:
+ Dict[str, Any]: [description]
+ """
+ now = time()
+
+ _id = task.get("task_id")
+ db_ro_task = {
+ "_id": _id,
+ "locked_by": None,
+ "locked_at": 0.0,
+ "target_id": target_id,
+ "vim_info": {
+ "created": False,
+ "created_items": None,
+ "vim_id": None,
+ "vim_name": None,
+ "vim_status": None,
+ "vim_details": None,
+ "refresh_at": None,
+ },
+ "modified_at": now,
+ "created_at": now,
+ "to_check_at": now,
+ "tasks": [task],
+ }
+
+ return db_ro_task
+
+ @staticmethod
+ def _process_image_params(
+ target_image: Dict[str, Any],
+ indata: Dict[str, Any],
+ vim_info: Dict[str, Any],
+ target_record_id: str,
+ ) -> Dict[str, Any]:
+ """Function to process VDU image parameters.
+
+ Args:
+ target_image (Dict[str, Any]): [description]
+ indata (Dict[str, Any]): [description]
+ vim_info (Dict[str, Any]): [description]
+ target_record_id (str): [description]
+
+ Returns:
+ Dict[str, Any]: [description]
+ """
+ find_params = {}
+
+ if target_image.get("image"):
+ find_params["filter_dict"] = {"name": target_image.get("image")}
+
+ if target_image.get("vim_image_id"):
+ find_params["filter_dict"] = {"id": target_image.get("vim_image_id")}
+
+ if target_image.get("image_checksum"):
+ find_params["filter_dict"] = {
+ "checksum": target_image.get("image_checksum")
+ }
+
+ return {"find_params": find_params}
+
+ @staticmethod
+ def _get_resource_allocation_params(
+ quota_descriptor: Dict[str, Any],
+ ) -> Dict[str, Any]:
+ """Read the quota_descriptor from vnfd and fetch the resource allocation properties from the
+ descriptor object.
+
+ Args:
+ quota_descriptor (Dict[str, Any]): cpu/mem/vif/disk-io quota descriptor
+
+ Returns:
+ Dict[str, Any]: quota params for limit, reserve, shares from the descriptor object
+ """
+ quota = {}
+
+ if quota_descriptor.get("limit"):
+ quota["limit"] = int(quota_descriptor["limit"])
+
+ if quota_descriptor.get("reserve"):
+ quota["reserve"] = int(quota_descriptor["reserve"])
+
+ if quota_descriptor.get("shares"):
+ quota["shares"] = int(quota_descriptor["shares"])
+
+ return quota
+
+ @staticmethod
+ def _process_guest_epa_quota_params(
+ guest_epa_quota: Dict[str, Any],
+ epa_vcpu_set: bool,
+ ) -> Dict[str, Any]:
+ """Function to extract the guest epa quota parameters.
+
+ Args:
+ guest_epa_quota (Dict[str, Any]): [description]
+ epa_vcpu_set (bool): [description]
+
+ Returns:
+ Dict[str, Any]: [description]
+ """
+ result = {}
+
+ if guest_epa_quota.get("cpu-quota") and not epa_vcpu_set:
+ cpuquota = Ns._get_resource_allocation_params(
+ guest_epa_quota.get("cpu-quota")
+ )
+
+ if cpuquota:
+ result["cpu-quota"] = cpuquota
+
+ if guest_epa_quota.get("mem-quota"):
+ vduquota = Ns._get_resource_allocation_params(
+ guest_epa_quota.get("mem-quota")
+ )
+
+ if vduquota:
+ result["mem-quota"] = vduquota
+
+ if guest_epa_quota.get("disk-io-quota"):
+ diskioquota = Ns._get_resource_allocation_params(
+ guest_epa_quota.get("disk-io-quota")
+ )
+
+ if diskioquota:
+ result["disk-io-quota"] = diskioquota
+
+ if guest_epa_quota.get("vif-quota"):
+ vifquota = Ns._get_resource_allocation_params(
+ guest_epa_quota.get("vif-quota")
+ )
+
+ if vifquota:
+ result["vif-quota"] = vifquota
+
+ return result
+
+ @staticmethod
+ def _process_guest_epa_numa_params(
+ guest_epa_quota: Dict[str, Any],
+ ) -> Tuple[Dict[str, Any], bool]:
+ """[summary]
+
+ Args:
+ guest_epa_quota (Dict[str, Any]): [description]
+
+ Returns:
+ Tuple[Dict[str, Any], bool]: [description]
+ """
+ numa = {}
+ epa_vcpu_set = False
+
+ if guest_epa_quota.get("numa-node-policy"):
+ numa_node_policy = guest_epa_quota.get("numa-node-policy")
+
+ if numa_node_policy.get("node"):
+ numa_node = numa_node_policy["node"][0]
+
+ if numa_node.get("num-cores"):
+ numa["cores"] = numa_node["num-cores"]
+ epa_vcpu_set = True
+
+ paired_threads = numa_node.get("paired-threads", {})
+ if paired_threads.get("num-paired-threads"):
+ numa["paired-threads"] = int(
+ numa_node["paired-threads"]["num-paired-threads"]
+ )
+ epa_vcpu_set = True
+
+ if paired_threads.get("paired-thread-ids"):
+ numa["paired-threads-id"] = []
+
+ for pair in paired_threads["paired-thread-ids"]:
+ numa["paired-threads-id"].append(
+ (
+ str(pair["thread-a"]),
+ str(pair["thread-b"]),
+ )
+ )
+
+ if numa_node.get("num-threads"):
+ numa["threads"] = int(numa_node["num-threads"])
+ epa_vcpu_set = True
+
+ if numa_node.get("memory-mb"):
+ numa["memory"] = max(int(int(numa_node["memory-mb"]) / 1024), 1)
+
+ return numa, epa_vcpu_set
+
+ @staticmethod
+ def _process_guest_epa_cpu_pinning_params(
+ guest_epa_quota: Dict[str, Any],
+ vcpu_count: int,
+ epa_vcpu_set: bool,
+ ) -> Tuple[Dict[str, Any], bool]:
+ """[summary]
+
+ Args:
+ guest_epa_quota (Dict[str, Any]): [description]
+ vcpu_count (int): [description]
+ epa_vcpu_set (bool): [description]
+
+ Returns:
+ Tuple[Dict[str, Any], bool]: [description]
+ """
+ numa = {}
+ local_epa_vcpu_set = epa_vcpu_set
+
+ if (
+ guest_epa_quota.get("cpu-pinning-policy") == "DEDICATED"
+ and not epa_vcpu_set
+ ):
+ numa[
+ "cores"
+ if guest_epa_quota.get("cpu-thread-pinning-policy") != "PREFER"
+ else "threads"
+ ] = max(vcpu_count, 1)
+ local_epa_vcpu_set = True
+
+ return numa, local_epa_vcpu_set
+
+ @staticmethod
+ def _process_epa_params(
+ target_flavor: Dict[str, Any],
+ ) -> Dict[str, Any]:
+ """[summary]
+
+ Args:
+ target_flavor (Dict[str, Any]): [description]
+
+ Returns:
+ Dict[str, Any]: [description]
+ """
+ extended = {}
+ numa = {}
+
+ if target_flavor.get("guest-epa"):
+ guest_epa = target_flavor["guest-epa"]
+
+ numa, epa_vcpu_set = Ns._process_guest_epa_numa_params(
+ guest_epa_quota=guest_epa
+ )
+
+ if guest_epa.get("mempage-size"):
+ extended["mempage-size"] = guest_epa.get("mempage-size")
+
+ tmp_numa, epa_vcpu_set = Ns._process_guest_epa_cpu_pinning_params(
+ guest_epa_quota=guest_epa,
+ vcpu_count=int(target_flavor.get("vcpu-count", 1)),
+ epa_vcpu_set=epa_vcpu_set,
+ )
+ numa.update(tmp_numa)
+
+ extended.update(
+ Ns._process_guest_epa_quota_params(
+ guest_epa_quota=guest_epa,
+ epa_vcpu_set=epa_vcpu_set,
+ )
+ )
+
+ if numa:
+ extended["numas"] = [numa]
+
+ return extended
+
+ @staticmethod
+ def _process_flavor_params(
+ target_flavor: Dict[str, Any],
+ indata: Dict[str, Any],
+ vim_info: Dict[str, Any],
+ target_record_id: str,
+ ) -> Dict[str, Any]:
+ """[summary]
+
+ Args:
+ target_flavor (Dict[str, Any]): [description]
+ indata (Dict[str, Any]): [description]
+ vim_info (Dict[str, Any]): [description]
+ target_record_id (str): [description]
+
+ Returns:
+ Dict[str, Any]: [description]
+ """
+ flavor_data = {
+ "disk": int(target_flavor["storage-gb"]),
+ "ram": int(target_flavor["memory-mb"]),
+ "vcpus": int(target_flavor["vcpu-count"]),
+ }
+
+ target_vdur = {}
+ for vnf in indata.get("vnf", []):
+ for vdur in vnf.get("vdur", []):
+ if vdur.get("ns-flavor-id") == target_flavor["id"]:
+ target_vdur = vdur
+
+ for storage in target_vdur.get("virtual-storages", []):
+ if (
+ storage.get("type-of-storage")
+ == "etsi-nfv-descriptors:ephemeral-storage"
+ ):
+ flavor_data["ephemeral"] = int(storage.get("size-of-storage", 0))
+ elif storage.get("type-of-storage") == "etsi-nfv-descriptors:swap-storage":
+ flavor_data["swap"] = int(storage.get("size-of-storage", 0))
+
+ extended = Ns._process_epa_params(target_flavor)
+ if extended:
+ flavor_data["extended"] = extended
+
+ extra_dict = {"find_params": {"flavor_data": flavor_data}}
+ flavor_data_name = flavor_data.copy()
+ flavor_data_name["name"] = target_flavor["name"]
+ extra_dict["params"] = {"flavor_data": flavor_data_name}
+
+ return extra_dict
+
def deploy(self, session, indata, version, nsr_id, *args, **kwargs):
self.logger.debug("ns.deploy nsr_id={} indata={}".format(nsr_id, indata))
validate_input(indata, deploy_schema)
index += 1
- def _create_task(
- target_id,
- item,
- action,
- target_record,
- target_record_id,
- extra_dict=None,
- ):
- nonlocal task_index
- nonlocal action_id
- nonlocal nsr_id
-
- task = {
- "target_id": target_id, # it will be removed before pushing at database
- "action_id": action_id,
- "nsr_id": nsr_id,
- "task_id": "{}:{}".format(action_id, task_index),
- "status": "SCHEDULED",
- "action": action,
- "item": item,
- "target_record": target_record,
- "target_record_id": target_record_id,
- }
-
- if extra_dict:
- task.update(extra_dict) # params, find_params, depends_on
-
- task_index += 1
-
- return task
-
- def _create_ro_task(target_id, task):
- nonlocal action_id
- nonlocal task_index
- nonlocal now
-
- _id = task["task_id"]
- db_ro_task = {
- "_id": _id,
- "locked_by": None,
- "locked_at": 0.0,
- "target_id": target_id,
- "vim_info": {
- "created": False,
- "created_items": None,
- "vim_id": None,
- "vim_name": None,
- "vim_status": None,
- "vim_details": None,
- "refresh_at": None,
- },
- "modified_at": now,
- "created_at": now,
- "to_check_at": now,
- "tasks": [task],
- }
-
- return db_ro_task
-
- def _process_image_params(target_image, vim_info, target_record_id):
- find_params = {}
-
- if target_image.get("image"):
- find_params["filter_dict"] = {"name": target_image.get("image")}
-
- if target_image.get("vim_image_id"):
- find_params["filter_dict"] = {
- "id": target_image.get("vim_image_id")
- }
-
- if target_image.get("image_checksum"):
- find_params["filter_dict"] = {
- "checksum": target_image.get("image_checksum")
- }
-
- return {"find_params": find_params}
-
- def _process_flavor_params(target_flavor, vim_info, target_record_id):
- def _get_resource_allocation_params(quota_descriptor):
- """
- read the quota_descriptor from vnfd and fetch the resource allocation properties from the
- descriptor object
- :param quota_descriptor: cpu/mem/vif/disk-io quota descriptor
- :return: quota params for limit, reserve, shares from the descriptor object
- """
- quota = {}
-
- if quota_descriptor.get("limit"):
- quota["limit"] = int(quota_descriptor["limit"])
-
- if quota_descriptor.get("reserve"):
- quota["reserve"] = int(quota_descriptor["reserve"])
-
- if quota_descriptor.get("shares"):
- quota["shares"] = int(quota_descriptor["shares"])
-
- return quota
-
- flavor_data = {
- "disk": int(target_flavor["storage-gb"]),
- "ram": int(target_flavor["memory-mb"]),
- "vcpus": int(target_flavor["vcpu-count"]),
- }
- numa = {}
- extended = {}
-
- if target_flavor.get("guest-epa"):
- extended = {}
- epa_vcpu_set = False
-
- if target_flavor["guest-epa"].get("numa-node-policy"):
- numa_node_policy = target_flavor["guest-epa"].get(
- "numa-node-policy"
- )
-
- if numa_node_policy.get("node"):
- numa_node = numa_node_policy["node"][0]
-
- if numa_node.get("num-cores"):
- numa["cores"] = numa_node["num-cores"]
- epa_vcpu_set = True
-
- if numa_node.get("paired-threads"):
- if numa_node["paired-threads"].get(
- "num-paired-threads"
- ):
- numa["paired-threads"] = int(
- numa_node["paired-threads"][
- "num-paired-threads"
- ]
- )
- epa_vcpu_set = True
-
- if len(
- numa_node["paired-threads"].get("paired-thread-ids")
- ):
- numa["paired-threads-id"] = []
-
- for pair in numa_node["paired-threads"][
- "paired-thread-ids"
- ]:
- numa["paired-threads-id"].append(
- (
- str(pair["thread-a"]),
- str(pair["thread-b"]),
- )
- )
-
- if numa_node.get("num-threads"):
- numa["threads"] = int(numa_node["num-threads"])
- epa_vcpu_set = True
-
- if numa_node.get("memory-mb"):
- numa["memory"] = max(
- int(numa_node["memory-mb"] / 1024), 1
- )
-
- if target_flavor["guest-epa"].get("mempage-size"):
- extended["mempage-size"] = target_flavor["guest-epa"].get(
- "mempage-size"
- )
-
- if (
- target_flavor["guest-epa"].get("cpu-pinning-policy")
- and not epa_vcpu_set
- ):
- if (
- target_flavor["guest-epa"]["cpu-pinning-policy"]
- == "DEDICATED"
- ):
- if (
- target_flavor["guest-epa"].get(
- "cpu-thread-pinning-policy"
- )
- and target_flavor["guest-epa"][
- "cpu-thread-pinning-policy"
- ]
- != "PREFER"
- ):
- numa["cores"] = max(flavor_data["vcpus"], 1)
- else:
- numa["threads"] = max(flavor_data["vcpus"], 1)
-
- epa_vcpu_set = True
-
- if target_flavor["guest-epa"].get("cpu-quota") and not epa_vcpu_set:
- cpuquota = _get_resource_allocation_params(
- target_flavor["guest-epa"].get("cpu-quota")
- )
-
- if cpuquota:
- extended["cpu-quota"] = cpuquota
-
- if target_flavor["guest-epa"].get("mem-quota"):
- vduquota = _get_resource_allocation_params(
- target_flavor["guest-epa"].get("mem-quota")
- )
-
- if vduquota:
- extended["mem-quota"] = vduquota
-
- if target_flavor["guest-epa"].get("disk-io-quota"):
- diskioquota = _get_resource_allocation_params(
- target_flavor["guest-epa"].get("disk-io-quota")
- )
-
- if diskioquota:
- extended["disk-io-quota"] = diskioquota
-
- if target_flavor["guest-epa"].get("vif-quota"):
- vifquota = _get_resource_allocation_params(
- target_flavor["guest-epa"].get("vif-quota")
- )
-
- if vifquota:
- extended["vif-quota"] = vifquota
-
- if numa:
- extended["numas"] = [numa]
-
- if extended:
- flavor_data["extended"] = extended
-
- extra_dict = {"find_params": {"flavor_data": flavor_data}}
- flavor_data_name = flavor_data.copy()
- flavor_data_name["name"] = target_flavor["name"]
- extra_dict["params"] = {"flavor_data": flavor_data_name}
-
- return extra_dict
-
def _ip_profile_2_ro(ip_profile):
if not ip_profile:
return None
"dhcp_start_address": ip_profile.get("dhcp-params", {}).get(
"start-address", None
),
- "dhcp_count": ip_profile.get("dhcp-params", {}).get(
- "count", None
- ),
+ "dhcp_count": ip_profile.get("dhcp-params", {}).get("count", None),
}
if ip_profile.get("dns-server"):
return ro_ip_profile
- def _process_net_params(target_vld, vim_info, target_record_id):
- nonlocal indata
+ def _process_net_params(target_vld, indata, vim_info, target_record_id):
extra_dict = {}
if vim_info.get("sdn"):
return extra_dict
- def _process_vdu_params(target_vdu, vim_info, target_record_id):
+ def _process_vdu_params(target_vdu, indata, vim_info, target_record_id):
nonlocal vnfr_id
nonlocal nsr_id
- nonlocal indata
nonlocal vnfr
nonlocal vdu2cloud_init
nonlocal tasks_by_target_record_id
extra_dict["depends_on"].append(net_text)
if "port-security-enabled" in interface:
- interface["port_security"] = (
- interface.pop("port-security-enabled")
+ interface["port_security"] = interface.pop(
+ "port-security-enabled"
)
if "port-security-disable-strategy" in interface:
- interface["port_security_disable_strategy"] = (
- interface.pop("port-security-disable-strategy")
+ interface["port_security_disable_strategy"] = interface.pop(
+ "port-security-disable-strategy"
)
net_item = {
if ssh_keys:
cloud_config["key-pairs"] = ssh_keys
+ disk_list = None
+ if target_vdu.get("virtual-storages"):
+ disk_list = [
+ {"size": disk["size-of-storage"]}
+ for disk in target_vdu["virtual-storages"]
+ if disk.get("type-of-storage")
+ == "persistent-storage:persistent-storage"
+ ]
+
extra_dict["params"] = {
"name": "{}-{}-{}-{}".format(
indata["name"][:16],
"flavor_id": "TASK-" + flavor_text,
"net_list": net_list,
"cloud_config": cloud_config or None,
- "disk_list": None, # TODO
+ "disk_list": disk_list,
"availability_zone_index": None, # TODO
"availability_zone_list": None, # TODO
}
):
nonlocal db_new_tasks
nonlocal tasks_by_target_record_id
+ nonlocal action_id
+ nonlocal nsr_id
nonlocal task_index
+ nonlocal indata
# ensure all the target_list elements has an "id". If not assign the index as id
for target_index, tl in enumerate(target_list):
item_ = "sdn_net"
target_record_id += ".sdn"
- task = _create_task(
- target_vim,
- item_,
- "DELETE",
- target_record="{}.{}.vim_info.{}".format(
- db_record, item_index, target_vim
- ),
+ deployment_info = {
+ "action_id": action_id,
+ "nsr_id": nsr_id,
+ "task_index": task_index,
+ }
+
+ task = Ns._create_task(
+ deployment_info=deployment_info,
+ target_id=target_vim,
+ item=item_,
+ action="DELETE",
+ target_record=f"{db_record}.{item_index}.vim_info.{target_vim}",
target_record_id=target_record_id,
)
+
+ task_index = deployment_info.get("task_index")
+
tasks_by_target_record_id[target_record_id] = task
db_new_tasks.append(task)
# TODO delete
target_record_id += ".sdn"
extra_dict = process_params(
- target_item, target_viminfo, target_record_id
+ target_item, indata, target_viminfo, target_record_id
)
self._assign_vim(target_vim)
- task = _create_task(
- target_vim,
- item_,
- "CREATE",
- target_record="{}.{}.vim_info.{}".format(
- db_record, item_index, target_vim
- ),
+
+ deployment_info = {
+ "action_id": action_id,
+ "nsr_id": nsr_id,
+ "task_index": task_index,
+ }
+
+ task = Ns._create_task(
+ deployment_info=deployment_info,
+ target_id=target_vim,
+ item=item_,
+ action="CREATE",
+ target_record=f"{db_record}.{item_index}.vim_info.{target_vim}",
target_record_id=target_record_id,
extra_dict=extra_dict,
)
+
+ task_index = deployment_info.get("task_index")
+
tasks_by_target_record_id[target_record_id] = task
db_new_tasks.append(task)
def _process_action(indata):
nonlocal db_new_tasks
+ nonlocal action_id
+ nonlocal nsr_id
nonlocal task_index
nonlocal db_vnfrs
nonlocal db_ro_nsr
],
},
}
- task = _create_task(
- target_vim,
- "vdu",
- "EXEC",
+
+ deployment_info = {
+ "action_id": action_id,
+ "nsr_id": nsr_id,
+ "task_index": task_index,
+ }
+
+ task = Ns._create_task(
+ deployment_info=deployment_info,
+ target_id=target_vim,
+ item="vdu",
+ action="EXEC",
target_record=target_record,
target_record_id=None,
extra_dict=extra_dict,
)
+
+ task_index = deployment_info.get("task_index")
+
db_new_tasks.append(task)
with self.write_lock:
db_update=db_nsr_update,
db_path="image",
item="image",
- process_params=_process_image_params,
+ process_params=Ns._process_image_params,
)
step = "process NS flavors"
db_update=db_nsr_update,
db_path="flavor",
item="flavor",
- process_params=_process_flavor_params,
+ process_params=Ns._process_flavor_params,
)
# VNF.vld
):
# Create a ro_task
step = "Updating database, Creating ro_tasks"
- db_ro_task = _create_ro_task(target_id, db_task)
+ db_ro_task = Ns._create_ro_task(target_id, db_task)
nb_ro_tasks += 1
self.db.create("ro_tasks", db_ro_task)
projects / osm / RO.git / blobdiff