commit 25dabb3e5c4271c44d8490a525fc44481fb105ef
author Jithin Jose <jithin.jose@riftio.com> Mon Apr 03 10:32:58 2017 +0000
committer Jithin Jose <jithin.jose@riftio.com> Mon Apr 03 10:32:58 2017 +0000
tree 4a0343241ed370e13d355a25fb0bd2b65a7fa1d7
parent 5961867a2cc6674a576e1a2fb836c1bf5779ec12

Set VCPUs and RAM for the VNFC irrespective of Numa Node Policy of the Guest EPA

Signed-off-by: Jithin Jose <jithin.jose@riftio.com>

models/openmano/python/rift/openmano/rift2openmano.py

diff --git a/models/openmano/python/rift/openmano/rift2openmano.py b/models/openmano/python/rift/openmano/rift2openmano.py
index 8043646..e7d2e35 100755
--- a/models/openmano/python/rift/openmano/rift2openmano.py
+++ b/models/openmano/python/rift/openmano/rift2openmano.py
@@ -499,12 +499,11 @@
                 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"):