X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=models%2Fopenmano%2Fpython%2Frift%2Fopenmano%2Frift2openmano.py;h=d76c470882122abd361cd343fb9ed205ad71b90d;hb=310f79b76a53696f1d1a0d4a5a0f4df1c3868781;hp=b1d1c8b06e70b6dd3a4384b4549e5e31482413eb;hpb=31ac78c0cd7becefeffe532a7329a2fe2a2b6081;p=osm%2FSO.git diff --git a/models/openmano/python/rift/openmano/rift2openmano.py b/models/openmano/python/rift/openmano/rift2openmano.py index b1d1c8b0..d76c4708 100755 --- a/models/openmano/python/rift/openmano/rift2openmano.py +++ b/models/openmano/python/rift/openmano/rift2openmano.py @@ -559,6 +559,9 @@ def rift2openmano_vnfd(rift_vnfd, rift_nsd): if numa_node_policy.has_field("node"): numa_node = numa_node_policy.node[0] + if numa_node.has_field("num_cores"): + vnfc["numas"][0]["cores"] = numa_node.num_cores + if numa_node.has_field("paired_threads"): if numa_node.paired_threads.has_field("num_paired_threads"): vnfc["numas"][0]["paired-threads"] = numa_node.paired_threads.num_paired_threads @@ -615,9 +618,12 @@ def rift2openmano_vnfd(rift_vnfd, rift_nsd): # Add Openmano devices device = {} device["type"] = volume.device_type - device["image name"] = volume.image - if volume.has_field("image_checksum"): - device["image checksum"] = volume.image_checksum + if volume.has_field("size"): + device["size"] = volume.size + if volume.has_field("image"): + device["image name"] = volume.image + if volume.has_field("image_checksum"): + device["image checksum"] = volume.image_checksum vnfc["devices"].append(device) vnfc_boot_data_init = False