Reverted kdur creation following the kdu modeling before SOL006

[osm/NBI.git] / osm_nbi / tests / test_admin_topics.py

diff --git a/osm_nbi/tests/test_admin_topics.py b/osm_nbi/tests/test_admin_topics.py
index 596faeb..2c8154e 100755 (executable)
--- a/osm_nbi/tests/test_admin_topics.py
+++ b/osm_nbi/tests/test_admin_topics.py
@@ -54,6 +54,7 @@ class Test_ProjectTopicAuth(TestCase):
         self.topic = ProjectTopicAuth(self.db, self.fs, self.msg, self.auth)
         self.fake_session = {"username": self.test_name, "project_id": (test_pid,), "method": None,
                              "admin": True, "force": False, "public": False, "allow_show_user_project_role": True}
+        self.topic.check_quota = Mock(return_value=None)  # skip quota
 
     def test_new_project(self):
         with self.subTest(i=1):
@@ -215,6 +216,7 @@ class Test_RoleTopicAuth(TestCase):
         self.topic = RoleTopicAuth(self.db, self.fs, self.msg, self.auth)
         self.fake_session = {"username": test_name, "project_id": (test_pid,), "method": None,
                              "admin": True, "force": False, "public": False, "allow_show_user_project_role": True}
+        self.topic.check_quota = Mock(return_value=None)  # skip quota
 
     def test_new_role(self):
         with self.subTest(i=1):
@@ -375,6 +377,7 @@ class Test_UserTopicAuth(TestCase):
         self.topic = UserTopicAuth(self.db, self.fs, self.msg, self.auth)
         self.fake_session = {"username": test_name, "project_id": (test_pid,), "method": None,
                              "admin": True, "force": False, "public": False, "allow_show_user_project_role": True}
+        self.topic.check_quota = Mock(return_value=None)  # skip quota
 
     def test_new_user(self):
         uid1 = str(uuid4())
@@ -478,6 +481,7 @@ class Test_UserTopicAuth(TestCase):
             new_name = "other-user-name"
             new_prms = [{}]
             self.auth.get_role_list.side_effect = [[user], []]
+            self.auth.get_user_list.side_effect = [[user]]
             with self.assertRaises(EngineException, msg="Accepted wrong project-role mappings") as e:
                 self.topic.edit(self.fake_session, uid, {"username": new_name, "project_role_mappings": new_prms})
             self.assertEqual(e.exception.http_code, HTTPStatus.UNPROCESSABLE_ENTITY, "Wrong HTTP status code")
@@ -592,11 +596,13 @@ class Test_CommonVimWimSdn(TestCase):
         self.auth = Mock(authconn.Authconn(None, None, None))
         self.topic = CommonVimWimSdn(self.db, self.fs, self.msg, self.auth)
         # Use WIM schemas for testing because they are the simplest
+        self.topic._send_msg = Mock()
         self.topic.topic = "wims"
         self.topic.schema_new = validation.wim_account_new_schema
         self.topic.schema_edit = validation.wim_account_edit_schema
         self.fake_session = {"username": test_name, "project_id": (test_pid,), "method": None,
                              "admin": True, "force": False, "public": False, "allow_show_user_project_role": True}
+        self.topic.check_quota = Mock(return_value=None)  # skip quota
 
     def test_new_cvws(self):
         test_url = "http://0.0.0.0:0"
@@ -693,6 +699,7 @@ class Test_CommonVimWimSdn(TestCase):
             self.assertEqual(operation["detailed-status"], "", "Wrong operation detailed status info")
             self.assertIsNone(operation["operationParams"], "Wrong operation parameters")
         with self.subTest(i=2):
+            self.db.get_one.side_effect = [cvws]
             with self.assertRaises(EngineException, msg="Accepted wrong property") as e:
                 self.topic.edit(self.fake_session, str(uuid4()), {"name": "new-name", "extra_prop": "anything"})
             self.assertEqual(e.exception.http_code, HTTPStatus.UNPROCESSABLE_ENTITY, "Wrong HTTP status code")
