X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_lcm%2Fdata_utils%2Fvnfr.py;h=fe9810257f5b509b3ec10c071cd33658acfec5cb;hb=refs%2Fheads%2Fv10.0;hp=9c0b14826df4c86382bb35d44e210885a32e9160;hpb=132515638cd925a0d070fbf5b08f21ae7ddce05c;p=osm%2FLCM.git diff --git a/osm_lcm/data_utils/vnfr.py b/osm_lcm/data_utils/vnfr.py index 9c0b148..fe98102 100644 --- a/osm_lcm/data_utils/vnfr.py +++ b/osm_lcm/data_utils/vnfr.py @@ -32,7 +32,8 @@ def find_VNFR_by_VDU_ID(vnfr, vdu_id): def get_osm_params(db_vnfr, vdu_id=None, vdu_count_index=0): osm_params = { - x.replace("-", "_"): db_vnfr[x] for x in ("ip-address", "vim-account-id", "vnfd-id", "vnfd-ref") + x.replace("-", "_"): db_vnfr[x] + for x in ("ip-address", "vim-account-id", "vnfd-id", "vnfd-ref") if db_vnfr.get(x) is not None } osm_params["ns_id"] = db_vnfr["nsr-id-ref"] @@ -44,14 +45,16 @@ def get_osm_params(db_vnfr, vdu_id=None, vdu_count_index=0): vdu = { "count_index": vdur["count-index"], "vdu_id": vdur["vdu-id-ref"], - "interfaces": {} + "interfaces": {}, } if vdur.get("ip-address"): vdu["ip_address"] = vdur["ip-address"] for iface in vdur["interfaces"]: - vdu["interfaces"][iface["name"]] = \ - {x.replace("-", "_"): iface[x] for x in ("mac-address", "ip-address", "name") - if iface.get(x) is not None} + vdu["interfaces"][iface["name"]] = { + x.replace("-", "_"): iface[x] + for x in ("mac-address", "ip-address", "name") + if iface.get(x) is not None + } vdu_id_index = "{}-{}".format(vdur["vdu-id-ref"], vdur["count-index"]) osm_params["vdu"][vdu_id_index] = vdu if vdu_id: @@ -66,3 +69,11 @@ def get_vdur_index(db_vnfr, vdu_delta): return len([x for x in vdur_list if x.get("vdu-id-ref") == vdu_delta["id"]]) else: return 0 + + +def get_kdur(db_vnfr, kdu_name): + kdur_list = get_iterable(db_vnfr, "kdur") + if kdur_list: + return next(x for x in kdur_list if x.get("kdu-name") == kdu_name) + else: + return None