test tidy

Author: lgarber-akamai

test/integration/conftest.py

@@ -432,28 +432,6 @@ def create_vpc_with_subnet_and_linode(
     instance.delete()
 
 
-@pytest.fixture(scope="session")
-def create_vpc_with_subnet_and_linode_offline(
-    test_linode_client, create_vpc_with_subnet, e2e_test_firewall
-):
-    vpc, subnet = create_vpc_with_subnet
-
-    label = get_test_label(length=8)
-
-    instance, password = test_linode_client.linode.instance_create(
-        "g6-standard-1",
-        vpc.region,
-        booted=False,
-        image="linode/debian11",
-        label=label,
-        firewall=e2e_test_firewall,
-    )
-
-    yield vpc, subnet, instance, password
-
-    instance.delete()
-
-
 @pytest.fixture(scope="session")
 def create_multiple_vpcs(test_linode_client):
     client = test_linode_client

test/integration/models/linode/test_linode.py

@@ -9,7 +9,7 @@
 
 import pytest
 
-from linode_api4 import LinodeInterface
+from linode_api4 import InterfaceGeneration, LinodeInterface
 from linode_api4.errors import ApiError
 from linode_api4.objects import (
     Config,
@@ -67,7 +67,7 @@ def linode_with_volume_firewall(test_linode_client):
     linode_instance.delete()
 
 
-@pytest.fixture(scope="session")
+@pytest.fixture(scope="function")
 def linode_for_network_interface_tests(test_linode_client, e2e_test_firewall):
     client = test_linode_client
     region = get_region(client, {"Linodes", "Cloud Firewall"}, site_type="core")
@@ -79,13 +79,37 @@ def linode_for_network_interface_tests(test_linode_client, e2e_test_firewall):
         image="linode/debian12",
         label=label,
         firewall=e2e_test_firewall,
+        interface_generation=InterfaceGeneration.LEGACY_CONFIG,
     )
 
     yield linode_instance
 
     linode_instance.delete()
 
 
+@pytest.fixture(scope="function")
+def linode_and_vpc_for_network_interface_tests_offline(
+    test_linode_client, create_vpc_with_subnet, e2e_test_firewall
+):
+    vpc, subnet = create_vpc_with_subnet
+
+    label = get_test_label(length=8)
+
+    instance, password = test_linode_client.linode.instance_create(
+        "g6-standard-1",
+        vpc.region,
+        booted=False,
+        image="linode/debian11",
+        label=label,
+        firewall=e2e_test_firewall,
+        interface_generation=InterfaceGeneration.LEGACY_CONFIG,
+    )
+
+    yield vpc, subnet, instance, password
+
+    instance.delete()
+
+
 @pytest.fixture(scope="session")
 def linode_for_vpu_tests(test_linode_client, e2e_test_firewall):
     client = test_linode_client
@@ -181,7 +205,7 @@ def create_linode_for_long_running_tests(test_linode_client, e2e_test_firewall):
 def linode_with_disk_encryption(test_linode_client, request):
     client = test_linode_client
 
-    target_region = get_region(client, {"LA Disk Encryption"})
+    target_region = get_region(client, {"Disk Encryption"})
     label = get_test_label(length=8)
 
     disk_encryption = request.param
@@ -236,7 +260,7 @@ def test_linode_transfer(test_linode_client, linode_with_volume_firewall):
 def test_linode_rebuild(test_linode_client):
     client = test_linode_client
 
-    region = get_region(client, {"LA Disk Encryption"})
+    region = get_region(client, {"Disk Encryption"})
 
     label = get_test_label() + "_rebuild"
 
@@ -591,9 +615,9 @@ def test_linode_initate_migration(test_linode_client, e2e_test_firewall):
 
 def test_linode_upgrade_interfaces(
     linode_for_network_interface_tests,
-    create_vpc_with_subnet_and_linode_offline,
+    linode_and_vpc_for_network_interface_tests_offline,
 ):
-    vpc, subnet, linode, _ = create_vpc_with_subnet_and_linode_offline
+    vpc, subnet, linode, _ = linode_and_vpc_for_network_interface_tests_offline
     config = linode.configs[0]
 
     new_interfaces = [
@@ -832,10 +856,11 @@ def test_create_vpu(self, test_linode_client, linode_for_vpu_tests):
     def test_create_vpc(
         self,
         test_linode_client,
-        linode_for_network_interface_tests,
-        create_vpc_with_subnet_and_linode,
+        linode_and_vpc_for_network_interface_tests_offline,
     ):
-        vpc, subnet, linode, _ = create_vpc_with_subnet_and_linode
+        vpc, subnet, linode, _ = (
+            linode_and_vpc_for_network_interface_tests_offline
+        )
 
         config: Config = linode.configs[0]
 
@@ -845,7 +870,7 @@ def test_create_vpc(
         interface = config.interface_create_vpc(
             subnet=subnet,
             primary=True,
-            ipv4=ConfigInterfaceIPv4(vpc="10.0.0.2", nat_1_1="any"),
+            ipv4=ConfigInterfaceIPv4(vpc="10.0.0.3", nat_1_1="any"),
             ip_ranges=["10.0.0.5/32"],
         )
 
@@ -854,7 +879,7 @@ def test_create_vpc(
         assert interface.id == config.interfaces[0].id
         assert interface.subnet.id == subnet.id
         assert interface.purpose == "vpc"
-        assert interface.ipv4.vpc == "10.0.0.2"
+        assert interface.ipv4.vpc == "10.0.0.3"
         assert interface.ipv4.nat_1_1 == linode.ipv4[0]
         assert interface.ip_ranges == ["10.0.0.5/32"]
 
@@ -888,10 +913,11 @@ def test_create_vpc(
 
     def test_update_vpc(
         self,
-        linode_for_network_interface_tests,
-        create_vpc_with_subnet_and_linode,
+        linode_and_vpc_for_network_interface_tests_offline,
     ):
-        vpc, subnet, linode, _ = create_vpc_with_subnet_and_linode
+        vpc, subnet, linode, _ = (
+            linode_and_vpc_for_network_interface_tests_offline
+        )
 
         config: Config = linode.configs[0]
 
@@ -901,11 +927,11 @@ def test_update_vpc(
         interface = config.interface_create_vpc(
             subnet=subnet,
             primary=True,
-            ip_ranges=["10.0.0.5/32"],
+            ip_ranges=["10.0.0.8/32"],
         )
 
         interface.primary = False
-        interface.ip_ranges = ["10.0.0.6/32"]
+        interface.ip_ranges = ["10.0.0.9/32"]
         interface.ipv4.vpc = "10.0.0.3"
         interface.ipv4.nat_1_1 = "any"
 
@@ -918,7 +944,7 @@ def test_update_vpc(
         assert interface.purpose == "vpc"
         assert interface.ipv4.vpc == "10.0.0.3"
         assert interface.ipv4.nat_1_1 == linode.ipv4[0]
-        assert interface.ip_ranges == ["10.0.0.6/32"]
+        assert interface.ip_ranges == ["10.0.0.9/32"]
 
     def test_reorder(self, linode_for_network_interface_tests):
         linode = linode_for_network_interface_tests

test/integration/models/lke/test_lke.py

@@ -32,9 +32,7 @@ def lke_cluster(test_linode_client):
     node_type = test_linode_client.linode.types()[1]  # g6-standard-1
     version = test_linode_client.lke.versions()[0]
 
-    region = get_region(
-        test_linode_client, {"Kubernetes", "LA Disk Encryption"}
-    )
+    region = get_region(test_linode_client, {"Kubernetes", "Disk Encryption"})
 
     node_pools = test_linode_client.lke.node_pool(node_type, 3)
     label = get_test_label() + "_cluster"
@@ -117,9 +115,7 @@ def lke_cluster_with_labels_and_taints(test_linode_client):
 def lke_cluster_with_apl(test_linode_client):
     version = test_linode_client.lke.versions()[0]
 
-    region = get_region(
-        test_linode_client, {"Kubernetes", "LA Disk Encryption"}
-    )
+    region = get_region(test_linode_client, {"Kubernetes", "Disk Encryption"})
 
     # NOTE: g6-dedicated-4 is the minimum APL-compatible Linode type
     node_pools = test_linode_client.lke.node_pool("g6-dedicated-4", 3)
@@ -149,7 +145,7 @@ def lke_cluster_enterprise(test_linode_client):
     )[0]
 
     region = get_region(
-        test_linode_client, {"Kubernetes Enterprise", "LA Disk Encryption"}
+        test_linode_client, {"Kubernetes Enterprise", "Disk Encryption"}
     )
 
     node_pools = test_linode_client.lke.node_pool(