X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FRO.git;a=blobdiff_plain;f=NG-RO%2Fosm_ng_ro%2Fns.py;h=ee0463a4db662f802e9c21030e72c4ebd0fe2023;hp=e62eef59207fa72ef9b26f47768e12313447c432;hb=refs%2Fchanges%2F44%2F11344%2F2;hpb=38d1217c445a5fd45aacae22541903439992e0ac diff --git a/NG-RO/osm_ng_ro/ns.py b/NG-RO/osm_ng_ro/ns.py index e62eef59..ee0463a4 100644 --- a/NG-RO/osm_ng_ro/ns.py +++ b/NG-RO/osm_ng_ro/ns.py @@ -687,9 +687,7 @@ class Ns(object): "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"): @@ -787,13 +785,13 @@ class Ns(object): 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 = { @@ -879,6 +877,15 @@ class Ns(object): 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], @@ -892,7 +899,7 @@ class Ns(object): "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 }