X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_ro%2Fnfvo.py;h=9a2e5e1cf20e5ba951c2d6a923d38e44a7926b34;hb=1d55a23c9cd32f17bb7a6f21e5b6c2b476c5804f;hp=15f04d6e73e7d475fa719753be3eaae96cf6b22f;hpb=b7aa1bb3eaee2b986d3e192a4e3980c2fb1446b9;p=osm%2FRO.git diff --git a/osm_ro/nfvo.py b/osm_ro/nfvo.py index 15f04d6e..9a2e5e1c 100644 --- a/osm_ro/nfvo.py +++ b/osm_ro/nfvo.py @@ -1282,13 +1282,21 @@ def new_vnfd_v3(mydb, tenant_id, vnf_descriptor): numa["threads"] = max(db_flavor["vcpus"], 1) epa_vcpu_set = True if vdu["guest-epa"].get("cpu-quota") and not epa_vcpu_set: - extended["cpu-quota"] = get_resource_allocation_params(vdu["guest-epa"].get("cpu-quota")) + cpuquota = get_resource_allocation_params(vdu["guest-epa"].get("cpu-quota")) + if cpuquota: + extended["cpu-quota"] = cpuquota if vdu["guest-epa"].get("mem-quota"): - extended["mem-quota"] = get_resource_allocation_params(vdu["guest-epa"].get("mem-quota")) + vduquota = get_resource_allocation_params(vdu["guest-epa"].get("mem-quota")) + if vduquota: + extended["mem-quota"] = vduquota if vdu["guest-epa"].get("disk-io-quota"): - extended["disk-io-quota"] = get_resource_allocation_params(vdu["guest-epa"].get("disk-io-quota")) + diskioquota = get_resource_allocation_params(vdu["guest-epa"].get("disk-io-quota")) + if diskioquota: + extended["disk-io-quota"] = diskioquota if vdu["guest-epa"].get("vif-quota"): - extended["vif-quota"] = get_resource_allocation_params(vdu["guest-epa"].get("vif-quota")) + vifquota = get_resource_allocation_params(vdu["guest-epa"].get("vif-quota")) + if vifquota: + extended["vif-quota"] = vifquota if numa: extended["numas"] = [numa] if extended: