Merge branch 'dev' into feature/TPT-4109-python-sdk-support-regions-vpc-availability-endpoints

Author: mgwoj

linode_api4/objects/linode.py

@@ -1,6 +1,7 @@
 import copy
 import string
 import sys
+import warnings
 from dataclasses import dataclass, field
 from datetime import datetime
 from enum import Enum
@@ -217,7 +218,7 @@ def resize(self, new_size):
 class Kernel(Base):
     """
     The primary component of every Linux system. The kernel interfaces
-    with the system’s hardware and it controls the operating system’s core functionality.
+    with the system’s hardware, and it controls the operating system’s core functionality.
 
     Your Compute Instance is capable of running one of three kinds of kernels:
 
@@ -237,6 +238,10 @@ class Kernel(Base):
           to compile the kernel from source than to download it from your package manager. For more
           information on custom compiled kernels, review our guides for Debian, Ubuntu, and CentOS.
 
+    .. note::
+        The ``xen`` property is deprecated and is no longer returned by the API.
+        It is maintained for backward compatibility only.
+
     API Documentation: https://techdocs.akamai.com/linode-api/reference/get-kernel
     """
 
@@ -256,6 +261,16 @@ class Kernel(Base):
         "pvops": Property(),
     }
 
+    def __getattribute__(self, name: str) -> object:
+        if name == "xen":
+            warnings.warn(
+                "The 'xen' property of Kernel is deprecated and is no longer "
+                "returned by the API. It is maintained for backward compatibility only.",
+                DeprecationWarning,
+                stacklevel=2,
+            )
+        return super().__getattribute__(name)
+
 
 class Type(Base):
     """

linode_api4/objects/monitor.py

@@ -116,6 +116,19 @@ class DashboardType(StrEnum):
     custom = "custom"
 
 
+class AlertStatus(StrEnum):
+    """
+    Enum for supported alert status values.
+    """
+
+    AlertDefinitionStatusProvisioning = "provisioning"
+    AlertDefinitionStatusEnabling = "enabling"
+    AlertDefinitionStatusDisabling = "disabling"
+    AlertDefinitionStatusEnabled = "enabled"
+    AlertDefinitionStatusDisabled = "disabled"
+    AlertDefinitionStatusFailed = "failed"
+
+
 @dataclass
 class Filter(JSONObject):
     """
@@ -428,6 +441,40 @@ class ChannelContent(JSONObject):
     # Other channel types like 'webhook', 'slack' could be added here as Optional fields.
 
 
