From cf5966918898323a4efc3b1e97a794175e52dd5b Mon Sep 17 00:00:00 2001 From: tierno Date: Mon, 20 Nov 2017 15:47:51 +0100 Subject: [PATCH] fix bug at vnfd numa-node-policy node Change-Id: If11d949357c739339faa9be70d42e98428b51bd6 Signed-off-by: tierno --- openmanod | 2 +- osm_ro/nfvo.py | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/openmanod b/openmanod index 030d4ec6..ab9a7669 100755 --- a/openmanod +++ b/openmanod @@ -48,7 +48,7 @@ import osm_ro __author__ = "Alfonso Tierno, Gerardo Garcia, Pablo Montes" __date__ = "$26-aug-2014 11:09:29$" -__version__ = "0.5.42-r552" +__version__ = "0.5.43-r553" version_date = "Nov 2017" database_version = 27 # expected database schema version diff --git a/osm_ro/nfvo.py b/osm_ro/nfvo.py index bd9d3689..6dff906f 100644 --- a/osm_ro/nfvo.py +++ b/osm_ro/nfvo.py @@ -884,6 +884,11 @@ def new_vnfd_v3(mydb, tenant_id, vnf_descriptor): net_id2uuid[vld.get("id")] = net_uuid db_nets.append(db_net) + # connection points vaiable declaration + cp_name2iface_uuid = {} + cp_name2vm_uuid = {} + cp_name2db_interface = {} + # table vms (vdus) vdu_id2uuid = {} vdu_id2db_table_index = {} @@ -968,9 +973,6 @@ def new_vnfd_v3(mydb, tenant_id, vnf_descriptor): # table interfaces (internal/external interfaces) flavor_epa_interfaces = [] - cp_name2iface_uuid = {} - cp_name2vm_uuid = {} - cp_name2db_interface = {} vdu_id2cp_name = {} # stored only when one external connection point is presented at this VDU # for iface in chain(vdu.get("internal-interface").itervalues(), vdu.get("external-interface").itervalues()): for iface in vdu.get("interface").itervalues(): @@ -1071,7 +1073,7 @@ def new_vnfd_v3(mydb, tenant_id, vnf_descriptor): "ram": int(vdu["vm-flavor"].get("memory-mb", 1)), "disk": int(vdu["vm-flavor"].get("storage-gb", 1)), } - # EPA TODO revise + # TODO revise the case of several numa-node-policy node extended = {} numa = {} if devices: @@ -1083,7 +1085,7 @@ def new_vnfd_v3(mydb, tenant_id, vnf_descriptor): if vdu["guest-epa"].get("numa-node-policy"): # TODO or dedicated_int: numa_node_policy = vdu["guest-epa"].get("numa-node-policy") if numa_node_policy.get("node"): - numa_node = numa_node_policy["node"]['0'] + numa_node = numa_node_policy["node"].values()[0] if numa_node.get("num-cores"): numa["cores"] = numa_node["num-cores"] epa_vcpu_set = True -- 2.17.1