cornflow 2.0.0a11__py3-none-any.whl → 2.0.0a12__py3-none-any.whl

cornflow/shared/const.py

@@ -7,6 +7,8 @@ AIRFLOW_BACKEND = 1
 DATABRICKS_BACKEND = 2
 
 
+INTERNAL_TOKEN_ISSUER = "cornflow"
+
 # endpoints responses for health check
 STATUS_HEALTHY = "healthy"
 STATUS_UNHEALTHY = "unhealthy"
@@ -57,6 +59,7 @@ DATABRICKS_TO_STATE_MAP = dict(
     SUCCESS=EXEC_STATE_CORRECT,
     USER_CANCELED=EXEC_STATE_STOPPED,
     OTHER_FINISH_ERROR=EXEC_STATE_ERROR,
+    RUN_EXECUTION_ERROR=EXEC_STATE_ERROR
 )
 
 DATABRICKS_FINISH_TO_STATE_MAP = dict(
@@ -72,20 +75,6 @@ AUTH_LDAP = 2
 AUTH_OAUTH = 4
 AUTH_OID = 0
 
-# Providers of open ID:
-OID_NONE = 0
-OID_AZURE = 1
-OID_GOOGLE = 2
-
-
-# AZURE OPEN ID URLS
-OID_AZURE_DISCOVERY_COMMON_URL = (
-    "https://login.microsoftonline.com/common/.well-known/openid-configuration"
-)
-OID_AZURE_DISCOVERY_TENANT_URL = (
-    "https://login.microsoftonline.com/{tenant_id}/.well-known/openid-configuration"
-)
-
 GET_ACTION = 1
 PATCH_ACTION = 2
 POST_ACTION = 3

cornflow/shared/databricks.py

@@ -92,7 +92,11 @@ class Databricks:
         # TODO AGA: revisar si deben ser notebook parameters o job parameters.
         #   Entender cómo se usa checks_only
         payload = dict(
-            job_id=orch_name, notebook_parameters=dict(checks_only=checks_only)
+            job_id=orch_name,
+            notebook_parameters=dict(
+                checks_only=checks_only,
+                execution_id=execution_id,
+            ),
         )
         return self.request_headers_auth(method="POST", url=url, json=payload)
 

cornflow/tests/const.py

@@ -9,6 +9,7 @@ def _get_file(relative_path):
 
 PREFIX = ""
 INSTANCE_PATH = _get_file("./data/new_instance.json")
+EMPTY_INSTANCE_PATH = _get_file("./data/empty_instance.json")
 INSTANCES_LIST = [INSTANCE_PATH, _get_file("./data/new_instance_2.json")]
 INSTANCE_URL = PREFIX + "/instance/"
 INSTANCE_MPS = _get_file("./data/test_mps.mps")

cornflow/tests/custom_test_case.py

@@ -14,25 +14,32 @@ LoginTestCases
     Test cases for login functionality
 """
 
+import json
+
 # Import from libraries
 import logging as log
-from datetime import datetime, timedelta
-
+from datetime import datetime, timedelta, timezone
 from typing import List
 
+import jwt
 from flask import current_app
 from flask_testing import TestCase
-import json
-import jwt
 
 # Import from internal modules
 from cornflow.app import create_app
-from cornflow.models import UserRoleModel
+from cornflow.models import UserRoleModel, UserModel
 from cornflow.commands.access import access_init_command
 from cornflow.commands.dag import register_deployed_dags_command_test
 from cornflow.commands.permissions import register_dag_permissions_command
+from cornflow.models import UserRoleModel
+from cornflow.shared import db
 from cornflow.shared.authentication import Auth
-from cornflow.shared.const import ADMIN_ROLE, PLANNER_ROLE, SERVICE_ROLE
+from cornflow.shared.const import (
+    ADMIN_ROLE,
+    PLANNER_ROLE,
+    SERVICE_ROLE,
+    INTERNAL_TOKEN_ISSUER,
+)
 from cornflow.shared import db
 from cornflow.tests.const import (
     LOGIN_URL,
@@ -121,7 +128,8 @@ class CustomTestCase(TestCase):
             headers={"Content-Type": "application/json"},
         ).json["token"]
 
-        self.user = Auth.return_user_from_token(self.token)
+        data = Auth().decode_token(self.token)
+        self.user = UserModel.get_one_object(username=data["sub"])
         self.url = None
         self.model = None
         self.copied_items = set()
@@ -587,6 +595,14 @@ class BaseTestCases:
             allrows = self.get_rows(self.url, data_many)
             self.apply_filter(self.url, dict(limit=1), [allrows.json[0]])
 
+        def test_opt_filters_limit_none(self):
+            """
+            Tests the limit filter option
+            """
+            data_many = [self.payload for _ in range(4)]
+            allrows = self.get_rows(self.url, data_many)
+            self.apply_filter(self.url, dict(limit=None), allrows.json)
+
         def test_opt_filters_offset(self):
             """
             Tests the offset filter option.
@@ -596,6 +612,22 @@ class BaseTestCases:
             allrows = self.get_rows(self.url, data_many)
             self.apply_filter(self.url, dict(offset=1, limit=2), allrows.json[1:3])
 
+        def test_opt_filters_offset_zero(self):
+            """
+            Tests the offset filter option with a zero value.
+            """
+            data_many = [self.payload for _ in range(4)]
+            allrows = self.get_rows(self.url, data_many)
+            self.apply_filter(self.url, dict(offset=0), allrows.json)
+
+        def test_opt_filters_offset_none(self):
+            """
+            Tests the offset filter option with a None value.
+            """
+            data_many = [self.payload for _ in range(4)]
+            allrows = self.get_rows(self.url, data_many)
+            self.apply_filter(self.url, dict(offset=None), allrows.json)
+
         def test_opt_filters_schema(self):
             """
             Tests the schema filter option.
@@ -828,7 +860,7 @@ class CheckTokenTestCase:
                     follow_redirects=True,
                     headers={
                         "Content-Type": "application/json",
-                        "Authorization": "Bearer " + self.token,
+                        "Authorization": f"Bearer {self.token}",
                     },
                 )
             else:
@@ -982,28 +1014,38 @@ class LoginTestCases:
             """
             Tests using an expired token.
             """
-            token = (
-                "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2MTA1MzYwNjUsImlhdCI6MTYxMDQ0OTY2NSwic3ViIjoxfQ"
-                ".QEfmO-hh55PjtecnJ1RJT3aW2brGLadkg5ClH9yrRnc "
-            )
-
+            # First log in to get a valid user
             payload = self.data
-
             response = self.client.post(
                 LOGIN_URL,
                 data=json.dumps(payload),
                 follow_redirects=True,
                 headers={"Content-Type": "application/json"},
             )
-
             self.idx = response.json["id"]
 
+            # Generate an expired token
+            expired_payload = {
+                # Token expired 1 hour ago
+                "exp": datetime.utcnow() - timedelta(hours=1),
+                # Token created 2 hours ago
+                "iat": datetime.utcnow() - timedelta(hours=2),
+                "sub": self.idx,
+                "iss": INTERNAL_TOKEN_ISSUER,
+            }
+            expired_token = jwt.encode(
+                expired_payload,
+                current_app.config["SECRET_TOKEN_KEY"],
+                algorithm="HS256",
+            )
+
+            # Try to use the expired token
             response = self.client.get(
                 USER_URL + str(self.idx) + "/",
                 follow_redirects=True,
                 headers={
                     "Content-Type": "application/json",
-                    "Authorization": "Bearer " + token,
+                    "Authorization": f"Bearer {expired_token}",
                 },
             )
 
@@ -1040,13 +1082,8 @@ class LoginTestCases:
             """
             Tests using an invalid token.
             """
-            token = (
-                "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2MTA1Mzk5NTMsImlhdCI6MTYxMDQ1MzU1Mywic3ViIjoxfQ"
-                ".g3Gh7k7twXZ4K2MnQpgpSr76Sl9VX6TkDWusX5YzImo"
-            )
-
+            # First log in to get a valid user
             payload = self.data
-
             response = self.client.post(
                 LOGIN_URL,
                 data=json.dumps(payload),
@@ -1055,18 +1092,32 @@ class LoginTestCases:
             )
             self.idx = response.json["id"]
 
+            # Generate an invalid token with wrong issuer
+            invalid_payload = {
+                "exp": datetime.utcnow() + timedelta(hours=1),
+                "iat": datetime.utcnow(),
+                "sub": self.idx,
+                "iss": "invalid_issuer",
+            }
+            invalid_token = jwt.encode(
+                invalid_payload,
+                current_app.config["SECRET_TOKEN_KEY"],
+                algorithm="HS256",
+            )
+
+            # Try to use the invalid token
             response = self.client.get(
                 USER_URL + str(self.idx) + "/",
                 follow_redirects=True,
                 headers={
                     "Content-Type": "application/json",
-                    "Authorization": "Bearer " + token,
+                    "Authorization": f"Bearer {invalid_token}",
                 },
             )
 
             self.assertEqual(400, response.status_code)
             self.assertEqual(
-                "Invalid token, please try again with a new token",
+                "Invalid token issuer. Token must be issued by a valid provider",
                 response.json["error"],
             )
 
@@ -1092,7 +1143,7 @@ class LoginTestCases:
             )
 
             self.assertAlmostEqual(
-                datetime.utcnow(),
-                datetime.utcfromtimestamp(decoded_token["iat"]),
+                datetime.now(timezone.utc),
+                datetime.fromtimestamp(decoded_token["iat"], timezone.utc),
                 delta=timedelta(seconds=2),
             )

cornflow/tests/unit/test_actions.py

@@ -67,7 +67,7 @@ class TestActionsListEndpoint(CustomTestCase):
                 follow_redirects=True,
                 headers={
                     "Content-Type": "application/json",
-                    "Authorization": "Bearer " + self.token,
+                    "Authorization": f"Bearer {self.token}",
                 },
             )
             self.assertEqual(200, response.status_code)
@@ -89,7 +89,7 @@ class TestActionsListEndpoint(CustomTestCase):
                     follow_redirects=True,
                     headers={
                         "Content-Type": "application/json",
-                        "Authorization": "Bearer " + self.token,
+                        "Authorization": f"Bearer {self.token}",
                     },
                 )
 

cornflow/tests/unit/test_alarms.py

@@ -13,9 +13,10 @@ TestAlarmsEndpoint
 """
 
 # Imports from internal modules
+import json
 from cornflow.models import AlarmsModel
 from cornflow.tests.const import ALARMS_URL
-from cornflow.tests.custom_test_case import CustomTestCase
+from cornflow.tests.custom_test_case import BaseTestCases, CustomTestCase
 
 
 class TestAlarmsEndpoint(CustomTestCase):
@@ -85,3 +86,56 @@ class TestAlarmsEndpoint(CustomTestCase):
                 self.assertIn(key, rows_data[i])
                 if key in data[i]:
                     self.assertEqual(rows_data[i][key], data[i][key])
+
+
+class TestAlarmsDetailEndpoint(TestAlarmsEndpoint, BaseTestCases.DetailEndpoint):
+    def setUp(self):
+        super().setUp()
+        self.url = self.url
+        self.idx = 0
+        self.payload = {
+            "name": "Alarm 1",
+            "description": "Description Alarm 1",
+            "criticality": 1,
+        }
+
+    def test_disable_alarm_detail(self):
+        """
+        The idea would be to read the alarm_id from the query and be able to disable the entire row for that alarm in the database.
+        To check this, I would use an example data set of different alarms and, after giving a specific id, be able to return the same data set,
+        excluding those related to the given alarm_id.
+
+        Verifies:
+        - Retrieval of a single alarm using its ID
+        - Correct validation of alarm data fields
+
+        """
+
+        data = {
+            "name": "Alarm 1",
+            "description": "Description Alarm 1",
+            "criticality": 1,
+        }
+        id = self.create_new_row(self.url, self.model, data)
+        data = {
+            "name": "Alarm 2",
+            "description": "Description Alarm 2",
+            "criticality": 1,
+        }
+        self.idx = id
+        url = self.url + str(id) + "/"
+        response = self.client.delete(
+            url,
+            data=json.dumps(data),
+            follow_redirects=True,
+            headers=self.get_header_with_auth(self.token),
+        )
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.json, {"message": "Object marked as disabled"})
+        all_rows = AlarmsModel.query.all()
+        for row in all_rows:
+            if row.id == id:
+                # We check deleted at has a value
+                self.assertIsNotNone(row.deleted_at)
+            else:
+                self.assertIsNone(row.deleted_at)

