test progress

Author: lgarber-akamai

linode_api4/groups/networking.py

@@ -235,7 +235,7 @@ def ipv6_range_allocate(
                 "Unexpected response when allocating IPv6 range!", json=result
             )
 
-        result = IPv6Range(self.client, result["address"], result)
+        result = IPv6Range(self.client, result["range"], result)
         return result
 
     def ipv6_pools(self, *filters):

linode_api4/objects/linode.py

@@ -733,8 +733,8 @@ def ips(self):
 
         API Documentation: https://techdocs.akamai.com/linode-api/reference/get-linode-ips
 
-        :returns: A List of the ips of the Linode Instance.
-        :rtype: List[IPAddress]
+        :returns: Information about the IP addresses assigned to this instance.
+        :rtype: MappedObject
         """
         if not hasattr(self, "_ips"):
             result = self._client.get(

linode_api4/objects/linode_interfaces.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass, field
-from typing import List, Optional, Union
+from typing import List, Optional
 
 from linode_api4.objects.base import Base, Property
 from linode_api4.objects.dbase import DerivedBase
@@ -169,7 +169,7 @@ class LinodeInterfaceOptions(JSONObject):
         "firewall_id"
     }
 
-    firewall_id: Optional[Union[Firewall, int]] = None
+    firewall_id: Optional[int] = None
     default_route: Optional[LinodeInterfaceDefaultRouteOptions] = None
     vpc: Optional[LinodeInterfaceVPCOptions] = None
     public: Optional[LinodeInterfacePublicOptions] = None

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

@@ -28,7 +28,7 @@ def instance_with_interface_generation_linode(
 
     label = get_test_label()
 
-    instance, _ = client.linode.instance_create(
+    instance = client.linode.instance_create(
         "g6-nanode-1",
         get_region(test_linode_client, {"Linode Interfaces"}, site_type="core"),
         label=label,
@@ -154,13 +154,15 @@ def __assert_vlan(iface: LinodeInterface):
 
 
 def test_linode_interface_create_public(
+    test_linode_client,
     e2e_test_firewall,
     instance_with_interface_generation_linode,
 ):
     instance: Instance = instance_with_interface_generation_linode
 
-    ip = instance.ip_allocate()
-    instance
+    ipv6_range = test_linode_client.networking.ipv6_range_allocate(
+        64, linode=instance.id
+    )
 
     iface = instance.interface_create(
         firewall_id=e2e_test_firewall.id,
@@ -172,13 +174,17 @@ def test_linode_interface_create_public(
             ipv4=LinodeInterfacePublicIPv4Options(
                 addresses=[
                     LinodeInterfacePublicIPv4AddressOptions(
-                        address=ip.address,
+                        address=instance.ips.ipv4.public[0].address,
                         primary=True,
                     )
                 ]
             ),
             ipv6=LinodeInterfacePublicIPv6Options(
-                ranges=[LinodeInterfacePublicIPv6RangeOptions()]
+                ranges=[
+                    LinodeInterfacePublicIPv6RangeOptions(
+                        range=ipv6_range.range,
+                    )
+                ]
             ),
         ),
     )
@@ -195,11 +201,17 @@ def test_linode_interface_create_public(
     assert iface.default_route.ipv4
     assert iface.default_route.ipv6
 
-    assert iface.public.ipv4.addresses[0].address == ip.address
+    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
-    assert len(iface.public.ipv6.ranges) == 0