Create int tests for Reserved IPs: linode interfaces

Author: mawilk90

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

@@ -8,6 +8,8 @@
     Instance,
     LinodeInterface,
     LinodeInterfaceDefaultRouteOptions,
+    InterfaceGeneration,
+    LinodeInterfaceOptions,
     LinodeInterfacePublicIPv4AddressOptions,
     LinodeInterfacePublicIPv4Options,
     LinodeInterfacePublicIPv6Options,
@@ -18,7 +20,27 @@
     LinodeInterfaceVPCIPv4Options,
     LinodeInterfaceVPCIPv4RangeOptions,
     LinodeInterfaceVPCOptions,
+    ReservedIPAddress,
 )
+from test.integration.helpers import get_test_label
+
+
+def build_interface_public_ipv4(firewall, ip_address):
+    return LinodeInterfaceOptions(
+        firewall_id=firewall,
+        default_route=LinodeInterfaceDefaultRouteOptions(
+            ipv4=True,
+        ),
+        public=LinodeInterfacePublicOptions(
+            ipv4=LinodeInterfacePublicIPv4Options(
+                addresses=[
+                    LinodeInterfacePublicIPv4AddressOptions(
+                        address=ip_address, primary=True
+                    )
+                ],
+            ),
+        ),
+    )
 
 
 def test_linode_create_with_linode_interfaces(
@@ -359,3 +381,51 @@ def test_linode_interface_firewalls(e2e_test_firewall, linode_interface_public):
     firewall = firewalls[0]
     assert firewall.id == e2e_test_firewall.id
     assert firewall.label == e2e_test_firewall.label
+
+
+@pytest.mark.parametrize("iface_type", [
+    InterfaceGeneration.LEGACY_CONFIG,
+    InterfaceGeneration.LINODE
+])
+def test_linode_interfaces_with_reserved_ips(test_linode_client, e2e_test_firewall, create_reserved_ip, iface_type):
+    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_ips = linode.ips.ipv4.public
+    assert len(linode_ips) == 1
+    assert linode_ips[0].address == reserved_ip.address
+    assert linode_ips[0].reserved == True
+    assert linode_ips[0].linode_id == linode.id
+    assert linode_ips[0].assigned_entity.id == linode.id
+    assert linode_ips[0].assigned_entity.type == "linode"
+    assert linode_ips[0].assigned_entity.label == linode.label
+    assert linode_ips[0].assigned_entity.url == f"/v4/linode/instances/{linode.id}"
+
+    linode.delete()
+    reserved_ips_list = client.networking.reserved_ips(ReservedIPAddress.address==reserved_ip.address)
+    assert len(reserved_ips_list) == 1
+    assert reserved_ips_list[0].reserved == True
+    assert reserved_ips_list[0].linode_id is None
+    assert reserved_ips_list[0].assigned_entity is None

test/integration/models/linode/test_linode.py

@@ -19,6 +19,7 @@
     Instance,
     InterfaceGeneration,
     LinodeInterface,
+    ReservedIPAddress,
     Type,
 )
 from linode_api4.objects.linode import InstanceDiskEncryptionType, MigrationType
@@ -1147,3 +1148,39 @@ def test_update_linode_maintenance_policy(create_linode, test_linode_client):
     linode.invalidate()
     assert result
     assert linode.maintenance_policy_id == non_default_policy.slug
+
+
+def test_update_linode_with_reserved_ip_in_address(test_linode_client, e2e_test_firewall, create_reserved_ip):
+    label = get_test_label(length=8)
+    client = test_linode_client
+    reserved_ip = create_reserved_ip
+    assert reserved_ip.reserved == True
+    assert reserved_ip.linode_id is None
+    assert reserved_ip.assigned_entity is None
+
+    linode, _ = client.linode.instance_create(
+        "g6-nanode-1",
+        reserved_ip.region,
+        image="linode/debian12",
+        label=label,
+        firewall=e2e_test_firewall,
+    )
+
+    linode_ips = linode.ips.ipv4.public
+    assert len(linode_ips) == 1
+    assert linode_ips[0].address != reserved_ip.address
+
+    linode.ip_allocate(True, reserved_ip.address)
+    delattr(linode, "_ips")
+    linode_ips = linode.ips.ipv4.public
+    assert len(linode_ips) == 2
+    assert reserved_ip.address in [ip.address for ip in linode_ips]
+
+    reserved_ip = client.networking.reserved_ips(ReservedIPAddress.address==reserved_ip.address)[0]
+    assert reserved_ip.linode_id == linode.id
+    assert reserved_ip.assigned_entity.id == linode.id
+    assert reserved_ip.assigned_entity.type == "linode"
+    assert reserved_ip.assigned_entity.label == linode.label
+    assert reserved_ip.assigned_entity.url == f"/v4/linode/instances/{linode.id}"
+
+    linode.delete()

