X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=NG-RO%2Fosm_ng_ro%2Fns.py;h=a8d7e643b55037fd2b3d7a4be6543d43abe30f3d;hb=a3aca8c5270edf3b13bdcc4ca14e1cf0175d6c5f;hp=c6f918b27b9ee93dabd67df78585de7e0b3a5191;hpb=4bc8eb99dbadadf5013de93fcb424038149e1576;p=osm%2FRO.git diff --git a/NG-RO/osm_ng_ro/ns.py b/NG-RO/osm_ng_ro/ns.py index c6f918b2..a8d7e643 100644 --- a/NG-RO/osm_ng_ro/ns.py +++ b/NG-RO/osm_ng_ro/ns.py @@ -722,9 +722,12 @@ class Ns(object): guest_epa_quota.get("cpu-pinning-policy") == "DEDICATED" and not epa_vcpu_set ): + # Pinning policy "REQUIRE" uses threads as host should support SMT architecture + # Pinning policy "ISOLATE" uses cores as host should not support SMT architecture + # Pinning policy "PREFER" uses threads in case host supports SMT architecture numa[ "cores" - if guest_epa_quota.get("cpu-thread-pinning-policy") != "PREFER" + if guest_epa_quota.get("cpu-thread-pinning-policy") == "ISOLATE" else "threads" ] = max(vcpu_count, 1) local_epa_vcpu_set = True @@ -949,7 +952,7 @@ class Ns(object): "id": vim_info.get("vim_network_id"), }, } - elif target_vld.get("mgmt-network"): + elif target_vld.get("mgmt-network") and not vim_info.get("provider_network"): extra_dict["find_params"] = { "mgmt": True, "name": target_vld["id"], @@ -1009,12 +1012,10 @@ class Ns(object): == "persistent-storage:persistent-storage" ): for vdu_volume in vdu_instantiation_volumes_list: - if ( vdu_volume["vim-volume-id"] and root_disk["id"] == vdu_volume["name"] ): - persistent_root_disk[vsd["id"]] = { "vim_volume_id": vdu_volume["vim-volume-id"], "image_id": vdu.get("sw-image-desc"), @@ -1025,11 +1026,11 @@ class Ns(object): return persistent_root_disk else: - if root_disk.get("size-of-storage"): persistent_root_disk[vsd["id"]] = { "image_id": vdu.get("sw-image-desc"), "size": root_disk.get("size-of-storage"), + "keep": Ns.is_volume_keeping_required(root_disk), } disk_list.append(persistent_root_disk[vsd["id"]]) @@ -1061,9 +1062,7 @@ class Ns(object): and disk["id"] not in persistent_root_disk.keys() ): for vdu_volume in vdu_instantiation_volumes_list: - if vdu_volume["vim-volume-id"] and disk["id"] == vdu_volume["name"]: - persistent_disk[disk["id"]] = { "vim_volume_id": vdu_volume["vim-volume-id"], } @@ -1073,9 +1072,29 @@ class Ns(object): if disk["id"] not in persistent_disk.keys(): persistent_disk[disk["id"]] = { "size": disk.get("size-of-storage"), + "keep": Ns.is_volume_keeping_required(disk), } disk_list.append(persistent_disk[disk["id"]]) + @staticmethod + def is_volume_keeping_required(virtual_storage_desc: Dict[str, Any]) -> bool: + """Function to decide keeping persistent volume + upon VDU deletion. + + Args: + virtual_storage_desc (Dict[str, Any]): virtual storage description dictionary + + Returns: + bool (True/False) + """ + + if not virtual_storage_desc.get("vdu-storage-requirements"): + return False + for item in virtual_storage_desc.get("vdu-storage-requirements", {}): + if item.get("key") == "keep-volume" and item.get("value") == "true": + return True + return False + @staticmethod def _sort_vdu_interfaces(target_vdu: dict) -> None: """Sort the interfaces according to position number. @@ -1302,7 +1321,6 @@ class Ns(object): net_list (list): Net list of VDU """ for iface_index, interface in enumerate(target_vdu["interfaces"]): - net_text = Ns._check_vld_information_of_interfaces( interface, ns_preffix, vnf_preffix ) @@ -1397,13 +1415,13 @@ class Ns(object): if vdu["name"] == target_vdu["vdu-name"]: for vsd in vnfd.get("virtual-storage-desc", ()): root_disk = Ns._select_persistent_root_disk(vsd, vdu) - if not root_disk: continue persistent_root_disk[vsd["id"]] = { "image_id": vdu.get("sw-image-desc"), "size": root_disk["size-of-storage"], + "keep": Ns.is_volume_keeping_required(root_disk), } disk_list.append(persistent_root_disk[vsd["id"]]) @@ -1434,6 +1452,7 @@ class Ns(object): ): persistent_ordinary_disk[disk["id"]] = { "size": disk["size-of-storage"], + "keep": Ns.is_volume_keeping_required(disk), } disk_list.append(persistent_ordinary_disk[disk["id"]]) @@ -1520,13 +1539,11 @@ class Ns(object): True if i.get("position") is not None else False for i in target_vdu["interfaces"] ): - Ns._sort_vdu_interfaces(target_vdu) # If the position info is provided for some interfaces but not all of them, the interfaces # which has specific position numbers will be placed and others' positions will not be taken care. else: - Ns._partially_locate_vdu_interfaces(target_vdu) # If the position info is not provided for the interfaces, interfaces will be attached @@ -1553,7 +1570,6 @@ class Ns(object): ) if vdu_instantiation_volumes_list: - # Find the root volumes and add to the disk_list persistent_root_disk = Ns.find_persistent_root_volumes( vnfd, target_vdu, vdu_instantiation_volumes_list, disk_list @@ -1679,7 +1695,6 @@ class Ns(object): vim_details = yaml.safe_load(f"{vim_details_text}") for iface_index, interface in enumerate(existing_vdu["interfaces"]): - if "port-security-enabled" in interface: interface["port_security"] = interface.pop("port-security-enabled") @@ -2326,15 +2341,23 @@ class Ns(object): # Check each VNF of the target for target_vnf in target_list: - # Find this VNF in the list from DB - vnfr_id = target_vnf.get("vnfInstanceId", None) - if vnfr_id: - existing_vnf = db_vnfrs.get(vnfr_id) - db_record = "vnfrs:{}:{}".format(vnfr_id, db_path) - # vim_account_id = existing_vnf.get("vim-account-id", "") + # Find this VNF in the list from DB, raise exception if vnfInstanceId is not found + vnfr_id = target_vnf["vnfInstanceId"] + existing_vnf = db_vnfrs.get(vnfr_id) + db_record = "vnfrs:{}:{}".format(vnfr_id, db_path) + # vim_account_id = existing_vnf.get("vim-account-id", "") + target_vdus = target_vnf.get("additionalParams", {}).get("vdu", []) # Check each VDU of this VNF - for target_vdu in target_vnf["additionalParams"].get("vdu", None): + if not target_vdus: + # Create target_vdu_list from DB, if VDUs are not specified + target_vdus = [] + for existing_vdu in existing_vnf.get("vdur"): + vdu_name = existing_vdu.get("vdu-name", None) + vdu_index = existing_vdu.get("count-index", 0) + vdu_to_be_healed = {"vdu-id": vdu_name, "count-index": vdu_index} + target_vdus.append(vdu_to_be_healed) + for target_vdu in target_vdus: vdu_name = target_vdu.get("vdu-id", None) # For multi instance VDU count-index is mandatory # For single session VDU count-indes is 0 @@ -3008,7 +3031,6 @@ class Ns(object): task_index += 1 break else: - for vdu_index, vdu in enumerate(db_vnfr["vdur"]): extra_dict["params"] = { "vim_vm_id": vdu["vim-id"],