X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Ftests%2Ftest_pmjobs_topic.py;h=5bcb3834ab734d81e3a692446b0638bc2a9b7376;hp=d83cc69ed65e4f5ad7406923407b747278005802;hb=daab26940210ace40fdc55cd58aafb5c3be83ae2;hpb=bea307477502fd13126df50e82494dee4eaf1214 diff --git a/osm_nbi/tests/test_pmjobs_topic.py b/osm_nbi/tests/test_pmjobs_topic.py index d83cc69..5bcb383 100644 --- a/osm_nbi/tests/test_pmjobs_topic.py +++ b/osm_nbi/tests/test_pmjobs_topic.py @@ -24,8 +24,7 @@ from osm_nbi.engine import EngineException from osm_common.dbmemory import DbMemory from osm_nbi.pmjobs_topics import PmJobsTopic from osm_nbi.tests.test_db_descriptors import db_nsds_text, db_vnfds_text, db_nsrs_text, db_vnfrs_text -from osm_nbi.tests.pmjob_mocks.response import show_res, cpu_utilization, users, load, empty -# from osm_nbi.tests.pmjob_mocks.response import prom_res +from osm_nbi.tests.pmjob_mocks.response import show_res, prom_res, cpu_utilization, users, load, empty class PmJobsTopicTest(asynctest.TestCase): @@ -75,17 +74,17 @@ class PmJobsTopicTest(asynctest.TestCase): self.assertIn("NS not found with id {}".format(wrong_ns_id), str(e.exception), "Wrong exception text") - # async def test_prom_metric_request(self): - # with self.subTest("Test case1 failed in test_prom"): - # prom_response = yaml.load(prom_res, Loader=yaml.Loader) - # with aioresponses() as mock_res: - # self.set_get_mock_res(mock_res, self.nsr_id, self.metric_check_list) - # result = await self.pmjobs_topic._prom_metric_request(self.nsr_id, self.metric_check_list) - # self.assertCountEqual(result, prom_response, "Metric Data is valid") - # with self.subTest("Test case2 failed in test_prom"): - # with self.assertRaises(EngineException, msg="Prometheus not reachable") as e: - # await self.pmjobs_topic._prom_metric_request(self.nsr_id, self.metric_check_list) - # self.assertIn("Connection to ", str(e.exception), "Wrong exception text") + async def test_prom_metric_request(self): + with self.subTest("Test case1 failed in test_prom"): + prom_response = yaml.load(prom_res, Loader=yaml.Loader) + with aioresponses() as mock_res: + self.set_get_mock_res(mock_res, self.nsr_id, self.metric_check_list) + result = await self.pmjobs_topic._prom_metric_request(self.nsr_id, self.metric_check_list) + self.assertCountEqual(result, prom_response, "Metric Data is valid") + with self.subTest("Test case2 failed in test_prom"): + with self.assertRaises(EngineException, msg="Prometheus not reachable") as e: + await self.pmjobs_topic._prom_metric_request(self.nsr_id, self.metric_check_list) + self.assertIn("Connection to ", str(e.exception), "Wrong exception text") def test_show(self): with self.subTest("Test case1 failed in test_show"):