X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_lcm%2Ftests%2Ftest_ns.py;h=ef87a4c4bc9e76b972c72059a672f6d75bd0cfa6;hb=b4ebcd0dd81e08d7294156c2aca10d84ca9bb824;hp=192f8e090b303dd66259e2602c56453c03749f8a;hpb=5697b8b03a3acd17827ce536cb8aff15df8776ad;p=osm%2FLCM.git

diff --git a/osm_lcm/tests/test_ns.py b/osm_lcm/tests/test_ns.py
index 192f8e0..ef87a4c 100644
--- a/osm_lcm/tests/test_ns.py
+++ b/osm_lcm/tests/test_ns.py
@@ -394,6 +394,37 @@ class TestMyNS(asynctest.TestCase):
         self.assertEqual(return_value, expected_value)
         # print("scale_result: {}".format(self.db.get_one("nslcmops", {"_id": nslcmop_id}).get("detailed-status")))
 
+        # Test scale() for native kdu
+        # this also includes testing _scale_kdu()
+        nsr_id = descriptors.test_ids["TEST-NATIVE-KDU"]["ns"]
+        nslcmop_id = descriptors.test_ids["TEST-NATIVE-KDU"]["instantiate"]
+
+        self.my_ns.k8sclusterjuju.scale = asynctest.mock.CoroutineMock()
+        self.my_ns.k8sclusterjuju.exec_primitive = asynctest.mock.CoroutineMock()
+        self.my_ns.k8sclusterjuju.get_scale_count = asynctest.mock.CoroutineMock(
+            return_value=1
+        )
+        await self.my_ns.scale(nsr_id, nslcmop_id)
+        expected_value = "COMPLETED"
+        return_value = self.db.get_one("nslcmops", {"_id": nslcmop_id}).get(
+            "operationState"
+        )
+        self.assertEqual(return_value, expected_value)
+        self.my_ns.k8sclusterjuju.scale.assert_called_once()
+
+        # Test scale() for native kdu with 2 resource
+        nsr_id = descriptors.test_ids["TEST-NATIVE-KDU-2"]["ns"]
+        nslcmop_id = descriptors.test_ids["TEST-NATIVE-KDU-2"]["instantiate"]
+
+        self.my_ns.k8sclusterjuju.get_scale_count.return_value = 2
+        await self.my_ns.scale(nsr_id, nslcmop_id)
+        expected_value = "COMPLETED"
+        return_value = self.db.get_one("nslcmops", {"_id": nslcmop_id}).get(
+            "operationState"
+        )
+        self.assertEqual(return_value, expected_value)
+        self.my_ns.k8sclusterjuju.scale.assert_called()
+
     async def test_vca_status_refresh(self):
         nsr_id = descriptors.test_ids["TEST-A"]["ns"]
         nslcmop_id = descriptors.test_ids["TEST-A"]["instantiate"]
@@ -415,7 +446,10 @@ class TestMyNS(asynctest.TestCase):
                                 "operate-vnf-op-config"
                             ]["day1-2"]
                         ):
-                            if "juju" in v["execution-environment-list"][k]:
+                            if (
+                                v.get("execution-environment-list")
+                                and "juju" in v["execution-environment-list"][k]
+                            ):
                                 expected_value = self.db.get_list("nsrs")[i][
                                     "vcaStatus"
                                 ]
@@ -720,6 +754,7 @@ class TestMyNS(asynctest.TestCase):
             "kdu-name": "ldap",
             "member-vnf-index": "multikdu",
             "namespace": None,
+            "kdu-deployment-name": None,
         }
 
         nsr_result = copy.deepcopy(db_nsr["_admin"]["deployed"]["K8s"][0])