various changes

Author: lgarber-akamai

test/integration/conftest.py

@@ -12,7 +12,16 @@
 import requests
 from requests.exceptions import ConnectionError, RequestException
 
-from linode_api4 import PlacementGroupPolicy, PlacementGroupType
+from linode_api4 import (
+    InterfaceGeneration,
+    LinodeInterfaceDefaultRouteOptions,
+    LinodeInterfaceOptions,
+    LinodeInterfacePublicOptions,
+    LinodeInterfaceVLANOptions,
+    LinodeInterfaceVPCOptions,
+    PlacementGroupPolicy,
+    PlacementGroupType,
+)
 from linode_api4.linode_client import LinodeClient
 from linode_api4.objects import Region
 
@@ -521,3 +530,73 @@ def linode_for_vlan_tests(test_linode_client, e2e_test_firewall):
     yield linode_instance
 
     linode_instance.delete()
+
+
+@pytest.fixture(scope="session")
+def linode_with_interface_generation_linode(
+    test_linode_client,
+    e2e_test_firewall,
+    # We won't be using this all the time, but it's
+    # necessary for certain consumers of this fixture
+    create_vpc_with_subnet,
+):
+    client = test_linode_client
+
+    label = get_test_label()
+
+    instance = client.linode.instance_create(
+        "g6-nanode-1",
+        create_vpc_with_subnet[0].region,
+        label=label,
+        interface_generation=InterfaceGeneration.LINODE,
+        booted=False,
+    )
+
+    yield instance
+
+    instance.delete()
+
+
+@pytest.fixture(scope="session")
+def linode_with_linode_interfaces(
+    test_linode_client, e2e_test_firewall, create_vpc_with_subnet
+):
+    client = test_linode_client
+    vpc, subnet = create_vpc_with_subnet
+
+    # Are there regions where VPCs are supported but Linode Interfaces aren't?
+    region = vpc.region
+    label = get_test_label()
+
+    instance, _ = client.linode.instance_create(
+        "g6-nanode-1",
+        region,
+        image="linode/debian12",
+        label=label,
+        booted=False,
+        interface_generation=InterfaceGeneration.LINODE,
+        interfaces=[
+            LinodeInterfaceOptions(
+                firewall_id=e2e_test_firewall.id,
+                default_route=LinodeInterfaceDefaultRouteOptions(
+                    ipv4=True,
+                    ipv6=True,
+                ),
+                public=LinodeInterfacePublicOptions(),
+            ),
+            LinodeInterfaceOptions(
+                vpc=LinodeInterfaceVPCOptions(
+                    subnet_id=subnet.id,
+                ),
+            ),
+            LinodeInterfaceOptions(
+                vlan=LinodeInterfaceVLANOptions(
+                    vlan_label="test-vlan", ipam_address="10.0.0.5/32"
+                ),
+            ),
+        ],
+    )
+
+    yield instance
+
+    instance.delete()

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

@@ -1,16 +1,13 @@
 import copy
 import ipaddress
-from test.integration.helpers import get_test_label
 
 import pytest
 
 from linode_api4 import (
     ApiError,
     Instance,
-    InterfaceGeneration,
     LinodeInterface,
     LinodeInterfaceDefaultRouteOptions,
-    LinodeInterfaceOptions,
     LinodeInterfacePublicIPv4AddressOptions,
     LinodeInterfacePublicIPv4Options,
     LinodeInterfacePublicIPv6Options,
@@ -23,79 +20,11 @@
 )
 
 
