progress

Author: lgarber-akamai

Makefile

@@ -66,7 +66,7 @@ test-int:
 
 .PHONY: test-unit
 test-unit:
-	$(PYTHON) -m pytest test/unit
+	$(PYTHON) -m pytest test/unit -vv
 
 .PHONY: test-smoke
 test-smoke:

linode_api4/objects/linode.py

@@ -313,6 +313,27 @@ class ConfigInterfaceIPv6(JSONObject):
     is_public: bool = False
 
 
+@dataclass
+class ConfigInterfaceIPv6SLAACOptions(JSONObject):
+    range: str = ""
+
+
+@dataclass
+class ConfigInterfaceIPv6RangeOptions(JSONObject):
+    range: str = ""
+
+
+@dataclass
+class ConfigInterfaceIPv6Options(JSONObject):
+    slaac: List[ConfigInterfaceIPv6SLAACOptions] = field(
+        default_factory=lambda: []
+    )
+    ranges: List[ConfigInterfaceIPv6RangeOptions] = field(
+        default_factory=lambda: []
+    )
+    is_public: bool = False
+
+
 class NetworkInterface(DerivedBase):
     """
     This class represents a Configuration Profile's network interface object.
@@ -593,6 +614,7 @@ def interface_create_vpc(
         subnet: Union[int, VPCSubnet],
         primary=False,
         ipv4: Union[Dict[str, Any], ConfigInterfaceIPv4] = None,
+        ipv6: Union[Dict[str, Any], ConfigInterfaceIPv6Options] = None,
         ip_ranges: Optional[List[str]] = None,
     ) -> NetworkInterface:
         """
@@ -606,6 +628,8 @@ def interface_create_vpc(
         :type primary: bool
         :param ipv4: The IPv4 configuration of the interface for the associated subnet.
         :type ipv4: Dict or ConfigInterfaceIPv4
+        :param ipv6: The IPv6 configuration of the interface for the associated subnet.
+        :type ipv6: Dict or ConfigInterfaceIPv6Options
         :param ip_ranges: A list of IPs or IP ranges in the VPC subnet.
                           Packets to these CIDRs are routed through the
                           VPC network interface.
@@ -616,19 +640,16 @@ def interface_create_vpc(
         """
         params = {
             "purpose": "vpc",
-            "subnet_id": subnet.id if isinstance(subnet, VPCSubnet) else subnet,
+            "subnet_id": subnet,
             "primary": primary,
+            "ipv4": ipv4,
+            "ipv6": ipv6,
+            "ip_ranges": ip_ranges,
         }
 
-        if ipv4 is not None:
-            params["ipv4"] = (
-                ipv4.dict if isinstance(ipv4, ConfigInterfaceIPv4) else ipv4
-            )
-
-        if ip_ranges is not None:
-            params["ip_ranges"] = ip_ranges
-
-        return self._interface_create(params)
+        return self._interface_create(
+            drop_null_keys(_flatten_request_body_recursive(params))
+        )
 
     def interface_reorder(self, interfaces: List[Union[int, NetworkInterface]]):
         """

test/unit/objects/linode_test.py

@@ -7,6 +7,9 @@
     ConfigInterface,
     ConfigInterfaceIPv4,
     ConfigInterfaceIPv6,
+    ConfigInterfaceIPv6Options,
+    ConfigInterfaceIPv6RangeOptions,
+    ConfigInterfaceIPv6SLAACOptions,
     Disk,
     Image,
     Instance,
@@ -764,8 +767,8 @@ def test_create_interface_vpc(self):
                 primary=True,
                 ipv4=ConfigInterfaceIPv4(vpc="10.0.0.4", nat_1_1="any"),
                 ipv6=ConfigInterfaceIPv6Options(
-                    slaac=[ConfigInterfaceIPv6OptionsSLAAC(range="auto")],
-                    ranges=[ConfigInterfaceIPv6OptionsRange(range="auto")],
+                    slaac=[ConfigInterfaceIPv6SLAACOptions(range="auto")],
+                    ranges=[ConfigInterfaceIPv6RangeOptions(range="auto")],
                     is_public=True,
                 ),
                 ip_ranges=["10.0.0.0/24"],
@@ -833,9 +836,9 @@ def test_update(self):
                 "primary": False,
                 "ipv4": {"vpc": "10.0.0.3", "nat_1_1": "any"},
                 "ipv6": {
-                    "slaac": [{"range": "auto"}],
-                    "ranges": [{"range": "auto"}],
-                    "is_public": True,
+                    "slaac": [{"range": "1234::5678/64"}],
+                    "ranges": [{"range": "1234::5678/64"}],
+                    "is_public": False,
                 },
                 "ip_ranges": ["10.0.0.2/32"],
             }