From 1ed705082a906a7f894c662775ff4d23caabff98 Mon Sep 17 00:00:00 2001 From: Jithin Jose Date: Mon, 3 Apr 2017 10:32:58 +0000 Subject: [PATCH] Set VCPUs and RAM for the VNFC irrespective of Numa Node Policy of the Guest EPA Signed-off-by: Jithin Jose --- models/openmano/python/rift/openmano/rift2openmano.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/models/openmano/python/rift/openmano/rift2openmano.py b/models/openmano/python/rift/openmano/rift2openmano.py index 80436461..e7d2e359 100755 --- a/models/openmano/python/rift/openmano/rift2openmano.py +++ b/models/openmano/python/rift/openmano/rift2openmano.py @@ -499,12 +499,11 @@ def rift2openmano_vnfd(rift_vnfd, rift_nsd): if vdu.vm_flavor.has_field("vcpu_count"): vnfc["numas"][0]["cores"] = max(vdu.vm_flavor.vcpu_count, 1) - else: - if vdu.vm_flavor.has_field("vcpu_count") and vdu.vm_flavor.vcpu_count: - vnfc["vcpus"] = vdu.vm_flavor.vcpu_count + if vdu.vm_flavor.has_field("vcpu_count") and vdu.vm_flavor.vcpu_count: + vnfc["vcpus"] = vdu.vm_flavor.vcpu_count - if vdu.vm_flavor.has_field("memory_mb") and vdu.vm_flavor.memory_mb: - vnfc["ram"] = vdu.vm_flavor.memory_mb + if vdu.vm_flavor.has_field("memory_mb") and vdu.vm_flavor.memory_mb: + vnfc["ram"] = vdu.vm_flavor.memory_mb if vdu.has_field("hypervisor_epa"): -- 2.25.1