test/integration/models/networking/test_networking.py

@@ -14,8 +14,12 @@
 
 import pytest
 
-from linode_api4 import Instance, LinodeClient, ApiError
-from linode_api4.objects import Config, ConfigInterfaceIPv4, Firewall, InterfaceGeneration, IPAddress, ReservedIPAddress
+from linode_api4 import (
+    Instance,
+    LinodeClient,
+    ApiError,
+)
+from linode_api4.objects import Config, ConfigInterfaceIPv4, Firewall, IPAddress, ReservedIPAddress
 from linode_api4.objects.networking import (
     FirewallCreateDevicesOptions,
     NetworkTransferPrice,
@@ -354,44 +358,6 @@ def test_ip_info(test_linode_client, create_linode):
     assert ip_info.vpc_nat_1_1 is None
 
 
-@pytest.fixture
-def create_reserved_ip(test_linode_client):
-    client = test_linode_client
-    reserved_ip = client.networking.reserved_ip_create(
-        region=TEST_REGION,
-        tags=["test1"]
-    )
-
-    yield reserved_ip
-
-    # Delete only if IP exists (some tests delete it earlier)
-    if client.networking.reserved_ips(ReservedIPAddress.address==reserved_ip.address):
-        reserved_ip.delete()
-
-
-@pytest.fixture
-def create_reserved_ip_assigned(test_linode_client, create_linode):
-    client = test_linode_client
-    linode = create_linode
-    reserved_ip = client.networking.reserved_ip_create(
-        region=linode.region,
-        tags=["test", "assigned"],
-    )
-
-    client.networking.ip_addresses_assign(
-        assignments=[{"address": reserved_ip.address, "linode_id": linode.id}],
-        region=linode.region,
-    )
-
-    reserved_ip = test_linode_client.load(ReservedIPAddress, reserved_ip.address)
-
-    yield linode, reserved_ip
-
-    # Delete only if IP exists (some tests delete it earlier)
-    if client.networking.reserved_ips(ReservedIPAddress.address==reserved_ip.address):
-        reserved_ip.delete()
-
-
 def verify_reserved_ip(reserved_ip):
     assert isinstance(ipaddress.ip_address(reserved_ip.address), ipaddress.IPv4Address)
     assert reserved_ip.type == "ipv4"
@@ -580,36 +546,3 @@ def test_convert_unassigned_reserved_ip_to_ephemeral(test_linode_client, create_
 
     reserved_ips_list = client.networking.reserved_ips(ReservedIPAddress.address==reserved_ip.address)
     assert len(reserved_ips_list) == 0
-
-
-# TODO: move to linode's tests file
-@pytest.mark.parametrize("interface", [
-    InterfaceGeneration.LEGACY_CONFIG,
-    # InterfaceGeneration.LINODE
-])
-def test_create_linode_with_reserved_ip_in_legacy_config(test_linode_client, e2e_test_firewall, create_reserved_ip, interface):
-    client = test_linode_client
-    reserved_ip = create_reserved_ip
-    label = get_test_label(length=8)
-
-    # if interface == InterfaceGeneration.LINODE:
-    #     interface = "POST /v4beta/linode/instances: [400] ipv4: Reserved IPs must be assigned directly in interface configurations when using Linode Interfaces"
-
-    linode, _ = client.linode.instance_create(
-        "g6-nanode-1",
-        TEST_REGION,
-        image="linode/debian12",
-        label=label,
-        firewall=e2e_test_firewall,
-        interface_generation=interface,
-        ipv4=[reserved_ip.address]
-    )
-
-    linode_ips = linode.ips.ipv4.public
-    assert len(linode_ips) == 1
-    verify_reserved_ip_assigned(linode_ips[0], linode)
-
-    linode.delete()
-    reserved_ips_list = client.networking.reserved_ips(ReservedIPAddress.address==reserved_ip.address)
-    assert len(reserved_ips_list) == 1
-    verify_reserved_ip(reserved_ips_list[0])