X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=descriptor-packages%2Ftools%2Fupgrade_descriptor_version.py;h=7db1ec6f119a010487947c00c8022fe63bcaf6c0;hb=84fe31f632166d2fbf566968bd25aa9545e96fdc;hp=c830e521a90cefe98c2f81b541487d9f824cacb4;hpb=586f6c4d78a8bc462597652ac7699fac0630db1b;p=osm%2Fdevops.git diff --git a/descriptor-packages/tools/upgrade_descriptor_version.py b/descriptor-packages/tools/upgrade_descriptor_version.py index c830e521..7db1ec6f 100755 --- a/descriptor-packages/tools/upgrade_descriptor_version.py +++ b/descriptor-packages/tools/upgrade_descriptor_version.py @@ -129,6 +129,31 @@ if __name__=="__main__": if "vnfd:vnfd-catalog" in data or "vnfd-catalog" in data: descriptor = "VNF" + #Check if mgmt-interface is defined: + remove_prefix(data, "vnfd:") + vnfd_descriptor = data["vnfd-catalog"] + vnfd_list = vnfd_descriptor["vnfd"] + mgmt_iface = False + for vnfd in vnfd_list: + vdu_list = vnfd["vdu"] + for vdu in vdu_list: + interface_list = [] + external_interface_list = vdu.pop("external-interface", ()) + for external_interface in external_interface_list: + if external_interface.get("virtual-interface", {}).get("type") == "OM-MGMT": + raise KeyError( + "Wrong 'Virtual-interface type': Deprecated 'OM-MGMT' value. Please, use 'VIRTIO' instead") + interface_list = vdu.pop("interface", ()) + for interface in interface_list: + if interface.get("virtual-interface", {}).get("type") == "OM-MGMT": + raise KeyError( + "Wrong 'Virtual-interface type': Deprecated 'OM-MGMT' value. Please, use 'VIRTIO' instead") + if vnfd.get("mgmt-interface"): + mgmt_iface = True + if vnfd["mgmt-interface"].get("vdu-id"): + raise KeyError("'mgmt-iface': Deprecated 'vdu-id' field. Please, use 'cp' field instead") + if not mgmt_iface: + raise KeyError("'mgmt-iface' is a mandatory field and it is not defined") myvnfd = vnfd_catalog.vnfd() pybindJSONDecoder.load_ietf_json(data, None, None, obj=myvnfd) elif "nsd:nsd-catalog" in data or "nsd-catalog" in data: @@ -165,7 +190,7 @@ if __name__=="__main__": if "vnf-configuration" in vnfd and "service-primitive" in vnfd["vnf-configuration"]: vnfd["vnf-configuration"]["config-primitive"] = vnfd["vnf-configuration"].pop("service-primitive") - #Convert to capital letters vnf-configuration:service-primitive:parameter:data-type + # Convert to capital letters vnf-configuration:service-primitive:parameter:data-type if "vnf-configuration" in vnfd and "config-primitive" in vnfd["vnf-configuration"]: error_position.append("vnf-configuration") error_position.append("config-primitive") @@ -183,6 +208,7 @@ if __name__=="__main__": # Iterate with vdu:interfaces vdu_list = vnfd["vdu"] error_position.append("vdu") + vdu2mgmt_cp = {} # internal dict to indicate management interface for each vdu for vdu in vdu_list: error_position[-1] = "vdu[{}]".format(vdu["id"]) # Change external/internal interface @@ -191,9 +217,15 @@ if __name__=="__main__": error_position.append("external-interface") for external_interface in external_interface_list: error_position[-1] = "external-interface[{}]".format(external_interface["name"]) + if "rw-vnfd:floating-ip-needed" in external_interface: + del external_interface["rw-vnfd:floating-ip-needed"] external_interface["type"] = "EXTERNAL" external_interface["external-connection-point-ref"] = \ external_interface.pop("vnfd-connection-point-ref") + if external_interface.get("virtual-interface", {}).get("type") == "OM-MGMT": + external_interface["virtual-interface"]["type"] = "VIRTIO" + if vdu["id"] not in vdu2mgmt_cp: + vdu2mgmt_cp[vdu["id"]] = external_interface["external-connection-point-ref"] interface_list.append(external_interface) error_position.pop() internal_interface_list = vdu.pop("internal-interface", ()) @@ -206,18 +238,52 @@ if __name__=="__main__": interface_list.append(internal_interface) error_position.pop() + #Removing "rw-vnfd:floating-ip-needed" items from V3 descriptors + interfaces = vdu.pop("interface", ()) + for iface in interfaces: + if "rw-vnfd:floating-ip-needed" in iface: + del iface["rw-vnfd:floating-ip-needed"] + interface_list.append(iface) + + # order interface alphabetically and set position + if interface_list: + interface_list = sorted(interface_list, + key=lambda k: k.get('external-connection-point-ref', + k.get('internal-connection-point-ref'))) + index = 1 + for i in interface_list: + i["position"] = str(index) + index += 1 + + vdu["interface"] = interface_list error_position.pop() + # change mgmt-interface + if vnfd.get("mgmt-interface"): + error_position.append("mgmt-interface") + vdu_id = vnfd["mgmt-interface"].pop("vdu-id", None) + if vdu_id: + error_position.append("vdu-id") + vnfd["mgmt-interface"]["cp"] = vdu2mgmt_cp[vdu_id] + error_position.pop() + error_position.pop() error_position = [] elif "nsd:nsd-catalog" in data or "nsd-catalog" in data: remove_prefix(data, "nsd:") error_position.append("nsd-catalog") nsd_descriptor = data["nsd-catalog"] - nsd_list = nsd_descriptor["nsd"] error_position.append("nsd") for nsd in nsd_list: error_position[-1] = "nsd[{}]".format(nsd["id"]) - + # set mgmt-network to true + error_position.append("vld") + vld_list = nsd.get("vld", ()) + for vld in vld_list: + error_position[-1] = "vld[{}]".format(vld["id"]) + if "mgmt" in vld["name"].lower() or "management" in vld["name"].lower(): + vld['mgmt-network'] = 'true' + break + error_position.pop() # Change initial-config-primitive into initial-service-primitive if "initial-config-primitive" in nsd: nsd['initial-service-primitive'] = nsd.pop("initial-config-primitive")