commit 3fdf6a93baec6d042f79a44973a3d21ddf37bafc
author velandy <rajesh.velandy@riftio.com> Mon Apr 03 13:46:21 2017 +0200
committer Gerrit Code Review <root@osm.etsi.org> Mon Apr 03 13:46:21 2017 +0200
tree 9a1a0b9d69115f45a6c3458fa5d01a6cf452149e
parent aacad2bdff6bd772896841bb0df0eb8adabc43dd
parent 68e67b11b786da7d22af5d0e9e534ef67019aa0b

Merge "RIFT-14707 : Feedback on vnfd.yang comments"

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"):