X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_nbi%2Ftests%2Ftest_descriptor_topics.py;h=280c93fec04a825d6267d86d20f87fcd52248a7c;hb=refs%2Fchanges%2F98%2F11798%2F10;hp=b2df34ffba5ec4688808c01d39a9ce92e7d314e2;hpb=4568a372eb5a204e04d917213de03ec51f9110c1;p=osm%2FNBI.git diff --git a/osm_nbi/tests/test_descriptor_topics.py b/osm_nbi/tests/test_descriptor_topics.py index b2df34f..280c93f 100755 --- a/osm_nbi/tests/test_descriptor_topics.py +++ b/osm_nbi/tests/test_descriptor_topics.py @@ -19,7 +19,7 @@ __date__ = "2019-11-20" import unittest from unittest import TestCase -from unittest.mock import Mock +from unittest.mock import Mock, patch from uuid import uuid4 from http import HTTPStatus from copy import deepcopy @@ -92,8 +92,11 @@ class Test_VnfdTopic(TestCase): self.topic = VnfdTopic(self.db, self.fs, self.msg, self.auth) self.topic.check_quota = Mock(return_value=None) # skip quota - def test_new_vnfd(self): + @patch("osm_nbi.descriptor_topics.shutil") + @patch("osm_nbi.descriptor_topics.os.rename") + def test_new_vnfd(self, mock_rename, mock_shutil): did = db_vnfd_content["_id"] + 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( @@ -190,6 +193,10 @@ class Test_VnfdTopic(TestCase): self.assertEqual( storage["descriptor"], "package", "Wrong storage descriptor" ) + self.assertEqual( + admin["revision"], 1, "Wrong revision number" + ) + compare_desc(self, test_vnfd, db_args[2], "VNFD") finally: test_vnfd["vdu"][0]["cloud-init-file"] = tmp1 @@ -226,6 +233,12 @@ class Test_VnfdTopic(TestCase): norm(str(e.exception)), "Wrong exception text", ) + db_args = self.db.replace.call_args[0] + admin = db_args[2]["_admin"] + self.assertEqual( + admin["revision"], 1, "Wrong revision number" + ) + finally: del test_vnfd["extra-property"] with self.subTest(i=3, t="Check Pyangbind Validation: property types"): @@ -697,6 +710,19 @@ class Test_VnfdTopic(TestCase): "Wrong DB NSD vnfd-id", ) + db_del_args = self.db.del_list.call_args[0] + self.assertEqual( + self.db.del_list.call_args[0][0], + self.topic.topic+"_revisions", + "Wrong DB topic", + ) + + self.assertEqual( + self.db.del_list.call_args[0][1]['_id']['$regex'], + did, + "Wrong ID for rexep delete", + ) + self.db.set_one.assert_not_called() fs_del_calls = self.fs.file_delete.call_args_list self.assertEqual(fs_del_calls[0][0][0], did, "Wrong FS file id") @@ -1148,6 +1174,61 @@ class Test_VnfdTopic(TestCase): "Wrong exception text", ) + def test_new_vnfd_revision(self): + did = db_vnfd_content["_id"] + 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" + ) + test_vnfd = deepcopy(db_vnfd_content) + del test_vnfd["_id"] + del test_vnfd["_admin"] + self.db.create.return_value = did + rollback = [] + did2, oid = self.topic.new(rollback, fake_session, {}) + db_args = self.db.create.call_args[0] + self.assertEqual(db_args[1]['_admin']['revision'], 0, + "New package should be at revision 0") + + @patch("osm_nbi.descriptor_topics.shutil") + @patch("osm_nbi.descriptor_topics.os.rename") + def test_update_vnfd(self, mock_rename, mock_shutil): + old_revision = 5 + did = db_vnfd_content["_id"] + 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" + ) + new_vnfd = deepcopy(db_vnfd_content) + del new_vnfd["_id"] + self.db.create.return_value = did + rollback = [] + did2, oid = self.topic.new(rollback, fake_session, {}) + del new_vnfd["vdu"][0]["cloud-init-file"] + del new_vnfd["df"][0]["lcm-operations-configuration"]["operate-vnf-op-config"][ + "day1-2"][0]["execution-environment-list"][0]["juju"] + + + old_vnfd = { + "_id": did, + "_admin": deepcopy(db_vnfd_content["_admin"]) + } + old_vnfd["_admin"]["revision"] = old_revision + self.db.get_one.side_effect = [ + old_vnfd, + None, + ] + self.topic.upload_content( + fake_session, did, new_vnfd, {}, {"Content-Type": []} + ) + + db_args = self.db.replace.call_args[0] + self.assertEqual(db_args[2]['_admin']['revision'], old_revision + 1, + "Revision should increment") + class Test_NsdTopic(TestCase): @classmethod @@ -1166,7 +1247,9 @@ class Test_NsdTopic(TestCase): self.topic = NsdTopic(self.db, self.fs, self.msg, self.auth) self.topic.check_quota = Mock(return_value=None) # skip quota - def test_new_nsd(self): + @patch("osm_nbi.descriptor_topics.shutil") + @patch("osm_nbi.descriptor_topics.os.rename") + def test_new_nsd(self, mock_rename, mock_shutil): did = db_nsd_content["_id"] self.fs.get_params.return_value = {} self.fs.file_exists.return_value = False @@ -1205,6 +1288,7 @@ class Test_NsdTopic(TestCase): "Wrong read-write project list", ) try: + self.fs.path = "" self.db.get_one.side_effect = [ {"_id": did, "_admin": db_nsd_content["_admin"]}, None, @@ -1257,6 +1341,19 @@ class Test_NsdTopic(TestCase): storage["descriptor"], "package", "Wrong storage descriptor" ) compare_desc(self, test_nsd, db_args[2], "NSD") + revision_args = self.db.create.call_args[0] + self.assertEqual( + revision_args[0], self.topic.topic + "_revisions", "Wrong topic" + ) + self.assertEqual( + revision_args[1]["id"], db_args[2]["id"], "Wrong revision id" + ) + self.assertEqual( + revision_args[1]["_id"], + db_args[2]["_id"] + ":1", + "Wrong revision _id" + ) + finally: pass self.db.get_one.side_effect = (