Remove test test_try_to_update_linode_alerts_legacy_and_aclp_at_the_same_time and add test test_update_linode_aclp_alerts

Author: psnoch-akamai

test/integration/conftest.py

@@ -728,3 +728,64 @@ def test_monitor_client(get_monitor_token_for_db_entities):
     )
 
     return client, entity_ids
+
+
+@pytest.fixture(scope="session")
+def create_alert_service_definition(test_linode_client):
+    rule_criteria = {
+        "rules": [
+            {
+                "aggregate_function": "min",
+                "dimension_filters": [
+                    {
+                        "dimension_label": "node_type",
+                        "label": "Node Type",
+                        "operator": "eq",
+                        "value": "primary",
+                    }
+                ],
+                "label": "Memory Usage",
+                "metric": "memory_usage",
+                "operator": "eq",
+                "threshold": 95,
+                "unit": "percent",
+            }
+        ]
+    }
+    trigger_conditions = {
+        "criteria_condition": "ALL",
+        "evaluation_period_seconds": 300,
+        "polling_interval_seconds": 900,
+        "trigger_occurrences": 3,
+    }
+    channels = list(test_linode_client.monitor.alert_channels())
+    if len(channels) == 0:
+        raise Exception(
+            "No alert channels available for testing. Please create an alert channel and try again."
+        )
+    alert = test_linode_client.monitor.create_alert_definition(
+        service_type="dbaas",
+        label=get_test_label() + "-service-definition",
+        severity=1,
+        description="description",
+        channel_ids=[channels[0].id],
+        rule_criteria=rule_criteria,
+        trigger_conditions=trigger_conditions,
+    )
+
+    yield alert
+
+    alert.delete()
+
+
+def get_system_alerts(client: LinodeClient):
+    alerts = client.monitor.alert_definitions()
+    system_alerts = []
+    for alert in alerts.lists[0]:
+        if alert.type == "system":
+            system_alerts.append(alert)
+    if len(system_alerts) == 0:
+        raise Exception(
+            "No system alert definitions found. Cannot run tests dependent on system alert definitions."
+        )
+    return system_alerts

test/integration/models/linode/test_linode.py

@@ -1,6 +1,6 @@
 import ipaddress
 import time
-from test.integration.conftest import get_region
+from test.integration.conftest import get_region, get_system_alerts
 from test.integration.helpers import (
     get_test_label,
     retry_sending_request,
@@ -407,27 +407,19 @@ def test_linode_alerts_workflow(test_linode_client, create_linode):
         new_linode.delete()
 
 
-def test_try_to_update_linode_alerts_legacy_and_aclp_at_the_same_time(
-    create_linode,
+def test_update_linode_aclp_alerts(
+    test_linode_client, create_linode, create_alert_service_definition
 ):
     linode = create_linode
+    sample_system_alert = get_system_alerts(test_linode_client)[0].id
 
     linode.alerts = {
-        "cpu": 50,
-        "io": 6000,
-        "network_in": 20,
-        "network_out": 20,
-        "transfer_quota": 50,
-        "system_alerts": [1, 436],
-        "user_alerts": [555],
+        "user_alerts": [create_alert_service_definition.id],
+        "system_alerts": [sample_system_alert],
     }
-
-    with pytest.raises(ApiError) as err:
-        linode.save()
-    assert "Cannot set both legacy and ACLP alerts simultaneously" in str(
-        err.value
-    )
-    assert "[400] alerts" in str(err.value)
+    linode.save()
+    assert linode.alerts["user_alerts"] == [create_alert_service_definition.id]
+    assert linode.alerts["system_alerts"] == [sample_system_alert]
 
 
 def test_linode_shutdown(create_linode):