cornflow/tests/unit/test_apiview.py

@@ -13,7 +13,8 @@ TestApiViewListEndpoint
 """
 
 # Import from internal modules
-from cornflow.endpoints import ApiViewListEndpoint, resources
+from cornflow.endpoints import ApiViewListEndpoint, resources, alarms_resources
+from cornflow.models import ViewModel
 from cornflow.shared.const import ROLES_MAP
 from cornflow.tests.const import APIVIEW_URL
 from cornflow.tests.custom_test_case import CustomTestCase
@@ -71,7 +72,7 @@ class TestApiViewListEndpoint(CustomTestCase):
                 follow_redirects=True,
                 headers={
                     "Content-Type": "application/json",
-                    "Authorization": "Bearer " + self.token,
+                    "Authorization": f"Bearer {self.token}",
                 },
             )
             self.assertEqual(200, response.status_code)
@@ -97,8 +98,112 @@ class TestApiViewListEndpoint(CustomTestCase):
                     follow_redirects=True,
                     headers={
                         "Content-Type": "application/json",
-                        "Authorization": "Bearer " + self.token,
+                        "Authorization": f"Bearer {self.token}",
                     },
                 )
 
                 self.assertEqual(403, response.status_code)
+
+
+class TestApiViewModel(CustomTestCase):
+    """
+    Test cases for the API views list endpoint.
+
+    This class tests the functionality of listing available API views, including:
+    - Authorization checks for different user roles
+    - Validation of returned API view data
+    - Access control for authorized and unauthorized roles
+    """
+
+    def setUp(self):
+        """
+        Set up test environment before each test.
+
+        Initializes test data including:
+        - Base test case setup
+        - Roles with access permissions
+        - Test payload with API view data
+        - Items to check in responses
+        """
+        super().setUp()
+        self.roles_with_access = ApiViewListEndpoint.ROLES_WITH_ACCESS
+        self.payload = [
+            {
+                "name": view["endpoint"],
+                "url_rule": view["urls"],
+                "description": view["resource"].DESCRIPTION,
+            }
+            for view in resources
+        ]
+        self.items_to_check = ["name", "description", "url_rule"]
+
+    def test_get_all_objects(self):
+        """
+        Test that the get_all_objects method works properly
+        """
+        expected_count = len(resources) + len(alarms_resources)
+        # Test getting all objects
+        all_instances = ViewModel.get_all_objects().all()
+        self.assertEqual(len(all_instances), expected_count)
+
+        # Check that all resources are included in the results
+        api_view_names = [view.name for view in all_instances]
+        expected_names = [view["endpoint"] for view in resources]
+
+        # Verify all expected resource names are in the results
+        for name in expected_names:
+            self.assertIn(name, api_view_names)
+
+        # Test with offset and limit
+        limited_instances = ViewModel.get_all_objects(offset=10, limit=10).all()
+        self.assertEqual(len(limited_instances), 10)
+
+        # Verify these are different from the first 10 results
+        first_ten = [view.id for view in all_instances[:10]]
+        offset_ten = [view.id for view in limited_instances]
+        self.assertNotEqual(first_ten, offset_ten)
+
+        # Test with only offset
+        offset_instances = ViewModel.get_all_objects(offset=10).all()
+        self.assertEqual(len(offset_instances), expected_count - 10)
+
+        # Verify these match with the correct slice of all results
+        offset_ids = [view.id for view in offset_instances]
+        expected_offset_ids = [view.id for view in all_instances[10:]]
+        self.assertEqual(offset_ids, expected_offset_ids)
+
+        # Test with only limit
+        limit_instances = ViewModel.get_all_objects(limit=10).all()
+        self.assertEqual(len(limit_instances), 10)
+
+        # Verify these match with the first 10 of all results
+        limit_ids = [view.id for view in limit_instances]
+        expected_limit_ids = [view.id for view in all_instances[:10]]
+        self.assertEqual(limit_ids, expected_limit_ids)
+
+    def test_get_one_object_by_name(self):
+        """
+        Test that the get_one_by_name method works properly
+        """
+        instance = ViewModel.get_one_by_name(name="instance")
+        self.assertEqual(instance.name, "instance")
+
+    def test_get_one_object(self):
+        """
+        Test that the get_one_object method works properly
+        """
+        instance = ViewModel.get_one_object(idx=1)
+        self.assertEqual(instance.name, "instance")
+
+    def test_get_one_object_without_idx(self):
+        """
+        Test that the get_one_object method works properly when called without any filters
+        """
+        # Call get_one_object without any filters
+        instance = ViewModel.get_one_object()
+
+        # It should return the first instance by default
+        first_instance = ViewModel.get_all_objects().first()
+        self.assertIsNotNone(instance)
+        self.assertEqual(instance.id, first_instance.id)
+        self.assertEqual(instance.name, first_instance.name)

cornflow/tests/unit/test_cases.py

@@ -90,11 +90,10 @@ class TestCasesModels(CustomTestCase):
         self.payload = load_file(INSTANCE_PATH)
         self.payloads = [load_file(f) for f in INSTANCES_LIST]
         parents = [None, 1, 1, 3, 3, 3, 1, 7, 7, 9, 7]
-        user = UserModel.get_one_user(self.user)
-        data = {**self.payload, **dict(user_id=user.id)}
+        data = {**self.payload, **dict(user_id=self.user.id)}
         for parent in parents:
             if parent is not None:
-                parent = CaseModel.get_one_object(user=user, idx=parent)
+                parent = CaseModel.get_one_object(user=self.user, idx=parent)
             node = CaseModel(data=data, parent=parent)
             node.save()
 
@@ -106,10 +105,9 @@ class TestCasesModels(CustomTestCase):
         - Correct path generation for cases
         - Proper parent-child relationships
         """
