Testing progresss

Author: lgarber-akamai

linode_api4/linode_client.py

@@ -283,10 +283,6 @@ def _api_call(
             verify=self.ca_path or self.session.verify,
         )
 
-        print(
-            "\nNEW REQUEST:\n", method, url, "\n", body, "\n", response.json()
-        )
-
         warning = response.headers.get("Warning", None)
         if warning:
             logger.warning("Received warning from server: {}".format(warning))

linode_api4/objects/linode.py

@@ -1962,7 +1962,7 @@ def interfaces_settings(self) -> LinodeInterfacesSettings:
         return self._interfaces_settings
 
     @property
-    def interfaces(self):
+    def interfaces(self) -> List[LinodeInterface]:
         """
         All interfaces for this Linode.
 

linode_api4/objects/linode_interfaces.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass, field
-from typing import List, Optional
+from typing import List, Optional, Union
 
 from linode_api4.objects.base import Base, Property
 from linode_api4.objects.dbase import DerivedBase
@@ -163,7 +163,7 @@ class LinodeInterfaceOptions(JSONObject):
     Options accepted when creating or updating a Linode Interface.
     """
 
-    firewall_id: Optional[int] = None
+    firewall_id: Optional[Union[Firewall, int]] = None
     default_route: Optional[LinodeInterfaceDefaultRouteOptions] = None
     vpc: Optional[LinodeInterfaceVPCOptions] = None
     public: Optional[LinodeInterfacePublicOptions] = None
@@ -319,7 +319,7 @@ class LinodeInterfacePublicIPv6(JSONObject):
 @dataclass
 class LinodeInterfacePublic(JSONObject):
     """
-    Public-specific configuration field for a Linode Interface.
+    Public-specific configuration fields for a Linode Interface.
     """
 
     put_class = LinodeInterfacePublicOptions
@@ -331,7 +331,7 @@ class LinodeInterfacePublic(JSONObject):
 @dataclass
 class LinodeInterfaceVLAN(JSONObject):
     """
-    VLAN-specific configuration field for a Linode Interface.
+    VLAN-specific configuration fields for a Linode Interface.
     """
 
     put_class = LinodeInterfaceVLANOptions

test/integration/models/linode/interfaces/test_interfaces.py

@@ -0,0 +1,81 @@
+from test.integration.conftest import get_region
+from test.integration.helpers import get_test_label
+
+import pytest
+
+from linode_api4 import (
+    Instance,
+    InterfaceGeneration,
+    LinodeInterface,
+    LinodeInterfaceDefaultRouteOptions,
+    LinodeInterfaceOptions,
+    LinodeInterfacePublicOptions,
+)
+
+
+@pytest.fixture(scope="session")
+def linode_create_with_interfaces(test_linode_client, e2e_test_firewall):
+    client = test_linode_client
+    region = get_region(
+        client,
+        {"Linodes", "Cloud Firewall", "Linode Interfaces"},
+        site_type="core",
+    )
+    label = get_test_label()
+
+    instance, _ = client.linode.instance_create(
+        "g6-nanode-1",
+        region,
+        image="linode/debian12",
+        label=label,
+        interface_generation=InterfaceGeneration.LINODE,
+        interfaces=[
+            LinodeInterfaceOptions(
+                firewall_id=e2e_test_firewall.id,
+                default_route=LinodeInterfaceDefaultRouteOptions(
+                    ipv4=True,
+                    ipv6=True,
+                ),
+                public=LinodeInterfacePublicOptions(),
+            )
+        ],
+    )
+
+    yield instance
+
+    instance.delete()
+
+
+def test_linode_create_with_linode_interfaces(linode_create_with_interfaces):
+    instance: Instance = linode_create_with_interfaces
+
+    def __assert_base(iface: LinodeInterface):
+        assert iface.id is not None
+        assert iface.linode_id == instance.id
+
+        assert iface.created is not None
+        assert iface.updated is not None
+
+        assert isinstance(iface.mac_address, str)
+        assert iface.version
+
+    def __assert_public(iface: LinodeInterface):
+        __assert_base(iface)
+
+        assert iface.default_route.ipv4
+        assert iface.default_route.ipv6
+
+        assert iface.public.ipv4.addresses[0].address == instance.ipv4[0]
+        assert iface.public.ipv4.addresses[0].primary
+        assert len(iface.public.ipv4.shared) == 0
+
+        assert iface.public.ipv6.slaac[0].address == instance.ipv6.split("/")[0]
+        assert iface.public.ipv6.slaac[0].prefix == 64
+        assert len(iface.public.ipv6.shared) == 0
+        assert len(iface.public.ipv6.ranges) == 0
+
+    __assert_public(instance.interfaces[0])
+
+    instance.invalidate()
+
+    __assert_public(instance.interfaces[0])