Use fixtures

Author: lgarber-akamai

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

@@ -158,7 +158,8 @@ def __assert_vlan(iface: LinodeInterface):
     __assert_vlan(instance.interfaces[2])
 
 
-def test_linode_interface_create_public(
+@pytest.fixture
+def linode_interface_public(
     test_linode_client,
     e2e_test_firewall,
     instance_with_interface_generation_linode,
@@ -169,7 +170,7 @@ def test_linode_interface_create_public(
         64, linode=instance.id
     )
 
-    iface = instance.interface_create(
+    yield instance.interface_create(
         firewall_id=e2e_test_firewall.id,
         default_route=LinodeInterfaceDefaultRouteOptions(
             ipv4=True,
@@ -192,47 +193,20 @@ def test_linode_interface_create_public(
                 ]
             ),
         ),
-    )
-
-    assert iface.id is not None
-    assert iface.linode_id == instance.id
+    ), instance, ipv6_range
 
-    assert iface.created is not None
-    assert iface.updated is not None
 
-    assert isinstance(iface.mac_address, str)
-    assert iface.version
-
-    assert iface.default_route.ipv4
-    assert iface.default_route.ipv6
-
-    assert (
-        iface.public.ipv4.addresses[0].address
-        == instance.ips.ipv4.public[0].address
-    )
-    assert iface.public.ipv4.addresses[0].primary
-    assert len(iface.public.ipv4.shared) == 0
-
-    assert iface.public.ipv6.ranges[0].range == ipv6_range.range
-    assert (
-        iface.public.ipv6.ranges[0].route_target == instance.ipv6.split("/")[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
-
-
-def test_linode_interface_create_vpc(
+@pytest.fixture
+def linode_interface_vpc(
     test_linode_client,
     e2e_test_firewall,
-    create_vpc_with_subnet,
     instance_with_interface_generation_linode,
+    create_vpc_with_subnet,
 ):
     instance: Instance = instance_with_interface_generation_linode
     vpc, subnet = create_vpc_with_subnet
-    # subnet_network = ipaddress.ip_network(subnet.ipv4)
 
-    iface = instance.interface_create(
+    yield instance.interface_create(
         firewall_id=e2e_test_firewall.id,
         default_route=LinodeInterfaceDefaultRouteOptions(
             ipv4=True,
@@ -255,7 +229,58 @@ def test_linode_interface_create_vpc(
                 ]
             ),
         ),
+    ), instance, vpc, subnet
+
+
+@pytest.fixture
+def linode_interface_vlan(
+    test_linode_client,
+    e2e_test_firewall,
+    instance_with_interface_generation_linode,
+    create_vpc_with_subnet,
+):
+    instance: Instance = instance_with_interface_generation_linode
+
+    yield instance.interface_create(
+        vlan=LinodeInterfaceVLANOptions(
+            vlan_label="test-vlan", ipam_address="10.0.0.5/32"
+        ),
+    ), instance
+
+
+def test_linode_interface_create_public(linode_interface_public):
+    iface, instance, ipv6_range = linode_interface_public
+
+    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
+
+    assert iface.default_route.ipv4
+    assert iface.default_route.ipv6
+
+    assert (
+        iface.public.ipv4.addresses[0].address
+        == instance.ips.ipv4.public[0].address
+    )
+    assert iface.public.ipv4.addresses[0].primary
+    assert len(iface.public.ipv4.shared) == 0
+
+    assert iface.public.ipv6.ranges[0].range == ipv6_range.range
+    assert (
+        iface.public.ipv6.ranges[0].route_target == instance.ipv6.split("/")[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
+
+
+def test_linode_interface_create_vpc(linode_interface_vpc):
+    iface, instance, vpc, subnet = linode_interface_vpc
 
     assert iface.id is not None
     assert iface.linode_id == instance.id
@@ -280,17 +305,9 @@ def test_linode_interface_create_vpc(
 
 
 def test_linode_interface_create_vlan(
-    test_linode_client,
-    e2e_test_firewall,
-    instance_with_interface_generation_linode,
+    linode_interface_vlan,
 ):
-    instance: Instance = instance_with_interface_generation_linode
-
-    iface = instance.interface_create(
-        vlan=LinodeInterfaceVLANOptions(
-            vlan_label="test-vlan", ipam_address="10.0.0.5/32"
-        ),
-    )
+    iface, instance = linode_interface_vlan
 
     assert iface.id is not None
     assert iface.linode_id == instance.id