Fix Bug 2012 use existing volumes as instantiation parameters

[osm/LCM.git] / osm_lcm / data_utils / vnfr.py

diff --git a/osm_lcm/data_utils/vnfr.py b/osm_lcm/data_utils/vnfr.py
index 9c0b148..fc64145 100644 (file)
--- 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,38 @@ 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
+
+
+def get_volumes_from_instantiation_params(
+    vdu_instantiation_params: dict, vdud: dict
+) -> list:
+    """Get the VDU volumes from instantiation parameters
+
+    Args:
+        vdu_instantiation_params:   VDU instantiation parameters
+        vdud:   VDU description as a dictionary extracted from VNFD
+    Returns:
+        vdu_volume_list:(list)
+
+    """
+    vdu_volume_list = []
+    if vdu_instantiation_params.get("volume"):
+        for volume in vdu_instantiation_params["volume"]:
+            if volume.get("vim-volume-id") and volume.get("name") in vdud.get(
+                "virtual-storage-desc"
+            ):
+                vdu_volume = {
+                    "name": volume["name"],
+                    "vim-volume-id": volume["vim-volume-id"],
+                }
+                vdu_volume_list.append(vdu_volume)
+
+    return vdu_volume_list