X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Ftests%2Ftest_instance_topics.py;h=bff7775111b45ddb0c830d2e827ac38fa4997cdf;hp=6d82b0fe6362807348872b84eeb102b70841a3f5;hb=4ca5152329fcba2f575085df9c0921f6d1135020;hpb=f5f2e3f9cecc38647a437af7812323a1da7d3f60

diff --git a/osm_nbi/tests/test_instance_topics.py b/osm_nbi/tests/test_instance_topics.py
index 6d82b0f..bff7775 100644
--- a/osm_nbi/tests/test_instance_topics.py
+++ b/osm_nbi/tests/test_instance_topics.py
@@ -171,8 +171,10 @@ class TestNsrTopic(unittest.TestCase):
             "nsdId": self.nsd_id,
             "nsName": "name",
             "vimAccountId": self.vim_id,
-            "additionalParamsForVnf": [{"member-vnf-index": "1", "additionalParams": {"touch_filename": "file"}},
-                                       {"member-vnf-index": "2", "additionalParams": {"touch_filename": "file"}}]
+            "additionalParamsForVnf": [
+                {"member-vnf-index": "hackfest_vnf1", "additionalParams": {"touch_filename": "file"}},
+                {"member-vnf-index": "hackfest_vnf2", "additionalParams": {"touch_filename": "file"}}
+            ]
         }
         rollback = []
         headers = {}
@@ -210,8 +212,7 @@ class TestNsrTopic(unittest.TestCase):
             self.assertTrue(created_item["_admin"]["nsState"] == "NOT_INSTANTIATED",
                             "Database record must contain '_admin.nstate=NOT INSTANTIATE'")
 
-        self.assertEqual(len(created_vnfrs), len(self.nsd["constituent-vnfd"]),
-                         "created a mismatch number of vnfr at database")
+        self.assertEqual(len(created_vnfrs), 2, "created a mismatch number of vnfr at database")
         self.assertEqual(len(created_nsrs), 1, "Only one nsrs must be created at database")
         self.assertEqual(len(rollback), len(created_vnfrs) + 1, "rollback mismatch with created items at database")
 
@@ -250,11 +251,13 @@ class TestNsrTopic(unittest.TestCase):
             self.db.set_one = Mock()
             self.nsr_topic.delete(session, self.nsr_id)
 
-            db_args = self.db.del_one.call_args[0]
+            db_args_ro_nsrs = self.db.del_one.call_args_list[1][0]
+            db_args = self.db.del_one.call_args_list[0][0]
             msg_args = self.msg.write.call_args[0]
             self.assertEqual(msg_args[0], self.nsr_topic.topic_msg, "Wrong message topic")
             self.assertEqual(msg_args[1], "deleted", "Wrong message action")
             self.assertEqual(msg_args[2], {"_id": self.nsr_id}, "Wrong message content")
+            self.assertEqual(db_args_ro_nsrs[0], "ro_nsrs", "Wrong DB topic")
             self.assertEqual(db_args[0], self.nsr_topic.topic, "Wrong DB topic")
             self.assertEqual(db_args[1]["_id"], self.nsr_id, "Wrong DB ID")
             self.assertEqual(db_args[1]["_admin.projects_read.cont"], [p_id], "Wrong DB filter")
@@ -276,8 +279,9 @@ class TestNsrTopic(unittest.TestCase):
             self.assertEqual(db_s1_args[0][0], self.nsr_topic.topic, "Wrong DB topic")
             self.assertEqual(db_s1_args[0][1]["_id"], self.nsr_id, "Wrong DB ID")
             self.assertIsNone(db_s1_args[1]["update_dict"], "Wrong DB update dictionary")
-            self.assertIn("_admin.projects_read." + p_other, db_s1_args[1]["pull"], "Wrong DB pull dictionary")
-            self.assertIn("_admin.projects_write." + p_other, db_s1_args[1]["pull"], "Wrong DB pull dictionary")
+            self.assertEqual(db_s1_args[1]["pull_list"],
+                             {"_admin.projects_read": [p_other], "_admin.projects_write": [p_other]},
+                             "Wrong DB pull_list dictionary")
             self.fs.file_delete.assert_not_called()
         with self.subTest(i=4, t='Delete with force and admin'):
             self.db.del_one.reset_mock()
@@ -286,11 +290,13 @@ class TestNsrTopic(unittest.TestCase):
             self.fs.file_delete.reset_mock()
             self.nsr_topic.delete(session_force, self.nsr_id)
 
-            db_args = self.db.del_one.call_args[0]
+            db_args_ro_nsrs = self.db.del_one.call_args_list[1][0]
+            db_args = self.db.del_one.call_args_list[0][0]
             msg_args = self.msg.write.call_args[0]
             self.assertEqual(msg_args[0], self.nsr_topic.topic_msg, "Wrong message topic")
             self.assertEqual(msg_args[1], "deleted", "Wrong message action")
             self.assertEqual(msg_args[2], {"_id": self.nsr_id}, "Wrong message content")
+            self.assertEqual(db_args_ro_nsrs[0], "ro_nsrs", "Wrong DB topic")
             self.assertEqual(db_args[0], self.nsr_topic.topic, "Wrong DB topic")
             self.assertEqual(db_args[1]["_id"], self.nsr_id, "Wrong DB ID")
             self.db.set_one.assert_not_called()