@@ -727,10 +734,12 @@ class Test_CommonVimWimSdn(TestCase):
             self.assertEqual(self.db.get_one.call_args[0][1]["_id"], cid, "Wrong CIM identifier")
             self.assertEqual(self.db.set_one.call_args[0][0], self.topic.topic, "Wrong topic")
             self.assertEqual(self.db.set_one.call_args[0][1]["_id"], cid, "Wrong CIM identifier")
-            self.assertEqual(self.db.set_one.call_args[1]["update_dict"]["_admin.projects_read"], [ro_pid, rw_pid],
+            self.assertEqual(self.db.set_one.call_args[1]["update_dict"], None,
                              "Wrong read-only projects update")
-            self.assertEqual(self.db.set_one.call_args[1]["update_dict"]["_admin.projects_write"], [rw_pid],
+            self.assertEqual(self.db.set_one.call_args[1]["pull_list"],
+                             {"_admin.projects_read": (test_pid,), "_admin.projects_write": (test_pid,)},
                              "Wrong read/write projects update")
+            self.topic._send_msg.assert_not_called()
         with self.subTest(i=2):
             now = time()
             cvws["_admin"] = {"projects_read": [test_pid], "projects_write": [test_pid], "operations": []}
@@ -741,10 +750,8 @@ class Test_CommonVimWimSdn(TestCase):
             self.assertEqual(self.db.get_one.call_args[0][1]["_id"], cid, "Wrong CIM identifier")
             self.assertEqual(self.db.set_one.call_args[0][0], self.topic.topic, "Wrong topic")
             self.assertEqual(self.db.set_one.call_args[0][1]["_id"], cid, "Wrong user identifier")
-            update_dict = self.db.set_one.call_args[1]["update_dict"]
-            self.assertEqual(update_dict["_admin.projects_read"], [], "Wrong read-only projects update")
-            self.assertEqual(update_dict["_admin.projects_write"], [], "Wrong read/write projects update")
-            self.assertEqual(update_dict["_admin.to_delete"], True, "Wrong deletion mark")
+            self.assertEqual(self.db.set_one.call_args[1]["update_dict"], {"_admin.to_delete": True},
+                             "Wrong _admin.to_delete update")
             operation = self.db.set_one.call_args[1]["push"]["_admin.operations"]
             self.assertEqual(operation["lcmOperationType"], "delete", "Wrong operation type")
             self.assertEqual(operation["operationState"], "PROCESSING", "Wrong operation state")
@@ -752,16 +759,23 @@ class Test_CommonVimWimSdn(TestCase):
             self.assertIsNone(operation["operationParams"], "Wrong operation parameters")
             self.assertGreater(operation["startTime"], now, "Wrong operation start time")
             self.assertGreater(operation["statusEnteredTime"], now, "Wrong operation status enter time")
+            self.topic._send_msg.assert_called_once_with("delete", {"_id": cid, "op_id": cid + ":0"}, not_send_msg=None)
         with self.subTest(i=3):
             cvws["_admin"] = {"projects_read": [], "projects_write": [], "operations": []}
             self.db.get_one.return_value = cvws
+            self.topic._send_msg.reset_mock()
+            self.db.get_one.reset_mock()
+            self.db.del_one.reset_mock()
             self.fake_session["force"] = True   # to force deletion
+            self.fake_session["admin"] = True   # to force deletion
+            self.fake_session["project_id"] = []   # to force deletion
             oid = self.topic.delete(self.fake_session, cid)
             self.assertIsNone(oid, "Wrong operation identifier")
             self.assertEqual(self.db.get_one.call_args[0][0], self.topic.topic, "Wrong topic")
             self.assertEqual(self.db.get_one.call_args[0][1]["_id"], cid, "Wrong CIM identifier")
             self.assertEqual(self.db.del_one.call_args[0][0], self.topic.topic, "Wrong topic")
             self.assertEqual(self.db.del_one.call_args[0][1]["_id"], cid, "Wrong CIM identifier")
+            self.topic._send_msg.assert_called_once_with("deleted", {"_id": cid, "op_id": None}, not_send_msg=None)
 
 
 if __name__ == '__main__':