-@pytest.fixture(scope="function")
-def instance_with_interface_generation_linode(
-    test_linode_client,
-    e2e_test_firewall,
-    # We won't be using this all the time, but it's
-    # necessary for certain consumers of this fixture
-    create_vpc_with_subnet,
-):
-    client = test_linode_client
-
-    label = get_test_label()
-
-    instance = client.linode.instance_create(
-        "g6-nanode-1",
-        create_vpc_with_subnet[0].region,
-        label=label,
-        interface_generation=InterfaceGeneration.LINODE,
-    )
-
-    yield instance
-
-    instance.delete()
-
-
-@pytest.fixture(scope="session")
-def instance_with_interfaces(
-    test_linode_client, e2e_test_firewall, create_vpc_with_subnet
-):
-    client = test_linode_client
-    vpc, subnet = create_vpc_with_subnet
-
-    # Are there regions where VPCs are supported but Linode Interfaces aren't?
-    region = vpc.region
-    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(),
-            ),
-            LinodeInterfaceOptions(
-                vpc=LinodeInterfaceVPCOptions(
-                    subnet_id=subnet.id,
-                ),
-            ),
-            LinodeInterfaceOptions(
-                vlan=LinodeInterfaceVLANOptions(
-                    vlan_label="test-vlan", ipam_address="10.0.0.5/32"
-                ),
-            ),
-        ],
-    )
-
-    yield instance
-
-    instance.delete()
-
-
 def test_linode_create_with_linode_interfaces(
     create_vpc_with_subnet,
-    instance_with_interfaces,
+    linode_with_linode_interfaces,
 ):
-    instance: Instance = instance_with_interfaces
+    instance: Instance = linode_with_linode_interfaces
     vpc, subnet = create_vpc_with_subnet
 
     def __assert_base(iface: LinodeInterface):
@@ -164,9 +93,9 @@ def __assert_vlan(iface: LinodeInterface):
 def linode_interface_public(
     test_linode_client,
     e2e_test_firewall,
-    instance_with_interface_generation_linode,
+    linode_with_interface_generation_linode,
 ):
