X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_nbi%2Ftests%2Ftest_osm_vnfm.py;h=f4e6e636ef0f4743fdf3fe73ed96b443350036c6;hb=536bb568cd1c79d16d36cd13bdd20d167337d30d;hp=a7ea8a3fc29670e38cff7f3ca5b8a1ed3eb8f47d;hpb=e47b913f0500837d7caa2ee25c0b476f58884859;p=osm%2FNBI.git diff --git a/osm_nbi/tests/test_osm_vnfm.py b/osm_nbi/tests/test_osm_vnfm.py index a7ea8a3..f4e6e63 100644 --- a/osm_nbi/tests/test_osm_vnfm.py +++ b/osm_nbi/tests/test_osm_vnfm.py @@ -29,7 +29,7 @@ from osm_nbi.tests.test_db_descriptors import ( db_nsds_text, db_nsrs_text, db_vnfrs_text, - db_nslcmops_text + db_nslcmops_text, ) import yaml @@ -41,10 +41,8 @@ class TestVnfInstances(unittest.TestCase): self.msg = Mock(MsgBase()) self.vnfinstances = VnfInstances(self.db, self.fs, self.msg, None) self.nsrtopic = NsrTopic(self.db, self.fs, self.msg, None) - self.db.create_list( - "vim_accounts", yaml.load(db_vim_accounts_text, Loader=yaml.Loader) - ) - self.db.create_list("vnfds", yaml.load(db_vnfm_vnfd_text, Loader=yaml.Loader)) + self.db.create_list("vim_accounts", yaml.safe_load(db_vim_accounts_text)) + self.db.create_list("vnfds", yaml.safe_load(db_vnfm_vnfd_text)) self.vnfd = self.db.get_list("vnfds")[0] self.vnfd_id = self.vnfd["id"] self.vnfd_project = self.vnfd["_admin"]["projects_read"][0] @@ -68,43 +66,36 @@ class TestVnfInstances(unittest.TestCase): "vnfInstanceDescription": "vnf instance description", "vimAccountId": self.vim_id, "additionalParams": { - "virtual-link-desc": [ - { - "id": "mgmt-net", - "mgmt-network": True - } - ], + "virtual-link-desc": [{"id": "mgmt-net", "mgmt-network": True}], "constituent-cpd-id": "vnf-cp0-ext", - "virtual-link-profile-id": "mgmt-net" - } + "virtual-link-profile-id": "mgmt-net", + }, } rollback = [] - headers = {} self.fs.path = "" self.fs.get_params.return_value = {} self.fs.file_exists.return_value = False self.fs.file_open.side_effect = lambda path, mode: open( - "/tmp/" + str(uuid4()), "a+b" - ) + "/tmp/" + str(uuid4()), "a+b" + ) vnfr_id, _ = self.vnfinstances.new( rollback, session, indata, {}, headers={"Content-Type": []} ) vnfr = self.db.get_one("vnfrs") self.assertEqual( - vnfr_id, - vnfr["id"], - "Mismatch between return id and database id" - ) + vnfr_id, vnfr["id"], "Mismatch between return id and database id" + ) self.assertEqual( - "NOT_INSTANTIATED", - vnfr["_admin"]["nsState"], - "Database record must contain 'nsState' NOT_INSTANTIATED" - ) + "NOT_INSTANTIATED", + vnfr["_admin"]["nsState"], + "Database record must contain 'nsState' NOT_INSTANTIATED", + ) self.assertEqual( - self.vnfd_id, - vnfr["vnfd-ref"], - "vnfr record is not properly created for the given vnfd") + self.vnfd_id, + vnfr["vnfd-ref"], + "vnfr record is not properly created for the given vnfd", + ) def test_show_vnfinstance(self): session = { @@ -115,14 +106,14 @@ class TestVnfInstances(unittest.TestCase): "method": "write", } filter_q = {} - self.db.create_list("vnfrs", yaml.load(db_vnfrs_text, Loader=yaml.Loader)) + self.db.create_list("vnfrs", yaml.safe_load(db_vnfrs_text)) actual_vnfr = self.db.get_list("vnfrs")[0] id = actual_vnfr["_id"] expected_vnfr = self.vnfinstances.show(session, id, filter_q) self.assertEqual( actual_vnfr["_id"], expected_vnfr["_id"], - "Mismatch between return vnfr Id and database vnfr Id" + "Mismatch between return vnfr Id and database vnfr Id", ) def test_delete_vnfinstance(self): @@ -133,9 +124,9 @@ class TestVnfInstances(unittest.TestCase): "project_id": [self.vnfd_project], "method": "delete", } - self.db.create_list("vnfrs", yaml.load(db_vnfrs_text, Loader=yaml.Loader)) - self.db.create_list("nsrs", yaml.load(db_nsrs_text, Loader=yaml.Loader)) - self.db.create_list("nsds", yaml.load(db_nsds_text, Loader=yaml.Loader)) + self.db.create_list("vnfrs", yaml.safe_load(db_vnfrs_text)) + self.db.create_list("nsrs", yaml.safe_load(db_nsrs_text)) + self.db.create_list("nsds", yaml.safe_load(db_nsds_text)) self.vnfr = self.db.get_list("vnfrs")[0] self.vnfr_id = self.vnfr["_id"] @@ -158,13 +149,11 @@ class TestVnfLcmOpTopic(unittest.TestCase): self.vnflcmop_topic = VnfLcmOpTopic(self.db, self.fs, self.msg, None) self.vnflcmop_topic.check_quota = Mock(return_value=None) # skip quota - self.db.create_list( - "vim_accounts", yaml.load(db_vim_accounts_text, Loader=yaml.Loader) - ) - self.db.create_list("nsds", yaml.load(db_nsds_text, Loader=yaml.Loader)) - self.db.create_list("vnfds", yaml.load(db_vnfm_vnfd_text, Loader=yaml.Loader)) - self.db.create_list("vnfrs", yaml.load(db_vnfrs_text, Loader=yaml.Loader)) - self.db.create_list("nsrs", yaml.load(db_nsrs_text, Loader=yaml.Loader)) + self.db.create_list("vim_accounts", yaml.safe_load(db_vim_accounts_text)) + self.db.create_list("nsds", yaml.safe_load(db_nsds_text)) + self.db.create_list("vnfds", yaml.safe_load(db_vnfm_vnfd_text)) + self.db.create_list("vnfrs", yaml.safe_load(db_vnfrs_text)) + self.db.create_list("nsrs", yaml.safe_load(db_nsrs_text)) self.vnfd = self.db.get_list("vnfds")[0] self.vnfd_id = self.vnfd["_id"] @@ -190,7 +179,7 @@ class TestVnfLcmOpTopic(unittest.TestCase): "vnfName": "vnf_instance_name", "vnfDescription": "vnf instance description", "vnfId": self.vnfd_id, - "vimAccountId": self.vim_id + "vimAccountId": self.vim_id, } rollback = [] headers = {} @@ -216,7 +205,7 @@ class TestVnfLcmOpTopic(unittest.TestCase): "project_id": [self.vnfd_project], "method": "write", } - self.db.create_list("nslcmops", yaml.load(db_nslcmops_text, Loader=yaml.Loader)) + self.db.create_list("nslcmops", yaml.safe_load(db_nslcmops_text)) filter_q = {} actual_lcmop = self.db.get_list("nslcmops")[0] id = actual_lcmop["_id"] @@ -224,4 +213,8 @@ class TestVnfLcmOpTopic(unittest.TestCase): vnfr_id = vnfr["_id"] vnflcmop = self.vnflcmop_topic.show(session, id, filter_q) _id = vnflcmop["vnfInstanceId"] - self.assertEqual(_id, vnfr_id, "Mismatch between vnflcmop's vnfInstanceId and database vnfr's id") + self.assertEqual( + _id, + vnfr_id, + "Mismatch between vnflcmop's vnfInstanceId and database vnfr's id", + )