-        user = UserModel.get_one_user(self.user)
-        case = CaseModel.get_one_object(user=user, idx=6)
+        case = CaseModel.get_one_object(user=self.user, idx=6)
         self.assertEqual(case.path, "1/3/")
-        case = CaseModel.get_one_object(user=user, idx=11)
+        case = CaseModel.get_one_object(user=self.user, idx=11)
         self.assertEqual(case.path, "1/7/")
 
     def test_move_case(self):
@@ -120,9 +118,8 @@ class TestCasesModels(CustomTestCase):
         - Cases can be moved to new parents
         - Path updates correctly after move
         """
-        user = UserModel.get_one_user(self.user)
-        case6 = CaseModel.get_one_object(user=user, idx=6)
-        case11 = CaseModel.get_one_object(user=user, idx=11)
+        case6 = CaseModel.get_one_object(user=self.user, idx=6)
+        case11 = CaseModel.get_one_object(user=self.user, idx=11)
         case6.move_to(case11)
         self.assertEqual(case6.path, "1/7/11/")
 
@@ -135,11 +132,10 @@ class TestCasesModels(CustomTestCase):
         - Nested path updates
         - Path integrity after moves
         """
-        user = UserModel.get_one_user(self.user)
-        case3 = CaseModel.get_one_object(user=user, idx=3)
-        case11 = CaseModel.get_one_object(user=user, idx=11)
-        case9 = CaseModel.get_one_object(user=user, idx=9)
-        case10 = CaseModel.get_one_object(user=user, idx=10)
+        case3 = CaseModel.get_one_object(user=self.user, idx=3)
+        case11 = CaseModel.get_one_object(user=self.user, idx=11)
+        case9 = CaseModel.get_one_object(user=self.user, idx=9)
+        case10 = CaseModel.get_one_object(user=self.user, idx=10)
         case3.move_to(case11)
         case9.move_to(case3)
         self.assertEqual(case10.path, "1/7/11/3/9/")
