Address PR remarks

Author: mawilk90

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

@@ -43,6 +43,32 @@ def build_interface_public_ipv4(firewall, ip_address):
     )
 
 
+def create_linode_with_legacy_config(client, ip_address, label, firewall):
+    linode, _ = client.linode.instance_create(
+        "g6-nanode-1",
+        ip_address.region,
+        image="linode/debian12",
+        label=label,
+        firewall=firewall,
+        interface_generation=InterfaceGeneration.LEGACY_CONFIG,
+        ipv4=[ip_address.address],
+    )
+    return linode
+
+
+def create_linode_with_standard_interfaces(client, ip_address, label, firewall):
+    interface = build_interface_public_ipv4(firewall.id, ip_address.address)
+    linode, _ = client.linode.instance_create(
+        "g6-nanode-1",
+        ip_address.region,
+        image="linode/debian12",
+        label=label,
+        interface_generation=InterfaceGeneration.LINODE,
+        interfaces=[interface],
+    )
+    return linode
+
+
 def test_linode_create_with_linode_interfaces(
     create_vpc_with_subnet,
     linode_with_linode_interfaces,
@@ -384,38 +410,18 @@ def test_linode_interface_firewalls(e2e_test_firewall, linode_interface_public):
 
 
 @pytest.mark.parametrize(
-    "iface_type",
-    [InterfaceGeneration.LEGACY_CONFIG, InterfaceGeneration.LINODE],
+    "create_linode_fn",
+    [create_linode_with_legacy_config, create_linode_with_standard_interfaces],
+    ids=["legacy_config", "standard_interfaces"],
 )
 def test_linode_interfaces_with_reserved_ips(
-    test_linode_client, e2e_test_firewall, create_reserved_ip, iface_type
+    test_linode_client, e2e_test_firewall, create_reserved_ip, create_linode_fn
 ):
     client = test_linode_client
     reserved_ip = create_reserved_ip
     label = get_test_label(length=8)
 
-    if iface_type == InterfaceGeneration.LEGACY_CONFIG:
-        linode, _ = client.linode.instance_create(
-            "g6-nanode-1",
-            reserved_ip.region,
-            image="linode/debian12",
-            label=label,
-            firewall=e2e_test_firewall,
-            interface_generation=iface_type,
-            ipv4=[reserved_ip.address],
-        )
-    else:
-        interface = build_interface_public_ipv4(
-            e2e_test_firewall.id, reserved_ip.address
-        )
-        linode, _ = client.linode.instance_create(
-            "g6-nanode-1",
-            reserved_ip.region,
-            image="linode/debian12",
-            label=label,
-            interface_generation=iface_type,
-            interfaces=[interface],
-        )
+    linode = create_linode_fn(client, reserved_ip, label, e2e_test_firewall)
 
     linode_ips = linode.ips.ipv4.public
     assert len(linode_ips) == 1

test/integration/models/networking/test_networking.py

@@ -395,19 +395,21 @@ def verify_reserved_ip_assigned(reserved_ip, resource):
 
 @pytest.mark.smoke
 @pytest.mark.parametrize(
-    "region, tags",
+    "region, tags, expected",
     [
-        (TEST_REGION, ["test"]),
-        (TEST_REGION, None),
+        (TEST_REGION, ["test"], ["test"]),
+        (TEST_REGION, None, []),
     ],
 )
-def test_create_reserved_ip(request, test_linode_client, region, tags):
+def test_create_reserved_ip(
+    request, test_linode_client, region, tags, expected
+):
     client = test_linode_client
     reserved_ip = client.networking.reserved_ip_create(region=region, tags=tags)
     request.addfinalizer(reserved_ip.delete)
 
     verify_reserved_ip(reserved_ip)
-    assert reserved_ip.tags == tags if tags else reserved_ip.tags == []
+    assert reserved_ip.tags == expected
 
 
 def test_create_reserved_ip_wo_region_fail(test_linode_client):
@@ -484,30 +486,29 @@ def test_get_reserved_ip_types(test_linode_client):
 
 
 @pytest.mark.smoke
-@pytest.mark.parametrize(
-    "reserved, region",
-    [
-        (True, TEST_REGION),
-        (True, None),
-    ],
-)
-def test_create_reserved_ip_with_allocate(
-    test_linode_client, create_linode, reserved, region
+def test_create_reserved_ip_with_allocate_and_region(test_linode_client):
+    client = test_linode_client
+    reserved_ip = client.networking.ip_allocate(
+        reserved=True, region=TEST_REGION
+    )
+
+    verify_reserved_ip(reserved_ip)
+    assert reserved_ip.tags == []
+
+    # clean-up
+    reserved_ip = client.load(ReservedIPAddress, reserved_ip.address)
+    reserved_ip.delete()
+
+
+@pytest.mark.smoke
+def test_create_reserved_ip_with_allocate_and_linode(
+    test_linode_client, create_linode
 ):
     client = test_linode_client
     linode = create_linode
+    reserved_ip = client.networking.ip_allocate(reserved=True, linode=linode.id)
 
-    if region:
-        reserved_ip = client.networking.ip_allocate(
-            reserved=reserved, region=TEST_REGION
-        )
-        verify_reserved_ip(reserved_ip)
-    else:
-        reserved_ip = client.networking.ip_allocate(
-            reserved=reserved, linode=linode.id
-        )
-        verify_reserved_ip_assigned(reserved_ip, linode)
-
+    verify_reserved_ip_assigned(reserved_ip, linode)
     assert reserved_ip.tags == []
 
     # clean-up