-    instance: Instance = instance_with_interface_generation_linode
+    instance: Instance = linode_with_interface_generation_linode
 
     ipv6_range = test_linode_client.networking.ipv6_range_allocate(
         64, linode=instance.id
@@ -202,10 +131,10 @@ def linode_interface_public(
 def linode_interface_vpc(
     test_linode_client,
     e2e_test_firewall,
-    instance_with_interface_generation_linode,
+    linode_with_interface_generation_linode,
     create_vpc_with_subnet,
 ):
-    instance: Instance = instance_with_interface_generation_linode
+    instance: Instance = linode_with_interface_generation_linode
     vpc, subnet = create_vpc_with_subnet
 
     yield instance.interface_create(
@@ -238,10 +167,10 @@ def linode_interface_vpc(
 def linode_interface_vlan(
     test_linode_client,
     e2e_test_firewall,
-    instance_with_interface_generation_linode,
+    linode_with_interface_generation_linode,
     create_vpc_with_subnet,
 ):
-    instance: Instance = instance_with_interface_generation_linode
+    instance: Instance = linode_with_interface_generation_linode
 
     yield instance.interface_create(
         vlan=LinodeInterfaceVLANOptions(

test/integration/models/linode/test_linode.py

@@ -9,7 +9,10 @@
 
 import pytest
 
-from linode_api4 import InterfaceGeneration, LinodeInterface
+from linode_api4 import (
+    InterfaceGeneration,
+    LinodeInterface,
+)
 from linode_api4.errors import ApiError
 from linode_api4.objects import (
     Config,
@@ -68,7 +71,7 @@ def linode_with_volume_firewall(test_linode_client):
 
 
 @pytest.fixture(scope="function")
-def linode_for_network_interface_tests(test_linode_client, e2e_test_firewall):
+def linode_for_legacy_interface_tests(test_linode_client, e2e_test_firewall):
     client = test_linode_client
     region = get_region(client, {"Linodes", "Cloud Firewall"}, site_type="core")
     label = get_test_label(length=8)
@@ -88,7 +91,7 @@ def linode_for_network_interface_tests(test_linode_client, e2e_test_firewall):
 
 
 @pytest.fixture(scope="function")
-def linode_and_vpc_for_network_interface_tests_offline(
+def linode_and_vpc_for_legacy_interface_tests_offline(
     test_linode_client, create_vpc_with_subnet, e2e_test_firewall
 ):
     vpc, subnet = create_vpc_with_subnet
@@ -614,10 +617,10 @@ def test_linode_initate_migration(test_linode_client, e2e_test_firewall):
 
 
 def test_linode_upgrade_interfaces(
-    linode_for_network_interface_tests,
-    linode_and_vpc_for_network_interface_tests_offline,
+    linode_for_legacy_interface_tests,
+    linode_and_vpc_for_legacy_interface_tests_offline,
 ):
-    vpc, subnet, linode, _ = linode_and_vpc_for_network_interface_tests_offline
+    vpc, subnet, linode, _ = linode_and_vpc_for_legacy_interface_tests_offline
     config = linode.configs[0]
 
     new_interfaces = [
@@ -709,6 +712,34 @@ def __assert_vlan(iface: LinodeInterface):
     __assert_vpc(linode.interfaces[2])
 
 
+def test_linode_interfaces_settings(linode_with_linode_interfaces):
+    linode = linode_with_linode_interfaces
+    settings = linode.interfaces_settings
+
+    assert settings.network_helper is not None
+    assert settings.default_route.ipv4_interface_id == linode.interfaces[0].id
+    assert settings.default_route.ipv4_eligible_interface_ids == [
+        linode.interfaces[0].id,
+        linode.interfaces[1].id,
+    ]
+
+    assert settings.default_route.ipv6_interface_id == linode.interfaces[0].id
+    assert settings.default_route.ipv6_eligible_interface_ids == [
+        linode.interfaces[0].id
+    ]
+
+    # Arbitrary updates
+    settings.network_helper = True
+    settings.default_route.ipv4_interface_id = linode.interfaces[1].id
+
+    settings.save()
+    settings.invalidate()
+
+    # Assert updates
+    assert settings.network_helper is not None
+    assert settings.default_route.ipv4_interface_id == linode.interfaces[1].id
+
+
 def test_config_update_interfaces(create_linode):
     linode = create_linode
     config = linode.configs[0]
@@ -792,8 +823,8 @@ def test_save_linode_force(test_linode_client, create_linode):
 
 
 class TestNetworkInterface:
-    def test_list(self, linode_for_network_interface_tests):
-        linode = linode_for_network_interface_tests
+    def test_list(self, linode_for_legacy_interface_tests):
+        linode = linode_for_legacy_interface_tests
 
         config: Config = linode.configs[0]
 
@@ -813,8 +844,8 @@ def test_list(self, linode_for_network_interface_tests):
         assert interface[1].label == label
         assert interface[1].ipam_address == "10.0.0.3/32"
 
-    def test_create_public(self, linode_for_network_interface_tests):
-        linode = linode_for_network_interface_tests
+    def test_create_public(self, linode_for_legacy_interface_tests):
+        linode = linode_for_legacy_interface_tests
 
         config: Config = linode.configs[0]
 
@@ -831,8 +862,8 @@ def test_create_public(self, linode_for_network_interface_tests):
         assert interface.purpose == "public"
         assert interface.primary
 
-    def test_create_vlan(self, linode_for_network_interface_tests):
-        linode = linode_for_network_interface_tests
+    def test_create_vlan(self, linode_for_legacy_interface_tests):
+        linode = linode_for_legacy_interface_tests
 
         config: Config = linode.configs[0]
 
@@ -856,10 +887,10 @@ def test_create_vpu(self, test_linode_client, linode_for_vpu_tests):
     def test_create_vpc(
         self,
         test_linode_client,
-        linode_and_vpc_for_network_interface_tests_offline,
+        linode_and_vpc_for_legacy_interface_tests_offline,
     ):
         vpc, subnet, linode, _ = (
-            linode_and_vpc_for_network_interface_tests_offline
+            linode_and_vpc_for_legacy_interface_tests_offline
         )
 
         config: Config = linode.configs[0]
@@ -913,10 +944,10 @@ def test_create_vpc(
 
     def test_update_vpc(
         self,
-        linode_and_vpc_for_network_interface_tests_offline,
+        linode_and_vpc_for_legacy_interface_tests_offline,
     ):
         vpc, subnet, linode, _ = (
-            linode_and_vpc_for_network_interface_tests_offline
+            linode_and_vpc_for_legacy_interface_tests_offline
         )
 
         config: Config = linode.configs[0]
@@ -946,8 +977,8 @@ def test_update_vpc(
         assert interface.ipv4.nat_1_1 == linode.ipv4[0]
         assert interface.ip_ranges == ["10.0.0.9/32"]
 
-    def test_reorder(self, linode_for_network_interface_tests):
-        linode = linode_for_network_interface_tests
+    def test_reorder(self, linode_for_legacy_interface_tests):
+        linode = linode_for_legacy_interface_tests
 
         config: Config = linode.configs[0]