X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_lcm%2Ftests%2Ftest_ns.py;h=548ba5725a9a48dbe7e3a6bf87056cb96a9c891e;hb=refs%2Fchanges%2F89%2F8489%2F4;hp=9ad899d4fa6ad494834a4e8c4b6c88da833d663b;hpb=3bedc9bf2cf602bd3a67ba699d60ea49539ae9e5;p=osm%2FLCM.git diff --git a/osm_lcm/tests/test_ns.py b/osm_lcm/tests/test_ns.py index 9ad899d..548ba57 100644 --- a/osm_lcm/tests/test_ns.py +++ b/osm_lcm/tests/test_ns.py @@ -12,7 +12,7 @@ # under the License. # # For those usages not covered by the Apache License, Version 2.0 please -# contact: esousa@whitestack.com or alfonso.tiernosepulveda@telefonica.com +# contact: alfonso.tiernosepulveda@telefonica.com ## @@ -51,21 +51,23 @@ It allows, if some testing ENV are supplied, testing without mocking some extern OSMLCM_RO_XXX: configuration of RO """ - -vca_config = { # TODO replace with os.get_env to get other configurations - "host": getenv("OSMLCM_VCA_HOST", "vca"), - "port": getenv("OSMLCM_VCA_PORT", 17070), - "user": getenv("OSMLCM_VCA_USER", "admin"), - "secret": getenv("OSMLCM_VCA_SECRET", "vca"), - "pubkey": getenv("OSMLCM_VCA_PUBKEY", None), - 'cacert': getenv("OSMLCM_VCA_CACERT", None) -} - -ro_config = { - "endpoint_url": "http://{}:{}/openmano".format(getenv("OSMLCM_RO_HOST", "ro"), getenv("OSMLCM_RO_PORT", "9090")), - "tenant": getenv("OSMLCM_RO_TENANT", "osm"), - "logger_name": "lcm.ROclient", - "loglevel": "DEBUG", +lcm_config = { + "timeout": {}, + "VCA": { # TODO replace with os.get_env to get other configurations + "host": getenv("OSMLCM_VCA_HOST", "vca"), + "port": getenv("OSMLCM_VCA_PORT", 17070), + "user": getenv("OSMLCM_VCA_USER", "admin"), + "secret": getenv("OSMLCM_VCA_SECRET", "vca"), + "public_key": getenv("OSMLCM_VCA_PUBKEY", None), + 'ca_cert': getenv("OSMLCM_VCA_CACERT", None) + }, + "ro_config": { + "endpoint_url": "http://{}:{}/openmano".format(getenv("OSMLCM_RO_HOST", "ro"), + getenv("OSMLCM_RO_PORT", "9090")), + "tenant": getenv("OSMLCM_RO_TENANT", "osm"), + "logger_name": "lcm.ROclient", + "loglevel": "DEBUG", + } } @@ -132,8 +134,9 @@ class TestMyNS(asynctest.TestCase): def _return_uuid(self, *args, **kwargs): return str(uuid4()) + @patch("osm_lcm.ns.N2VCJujuConnector") @patch("osm_lcm.ns.K8sHelmConnector") - async def setUp(self, k8s_mock): + async def setUp(self, k8s_mock, n2vc_mock): # Mock DB if not getenv("OSMLCMTEST_DB_NOMOCK"): self.db = DbMemory() @@ -141,9 +144,9 @@ class TestMyNS(asynctest.TestCase): self.db.create_list("nsds", yaml.load(descriptors.db_nsds_text, Loader=yaml.Loader)) self.db.create_list("nsrs", yaml.load(descriptors.db_nsrs_text, Loader=yaml.Loader)) self.db.create_list("vim_accounts", yaml.load(descriptors.db_vim_accounts_text, Loader=yaml.Loader)) + self.db.create_list("k8sclusters", yaml.load(descriptors.db_k8sclusters_text, Loader=yaml.Loader)) self.db.create_list("nslcmops", yaml.load(descriptors.db_nslcmops_text, Loader=yaml.Loader)) self.db.create_list("vnfrs", yaml.load(descriptors.db_vnfrs_text, Loader=yaml.Loader)) - self.db.set_one = asynctest.Mock() self.db_vim_accounts = yaml.load(descriptors.db_vim_accounts_text, Loader=yaml.Loader) @@ -165,7 +168,8 @@ class TestMyNS(asynctest.TestCase): self.lcm_tasks.lookfor_related.return_value = ("", []) # Create NsLCM class - self.my_ns = NsLcm(self.db, self.msg, self.fs, self.lcm_tasks, ro_config, vca_config, self.loop) + self.my_ns = NsLcm(self.db, self.msg, self.fs, self.lcm_tasks, lcm_config, self.loop) + self.my_ns._wait_dependent_n2vc = asynctest.CoroutineMock() # Mock logging if not getenv("OSMLCMTEST_LOGGING_NOMOCK"): @@ -197,7 +201,7 @@ class TestMyNS(asynctest.TestCase): # Mock RO if not getenv("OSMLCMTEST_RO_NOMOCK"): - # self.my_ns.RO = asynctest.Mock(ROclient.ROClient(self.loop, **ro_config)) + # self.my_ns.RO = asynctest.Mock(ROclient.ROClient(self.loop, **lcm_config["ro_config"])) # TODO first time should be empty list, following should return a dict self.my_ns.RO.get_list = asynctest.CoroutineMock(self.my_ns.RO.get_list, return_value=[]) self.my_ns.RO.create = asynctest.CoroutineMock(self.my_ns.RO.create, side_effect=self._ro_create()) @@ -205,12 +209,14 @@ class TestMyNS(asynctest.TestCase): self.my_ns.RO.create_action = asynctest.CoroutineMock(self.my_ns.RO.create_action, return_value={"vm-id": {"vim_result": 200, "description": "done"}}) + # self.my_ns.wait_vm_up_insert_key_ro = asynctest.CoroutineMock(return_value="ip-address") @asynctest.fail_on(active_handles=True) # all async tasks must be completed async def test_instantiate(self): + self.db.set_one = asynctest.Mock() nsr_id = self.db.get_list("nsrs")[0]["_id"] nslcmop_id = self.db.get_list("nslcmops")[0]["_id"] - print("Test instantiate started") + # print("Test instantiate started") # delete deployed information of database if not getenv("OSMLCMTEST_DB_NOMOCK"): @@ -228,7 +234,8 @@ class TestMyNS(asynctest.TestCase): await self.my_ns.instantiate(nsr_id, nslcmop_id) - print("instantiate_result: {}".format(self.db.get_one("nslcmops", {"_id": nslcmop_id}).get("detailed-status"))) + # print("instantiate_result: {}".format(self.db.get_one("nslcmops", + # {"_id": nslcmop_id}).get("detailed-status"))) self.msg.aiowrite.assert_called_once_with("ns", "instantiated", {"nsr_id": nsr_id, "nslcmop_id": nslcmop_id, @@ -340,6 +347,7 @@ class TestMyNS(asynctest.TestCase): # Test _update_suboperation_status() def test_scale_update_suboperation_status(self): + self.db.set_one = asynctest.Mock() db_nslcmop = self.db.get_list('nslcmops')[0] op_index = 0 # Force the initial values to be distinct from the updated ones @@ -463,6 +471,28 @@ class TestMyNS(asynctest.TestCase): db_nslcmop, vnf_index, None, None, 'SCALE-RO', RO_nsr_id, RO_scaling_info) self.assertEqual(op_index_skip_RO, self.my_ns.SUBOPERATION_STATUS_SKIP) + async def test_deploy_kdus(self): + db_nsr = self.db.get_list("nsrs")[1] + db_vnfr = self.db.get_list("vnfrs")[2] + db_vnfrs = {"multikdu": db_vnfr} + nsr_id = db_nsr["_id"] + # nslcmop_id = self.db.get_list("nslcmops")[1]["_id"] + logging_text = "KDU" + self.my_ns.k8sclusterhelm.install = asynctest.CoroutineMock(return_value="k8s_id") + await self.my_ns.deploy_kdus(logging_text, nsr_id, db_nsr, db_vnfrs) + db_nsr = self.db.get_list("nsrs")[1] + self.assertIn("K8s", db_nsr["_admin"]["deployed"], "K8s entry not created at '_admin.deployed'") + self.assertIsInstance(db_nsr["_admin"]["deployed"]["K8s"], list, "K8s entry is not of type list") + self.assertEqual(len(db_nsr["_admin"]["deployed"]["K8s"]), 2, "K8s entry is not of type list") + k8s_instace_info = {"kdu-instance": "k8s_id", "k8scluster-uuid": "73d96432-d692-40d2-8440-e0c73aee209c", + "k8scluster-type": "chart", + "kdu-name": "ldap", "kdu-model": "stable/openldap:1.2.1"} + + self.assertEqual(db_nsr["_admin"]["deployed"]["K8s"][0], k8s_instace_info) + k8s_instace_info["kdu-name"] = "mongo" + k8s_instace_info["kdu-model"] = "stable/mongodb" + self.assertEqual(db_nsr["_admin"]["deployed"]["K8s"][1], k8s_instace_info) + if __name__ == '__main__': asynctest.main()