commit f0f83a3ca9d8a94e464721ca0d99c5ff5d47f405
author aktas <emin.aktas@ulakhaberlesme.com.tr> Fri Feb 12 22:19:10 2021 +0300
committer garciadeblas <gerardo.garciadeblas@telefonica.com> Tue Mar 02 20:55:48 2021 +0000
tree cd9cbbe5870c7d6ee7b88c3a3a5352af14f85bd2
parent 762b6e7182f5bbba4b4206b12204e77bd45c3d33

Bug 585 Fix for scaling

This fix should be merged with this
https://osm.etsi.org/gerrit/c/osm/N2VC/+/10364

Change-Id: I43fb4e5c81dbbaed07f01ba1a3ba399f7425b347
Signed-off-by: aktas <emin.aktas@ulakhaberlesme.com.tr>
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>

osm_lcm/data_utils/vnfd.py

diff --git a/osm_lcm/data_utils/vnfd.py b/osm_lcm/data_utils/vnfd.py
index f816a8d..1b45b53 100644
--- a/osm_lcm/data_utils/vnfd.py
+++ b/osm_lcm/data_utils/vnfd.py
@@ -96,7 +96,7 @@
     if not ops_vnf:
         return None
     day12ops = ops_vnf.get("day1-2", [])
-    list_utils.find_in_list(
+    return list_utils.find_in_list(
         day12ops,
         lambda configuration: configuration["id"] == entity_id)
 
@@ -138,7 +138,7 @@
             ()
         ),
         lambda a_vdu: a_vdu["vdu-id"] == vdu_id
-    )["number-of-instances"]
+    ).get("number-of-instances", 1)
 
 
 def get_juju_ee_ref(vnfd, entity_id):

osm_lcm/data_utils/vnfr.py

diff --git a/osm_lcm/data_utils/vnfr.py b/osm_lcm/data_utils/vnfr.py
index 042788e..9c0b148 100644
--- a/osm_lcm/data_utils/vnfr.py
+++ b/osm_lcm/data_utils/vnfr.py
@@ -23,6 +23,7 @@
 ##
 
 from osm_lcm.data_utils import list_utils
+from osm_lcm.lcm_utils import get_iterable
 
 
 def find_VNFR_by_VDU_ID(vnfr, vdu_id):
@@ -57,3 +58,11 @@
             osm_params["vdu_id"] = vdu_id
             osm_params["count_index"] = vdu_count_index
     return osm_params
+
+
+def get_vdur_index(db_vnfr, vdu_delta):
+    vdur_list = get_iterable(db_vnfr, "vdur")
+    if vdur_list:
+        return len([x for x in vdur_list if x.get("vdu-id-ref") == vdu_delta["id"]])
+    else:
+        return 0