oops

Author: lgarber-akamai

linode_api4/groups/linode.py

@@ -1,19 +1,17 @@
 import base64
 import os
-from collections.abc import Iterable
 from typing import Any, Dict, List, Optional, Union
 
 from linode_api4.common import load_and_validate_keys
 from linode_api4.errors import UnexpectedResponseError
 from linode_api4.groups import Group
 from linode_api4.objects import (
-    ConfigInterface,
     Firewall,
     Instance,
     InstanceDiskEncryptionType,
     InterfaceGeneration,
     Kernel,
-    LinodeInterface,
+    LinodeInterfaceOptions,
     NetworkInterface,
     PlacementGroup,
     StackScript,
@@ -157,7 +155,9 @@ def instance_create(
             ]
         ] = None,
         interfaces: Optional[
-            List[Union[LinodeInterface, NetworkInterface, Dict[str, Any]],]
+            List[
+                Union[LinodeInterfaceOptions, NetworkInterface, Dict[str, Any]],
+            ]
         ] = None,
         interface_generation: Optional[Union[InterfaceGeneration, str]] = None,
         network_helper: Optional[bool] = None,
@@ -301,11 +301,9 @@ def instance_create(
         :type disk_encryption: InstanceDiskEncryptionType or str
         :param interfaces: An array of Network Interfaces to add to this Linode’s Configuration Profile.
                            At least one and up to three Interface objects can exist in this array.
-        :type interfaces: list[ConfigInterface] or list[dict[str, Any]]
+        :type interfaces: List[LinodeInterfaceOptions], List[NetworkInterface], or List[dict[str, Any]]
         :param placement_group: A Placement Group to create this Linode under.
         :type placement_group: Union[InstancePlacementGroupAssignment, PlacementGroup, Dict[str, Any], int]
-        :param interfaces: The interfaces to create this Linode with.
-        :type interfaces: List of LinodeInterface, NetworkInterface (deprecated), or Dict[str, Any]
         :param interface_generation: The generation of network interfaces this Linode uses.
         :type interface_generation: InterfaceGeneration or str
         :param network_helper: Whether this instance should have Network Helper enabled.
@@ -325,13 +323,6 @@ def instance_create(
             ret_pass = Instance.generate_root_password()
             kwargs["root_pass"] = ret_pass
 
-        interfaces = kwargs.get("interfaces", None)
-        if interfaces is not None and isinstance(interfaces, Iterable):
-            kwargs["interfaces"] = [
-                i._serialize() if isinstance(i, ConfigInterface) else i
-                for i in interfaces
-            ]
-
         params = {
             "type": ltype,
             "region": region,

linode_api4/objects/linode_interfaces.py

@@ -101,6 +101,15 @@ class LinodeInterfaceVLANOptions(JSONObject):
     ipam_address: Optional[str] = None
 
 
+@dataclass
+class LinodeInterfaceOptions(JSONObject):
+    firewall_id: Optional[int] = None
+    default_route: Optional[LinodeInterfaceDefaultRouteOptions] = None
+    vpc: Optional[LinodeInterfaceVPCOptions] = None
+    public: Optional[LinodeInterfacePublicOptions] = None
+    vlan: Optional[LinodeInterfaceVLANOptions] = None
+
+
 # Interface PUT Options
 # NOTE: These classes currently match their POST equivalents
 # but are implemented separately for future-proofing.