@@ -152,10 +148,9 @@ class TestCasesModels(CustomTestCase):
         - Case deletion removes the case
         - Child cases are properly handled
         """
-        user = UserModel.get_one_user(self.user)
-        case7 = CaseModel.get_one_object(user=user, idx=7)
+        case7 = CaseModel.get_one_object(user=self.user, idx=7)
         case7.delete()
-        case11 = CaseModel.get_one_object(user=user, idx=11)
+        case11 = CaseModel.get_one_object(user=self.user, idx=11)
         self.assertIsNone(case11)
 
     def test_descendants(self):
@@ -166,8 +161,7 @@ class TestCasesModels(CustomTestCase):
         - Correct counting of descendants
         - Proper descendant relationships
         """
-        user = UserModel.get_one_user(self.user)
-        case7 = CaseModel.get_one_object(user=user, idx=7)
+        case7 = CaseModel.get_one_object(user=self.user, idx=7)
         self.assertEqual(len(case7.descendants), 4)
 
     def test_depth(self):
@@ -178,8 +172,7 @@ class TestCasesModels(CustomTestCase):
         - Correct depth calculation in case tree
         - Proper nesting level determination
         """
-        user = UserModel.get_one_user(self.user)
-        case10 = CaseModel.get_one_object(user=user, idx=10)
+        case10 = CaseModel.get_one_object(user=self.user, idx=10)
         self.assertEqual(case10.depth, 4)
 
 
@@ -234,12 +227,11 @@ class TestCasesFromInstanceExecutionEndpoint(CustomTestCase):
             "execution_id": execution_id,
             "schema": "solve_model_dag",
         }
-        self.user_object = UserModel.get_one_user(self.user)
         self.instance = InstanceModel.get_one_object(
-            user=self.user_object, idx=instance_id
+            user=self.user, idx=instance_id
         )
         self.execution = ExecutionModel.get_one_object(
-            user=self.user_object, idx=execution_id
+            user=self.user, idx=execution_id
         )
 
     def test_new_case_execution(self):
@@ -266,7 +258,7 @@ class TestCasesFromInstanceExecutionEndpoint(CustomTestCase):
         self.payload["schema"] = self.instance.schema
         self.payload["solution"] = self.execution.data
         self.payload["solution_hash"] = self.execution.data_hash
-        self.payload["user_id"] = self.user
+        self.payload["user_id"] = self.user.id
         self.payload["indicators"] = ""
 
         for key in self.response_items:
@@ -293,7 +285,7 @@ class TestCasesFromInstanceExecutionEndpoint(CustomTestCase):
         self.payload["data"] = self.instance.data
         self.payload["data_hash"] = self.instance.data_hash
         self.payload["schema"] = self.instance.schema
-        self.payload["user_id"] = self.user
+        self.payload["user_id"] = self.user.id
         self.payload["solution"] = None
         self.payload["solution_hash"] = hash_json_256(None)
         self.payload["indicators"] = ""
@@ -488,10 +480,9 @@ class TestCaseCopyEndpoint(CustomTestCase):
         new_case = self.create_new_row(
             self.url + str(self.case_id) + "/copy/", self.model, {}, check_payload=False
         )
-        user = UserModel.get_one_user(self.user)
 
-        original_case = CaseModel.get_one_object(user=user, idx=self.case_id)
-        new_case = CaseModel.get_one_object(user=user, idx=new_case["id"])
+        original_case = CaseModel.get_one_object(user=self.user, idx=self.case_id)
+        new_case = CaseModel.get_one_object(user=self.user, idx=new_case["id"])
 
         for key in self.copied_items:
             self.assertEqual(getattr(original_case, key), getattr(new_case, key))

cornflow/tests/unit/test_cli.py

@@ -33,6 +33,7 @@ from cornflow.models import (
 from cornflow.models import UserModel
 from cornflow.shared import db
 from cornflow.shared.exceptions import NoPermission, ObjectDoesNotExist
+from cornflow.endpoints import resources, alarms_resources
 
 
 class CLITests(TestCase):
@@ -281,7 +282,7 @@ class CLITests(TestCase):
         result = runner.invoke(cli, ["views", "init", "-v"])
         self.assertEqual(result.exit_code, 0)
         views = ViewModel.get_all_objects().all()
-        self.assertEqual(len(views), 49)
+        self.assertEqual(len(views), (len(resources) + len(alarms_resources)))
 
     def test_permissions_entrypoint(self):
         """