+@dataclass
+class EmailDetails(JSONObject):
+    """
+    Represents email-specific details for an alert channel.
+    """
+
+    usernames: Optional[List[str]] = None
+    recipient_type: Optional[str] = None
+
+
+@dataclass
+class ChannelDetails(JSONObject):
+    """
+    Represents the details block for an AlertChannel, which varies by channel type.
+    """
+
+    email: Optional[EmailDetails] = None
+
+
+@dataclass
+class AlertInfo(JSONObject):
+    """
+    Represents a reference to alerts associated with an alert channel.
+    Fields:
+      - url: str - API URL to fetch the alerts for this channel
+      - type: str - Type identifier (e.g., 'alerts-definitions')
+      - alert_count: int - Number of alerts associated with this channel
+    """
+
+    url: str = ""
+    _type: str = field(default="", metadata={"json_key": "type"})
+    alert_count: int = 0
+
+
 class AlertChannel(Base):
     """
     Represents an alert channel used to deliver notifications when alerts
@@ -450,7 +497,8 @@ class AlertChannel(Base):
         "label": Property(),
         "type": Property(),
         "channel_type": Property(),
-        "alerts": Property(mutable=False, json_object=Alerts),
+        "details": Property(mutable=False, json_object=ChannelDetails),
+        "alerts": Property(mutable=False, json_object=AlertInfo),
         "content": Property(mutable=False, json_object=ChannelContent),
         "created": Property(is_datetime=True),
         "updated": Property(is_datetime=True),

test/integration/models/account/test_account.py

@@ -1,7 +1,11 @@
 import time
 from datetime import datetime
 from test.integration.conftest import get_region
-from test.integration.helpers import get_test_label, retry_sending_request
+from test.integration.helpers import (
+    get_test_label,
+    retry_sending_request,
+    wait_for_condition,
+)
 
 import pytest
 
@@ -102,13 +106,18 @@ def test_latest_get_event(test_linode_client, e2e_test_firewall):
         firewall=e2e_test_firewall,
     )
 
-    events = client.load(Event, "")
+    def get_linode_status():
+        return linode.status == "running"
 
-    latest_events = events._raw_json.get("data")
+    # To ensure the Linode is running and the 'event' key has been populated
+    wait_for_condition(3, 100, get_linode_status)
+
+    events = client.load(Event, "")
+    latest_events = events._raw_json.get("data")[:15]
 
     linode.delete()
 
-    for event in latest_events[:15]:
+    for event in latest_events:
         if label == event["entity"]["label"]:
             break
     else:

test/integration/models/domain/test_domain.py

@@ -43,10 +43,10 @@ def test_clone(test_linode_client, test_domain):
     dom = "example.clone-" + timestamp + "-inttestsdk.org"
     domain.clone(dom)
 
-    ds = test_linode_client.domains()
-
     time.sleep(1)
 
+    ds = test_linode_client.domains()
+
     domains = [i.domain for i in ds]
 
     assert dom in domains

test/integration/models/linode/test_linode.py

@@ -611,6 +611,12 @@ def test_linode_initate_migration(test_linode_client, e2e_test_firewall):
         migration_type=MigrationType.COLD,
     )
 
+    def get_linode_status():
+        return linode.status == "offline"
+
+    # To verify that Linode's status changed before deletion (during migration status is set to 'offline')
+    wait_for_condition(5, 120, get_linode_status)
+
     res = linode.delete()
 
     assert res

test/integration/models/monitor/test_monitor.py

@@ -16,6 +16,7 @@
     MonitorService,
     MonitorServiceToken,
 )
+from linode_api4.objects.monitor import AlertStatus
 
 
 # List all dashboards
@@ -227,7 +228,8 @@ def wait_for_alert_ready(alert_id, service_type: str):
         interval = initial_timeout
         alert = client.load(AlertDefinition, alert_id, service_type)
         while (
-            getattr(alert, "status", None) == "in progress"
+            getattr(alert, "status", None)
+            != AlertStatus.AlertDefinitionStatusEnabled
             and (time.time() - start) < timeout
         ):
             time.sleep(interval)

test/integration/models/networking/test_networking.py

@@ -32,7 +32,7 @@
 )
 
 
-def create_linode(test_linode_client):
+def create_linode_func(test_linode_client):
     client = test_linode_client
 
     label = get_test_label()
@@ -49,7 +49,7 @@ def create_linode(test_linode_client):
 
 @pytest.fixture
 def create_linode_for_ip_share(test_linode_client):
-    linode = create_linode(test_linode_client)
+    linode = create_linode_func(test_linode_client)
 
     yield linode
 
@@ -58,7 +58,7 @@ def create_linode_for_ip_share(test_linode_client):
 
 @pytest.fixture
 def create_linode_to_be_shared_with_ips(test_linode_client):
-    linode = create_linode(test_linode_client)
+    linode = create_linode_func(test_linode_client)
 
     yield linode
 
@@ -302,6 +302,8 @@ def test_create_and_delete_vlan(test_linode_client, linode_for_vlan_tests):
     wait_for_condition(3, 100, get_status, linode, "rebooting")
     assert linode.status == "rebooting"
 
+    wait_for_condition(3, 100, get_status, linode, "running")
+
     # Delete the VLAN
     is_deleted = test_linode_client.networking.delete_vlan(
         vlan_label, linode.region
@@ -334,6 +336,7 @@ def test_get_global_firewall_settings(test_linode_client):
 
 def test_ip_info(test_linode_client, create_linode):
     linode = create_linode
+    wait_for_condition(3, 100, get_status, linode, "running")
 
     ip_info = test_linode_client.load(IPAddress, linode.ipv4[0])
 

test/integration/models/nodebalancer/test_nodebalancer.py

@@ -130,7 +130,7 @@ def test_get_nb_config_with_udp(test_linode_client, create_nb_config_with_udp):
 
     assert "udp" == config.protocol
     assert 1234 == config.udp_check_port
-    assert 16 == config.udp_session_timeout
+    assert 2 == config.udp_session_timeout
 
 
 def test_update_nb_config(test_linode_client, create_nb_config_with_udp):