@@ -323,8 +324,8 @@ class CLITests(TestCase):
         permissions = PermissionViewRoleModel.get_all_objects().all()
         self.assertEqual(len(actions), 5)
         self.assertEqual(len(roles), 4)
-        self.assertEqual(len(views), 49)
-        self.assertEqual(len(permissions), 546)
+        self.assertEqual(len(views), (len(resources) + len(alarms_resources)))
+        self.assertEqual(len(permissions), 562)
 
     def test_permissions_base_command(self):
         """
@@ -348,8 +349,8 @@ class CLITests(TestCase):
         permissions = PermissionViewRoleModel.get_all_objects().all()
         self.assertEqual(len(actions), 5)
         self.assertEqual(len(roles), 4)
-        self.assertEqual(len(views), 49)
-        self.assertEqual(len(permissions), 546)
+        self.assertEqual(len(views), (len(resources) + len(alarms_resources)))
+        self.assertEqual(len(permissions), 562)
 
     def test_service_entrypoint(self):
         """

cornflow/tests/unit/test_commands.py

@@ -381,8 +381,8 @@ class TestCommands(TestCase):
         service_permissions = PermissionsDAG.get_user_dag_permissions(service.id)
         admin_permissions = PermissionsDAG.get_user_dag_permissions(admin.id)
 
-        self.assertEqual(3, len(service_permissions))
-        self.assertEqual(3, len(admin_permissions))
+        self.assertEqual(4, len(service_permissions))
+        self.assertEqual(4, len(admin_permissions))
 
     def test_dag_permissions_command_no_open(self):
         """
@@ -405,7 +405,7 @@ class TestCommands(TestCase):
         service_permissions = PermissionsDAG.get_user_dag_permissions(service.id)
         admin_permissions = PermissionsDAG.get_user_dag_permissions(admin.id)
 
-        self.assertEqual(3, len(service_permissions))
+        self.assertEqual(4, len(service_permissions))
         self.assertEqual(0, len(admin_permissions))
 
     def test_argument_parsing_correct(self):