catalystwan 0.41.2.dev9__py3-none-any.whl → 0.41.3__py3-none-any.whl

catalystwan/models/configuration/feature_profile/sdwan/service/switchport.py

@@ -2,14 +2,13 @@
 
 from typing import List, Literal, Optional, Union
 
-from pydantic import AliasPath, BaseModel, ConfigDict, Field
+from pydantic import BaseModel, ConfigDict, Field
 
-from catalystwan.api.configuration_groups.parcel import Default, Global, Variable, _ParcelBase
-from catalystwan.models.common import Duplex, Speed
+from catalystwan.api.configuration_groups.parcel import Default, Global, Variable
 
 
 class StaticMacAddress(BaseModel):
-    model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True, extra="forbid")
+    model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True)
 
     mac_address: Union[Global[str], Variable] = Field(serialization_alias="macaddr", validation_alias="macaddr")
     vlan: Union[Global[int], Variable]
@@ -23,6 +22,10 @@ SwitchportMode = Literal[
     "trunk",
 ]
 
+Duplex = Literal[
+    "full",
+    "half",
+]
 
 PortControl = Literal[
     "auto",
@@ -44,70 +47,75 @@ ControlDirection = Literal[
 
 
 class SwitchportInterface(BaseModel):
-    model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True, extra="forbid")
+    model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True)
 
     interface_name: Union[Global[str], Variable] = Field(serialization_alias="ifName", validation_alias="ifName")
-    control_direction: Optional[Union[Global[ControlDirection], Default[None], Variable]] = Field(
-        default=None, validation_alias="controlDirection", serialization_alias="controlDirection"
-    )
-    enable_dot1x: Optional[Union[Global[bool], Default[bool]]] = Field(
-        default=None, validation_alias="enableDot1x", serialization_alias="enableDot1x"
+    mode: Optional[Global[SwitchportMode]] = None
+    shutdown: Optional[Union[Global[bool], Variable, Default[bool]]] = Default[bool](value=True)
+    speed: Optional[Union[Global[str], Variable, Default[None]]] = Default[None](value=None)
+    duplex: Optional[Union[Global[Duplex], Variable, Default[None]]] = Default[None](value=None)
+    switchport_access_vlan: Optional[Union[Global[int], Variable, Default[None]]] = Field(
+        serialization_alias="switchportAccessVlan", validation_alias="switchportAccessVlan", default=None
     )
-    critical_vlan: Optional[Union[Global[int], Default[None], Variable]] = Field(
-        default=None, validation_alias="criticalVlan", serialization_alias="criticalVlan"
+    switchport_trunk_allowed_vlans: Optional[Union[Global[str], Variable, Default[None]]] = Field(
+        serialization_alias="switchportTrunkAllowedVlans", validation_alias="switchportTrunkAllowedVlans", default=None
     )
-    duplex: Optional[Union[Global[Duplex], Default[None], Variable]] = Field(default=None)
-    enable_periodic_reauth: Optional[Union[Variable, Default[None], Global[bool]]] = Field(
-        default=None, validation_alias="enablePeriodicReauth", serialization_alias="enablePeriodicReauth"
+    switchport_trunk_native_vlan: Optional[Union[Global[int], Variable, Default[None]]] = Field(
+        serialization_alias="switchportTrunkNativeVlan", validation_alias="switchportTrunkNativeVlan", default=None
     )
-    enable_voice: Optional[Union[Variable, Default[None], Global[bool]]] = Field(
-        default=None, validation_alias="enableVoice", serialization_alias="enableVoice"
+    port_control: Optional[Union[Global[PortControl], Variable, Default[None]]] = Field(
+        serialization_alias="portControl", validation_alias="portControl", default=None
     )
-    guest_vlan: Optional[Union[Global[int], Default[None], Variable]] = Field(
-        default=None, validation_alias="guestVlan", serialization_alias="guestVlan"
+    voice_vlan: Optional[Union[Global[int], Variable, Default[None]]] = Field(
+        serialization_alias="voiceVlan", validation_alias="voiceVlan", default=None
     )
-    host_mode: Optional[Union[Global[HostMode], Default[None], Variable]] = Field(
-        default=None, validation_alias="hostMode", serialization_alias="hostMode"
+    pae_enable: Optional[Union[Global[bool], Variable, Default[None]]] = Field(
+        serialization_alias="paeEnable", validation_alias="paeEnable", default=None
     )
-    inactivity: Optional[Union[Global[int], Default[None], Variable]] = Field(default=None)
-    mac_authentication_bypass: Optional[Union[Variable, Default[None], Global[bool]]] = Field(
-        default=None, validation_alias="macAuthenticationBypass", serialization_alias="macAuthenticationBypass"
+    mac_authentication_bypass: Optional[Union[Global[bool], Variable, Default[None]]] = Field(
+        serialization_alias="macAuthenticationBypass", validation_alias="macAuthenticationBypass", default=None
     )
-    mode: Optional[Global[SwitchportMode]] = Field(default=None)
-    pae_enable: Optional[Union[Variable, Default[None], Global[bool]]] = Field(
-        default=None, validation_alias="paeEnable", serialization_alias="paeEnable"
+    host_mode: Optional[Union[Global[HostMode], Variable, Default[None]]] = Field(
+        serialization_alias="hostMode", validation_alias="hostMode", default=None
     )
-    port_control: Optional[Union[Global[PortControl], Default[None], Variable]] = Field(
-        default=None, validation_alias="portControl", serialization_alias="portControl"
+    enable_periodic_reauth: Optional[Union[Global[bool], Variable, Default[None]]] = Field(
+        serialization_alias="enablePeriodicReauth", validation_alias="enablePeriodicReauth", default=None
     )
-    reauthentication: Optional[Union[Default[int], Global[int], Variable]] = Field(default=None)
-    restricted_vlan: Optional[Union[Global[int], Default[None], Variable]] = Field(
-        default=None, validation_alias="restrictedVlan", serialization_alias="restrictedVlan"
+    inactivity: Optional[Union[Global[int], Variable, Default[None]]] = None
+    reauthentication: Optional[Union[Global[int], Variable, Default[int]]] = None
+    control_direction: Optional[Union[Global[ControlDirection], Variable, Default[None]]] = Field(
+        serialization_alias="controlDirection", validation_alias="controlDirection", default=None
     )
-    shutdown: Optional[Union[Variable, Default[bool], Global[bool]]] = Field(default=None)
-    speed: Optional[Union[Global[Speed], Default[None], Variable]] = Field(default=None)
-    switchport_access_vlan: Optional[Union[Global[int], Default[None], Variable]] = Field(
-        default=None, validation_alias="switchportAccessVlan", serialization_alias="switchportAccessVlan"
+    restricted_vlan: Optional[Union[Global[int], Variable, Default[None]]] = Field(
+        serialization_alias="restrictedVlan", validation_alias="restrictedVlan", default=None
     )
-    switchport_trunk_allowed_vlans: Optional[Union[Global[str], Default[None], Variable]] = Field(
-        default=None, validation_alias="switchportTrunkAllowedVlans", serialization_alias="switchportTrunkAllowedVlans"
+    guest_vlan: Optional[Union[Global[int], Variable, Default[None]]] = Field(
+        serialization_alias="guestVlan", validation_alias="guestVlan", default=None
     )
-    switchport_trunk_native_vlan: Optional[Union[Global[int], Default[None], Variable]] = Field(
-        default=None, validation_alias="switchportTrunkNativeVlan", serialization_alias="switchportTrunkNativeVlan"
+    critical_vlan: Optional[Union[Global[int], Variable, Default[None]]] = Field(
+        serialization_alias="criticalVlan", validation_alias="criticalVlan", default=None
     )
-    voice_vlan: Optional[Union[Global[int], Default[None], Variable]] = Field(
-        default=None, validation_alias="voiceVlan", serialization_alias="voiceVlan"
+    enable_voice: Optional[Union[Global[bool], Variable, Default[None]]] = Field(
+        serialization_alias="enableVoice", validation_alias="enableVoice", default=None
     )
 
 
-class SwitchportParcel(_ParcelBase):
-    type_: Literal["switchport"] = Field(default="switchport", exclude=True)
-    model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True, extra="forbid")
+class SwitchportData(BaseModel):
+    model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True)
 
-    interface: List[SwitchportInterface] = Field(default_factory=list, validation_alias=AliasPath("data", "interface"))
-    age_time: Union[Global[int], Variable, Default[int]] = Field(
-        default=Default[int](value=300), validation_alias=AliasPath("data", "ageTime")
+    interface: Optional[List[SwitchportInterface]] = None
+    age_time: Optional[Union[Global[int], Variable, Default[int]]] = Field(
+        serialization_alias="ageTime", validation_alias="ageTime", default=Default[int](value=300)
     )
-    static_mac_address: List[StaticMacAddress] = Field(
-        default_factory=list, validation_alias=AliasPath("data", "staticMacAddress")
+    static_mac_address: Optional[List[StaticMacAddress]] = Field(
+        serialization_alias="staticMacAddress", validation_alias="staticMacAddress", default=None
     )
+
+
+class SwitchportCreationPayload(BaseModel):
+    model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True)
+
+    name: str
+    description: Optional[str] = None
+    data: SwitchportData
+    metadata: Optional[dict] = None

catalystwan/models/configuration/feature_profile/sdwan/service/tracker.py

@@ -3,9 +3,9 @@
 from typing import List, Literal, Optional, Union
 from uuid import UUID
 
-from pydantic import AliasPath, BaseModel, ConfigDict, Field
+from pydantic import BaseModel, ConfigDict, Field
 
-from catalystwan.api.configuration_groups.parcel import Default, Global, Variable, _ParcelBase
+from catalystwan.api.configuration_groups.parcel import Default, Global, Variable
 
 EndpointProtocol = Literal[
     "tcp",
@@ -23,14 +23,14 @@ CombineBoolean = Literal[
 
 
 class EndpointTcpUdp(BaseModel):
-    model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True, extra="forbid")
+    model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True)
 
     protocol: Optional[Union[Variable, Global[EndpointProtocol]]] = None
     port: Optional[Union[Variable, Global[int]]] = None
 
 
 class TrackerData(BaseModel):
-    model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True, extra="forbid")
+    model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True)
 
     name: Union[Variable, Global[str]] = Field(serialization_alias="trackerName", validation_alias="trackerName")
     endpoint_api_url: Optional[Union[Variable, Global[str]]] = Field(
@@ -61,7 +61,7 @@ class TrackerData(BaseModel):
 
 
 class TrackerCreationPayload(BaseModel):
-    model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True, extra="forbid")
+    model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True)
 
     name: str
     description: Optional[str] = None
@@ -70,23 +70,32 @@ class TrackerCreationPayload(BaseModel):
 
 
 class TrackerRef(BaseModel):
-    model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True, extra="forbid")
+    model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True)
 
     tracker_ref: Global[UUID] = Field(serialization_alias="trackerRef", validation_alias="trackerRef")
 
 
-class TrackerGroupParcel(_ParcelBase):
-    type_: Literal["trackergroup"] = Field(default="trackergroup", exclude=True)
-    model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True, extra="forbid")
+class TrackerGroupData(BaseModel):
+    model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True)
 
-    tracker_refs: List[TrackerRef] = Field(validation_alias=AliasPath("data", "trackerRefs"))
+    tracker_refs: List[TrackerRef] = Field(serialization_alias="trackerRefs", validation_alias="trackerRefs")
     combine_boolean: Union[Global[CombineBoolean], Variable, Default[CombineBoolean]] = Field(
-        validation_alias=AliasPath("data", "combineBoolean"),
+        serialization_alias="combineBoolean",
+        validation_alias="combineBoolean",
         default=Default[CombineBoolean](value="or"),
     )
 
 
+class TrackerGroupCreationPayload(BaseModel):
+    model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True)
+
+    name: str
+    description: Optional[str] = None
+    data: TrackerGroupData
+    metadata: Optional[dict] = None
+
+
 class TrackerAssociationPayload(BaseModel):
-    model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True, extra="forbid")
+    model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True)
 
     parcel_id: str = Field(serialization_alias="parcelId", validation_alias="parcelId")

catalystwan/models/configuration/feature_profile/sdwan/service/wireless_lan.py

@@ -1,12 +1,10 @@
 # Copyright 2024 Cisco Systems, Inc. and its affiliates
 
-from ipaddress import IPv4Address
 from typing import List, Literal, Optional, Union
 
-from pydantic import AliasPath, BaseModel, ConfigDict, Field
+from pydantic import BaseModel, ConfigDict, Field
 
-from catalystwan.api.configuration_groups.parcel import Default, Global, Variable, _ParcelBase
-from catalystwan.models.common import SubnetMask
+from catalystwan.api.configuration_groups.parcel import Default, Global, Variable
 
 CountryCode = Literal[
     "AE",
@@ -137,35 +135,31 @@ SecurityType = Literal[
 
 
 class MeStaticIpConfig(BaseModel):
-    model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True, extra="forbid")
+    model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True)
 
-    me_ipv4_address: Union[Global[IPv4Address], Variable] = Field(
-        serialization_alias="meIpv4Address", validation_alias="meIpv4Address"
-    )
-    netmask: Union[Global[SubnetMask], Variable]
-    default_gateway: Union[Global[IPv4Address], Variable] = Field(
+    me_ipv4_address: Union[Global[str], Variable]
+    netmask: Union[Global[str], Variable]
+    default_gateway: Union[Global[str], Variable] = Field(
         serialization_alias="defaultGateway", validation_alias="defaultGateway"
     )
 
 
 class MeIpConfig(BaseModel):
-    model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True, extra="forbid")
+    model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True)
 
     me_dynamic_ip_enabled: Union[Global[bool], Default[bool]] = Field(
         serialization_alias="meDynamicIpEnabled",
         validation_alias="meDynamicIpEnabled",
         default=Default[bool](value=True),
     )
-    me_static_ip_config: Optional[MeStaticIpConfig] = Field(
-        default=None, serialization_alias="meStaticIpCfg", validation_alias="meStaticIpCfg"
-    )
+    me_static_ip_config: Optional[MeStaticIpConfig] = None
 
 
 class SecurityConfig(BaseModel):
-    model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True, extra="forbid")
+    model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True)
 
     security_type: Global[SecurityType] = Field(serialization_alias="securityType", validation_alias="securityType")
-    radius_server_ip: Optional[Union[Global[IPv4Address], Variable]] = Field(
+    radius_server_ip: Optional[Union[Global[str], Variable]] = Field(
         serialization_alias="radiusServerIp", validation_alias="radiusServerIp", default=None
     )
     radius_server_port: Optional[Union[Global[int], Variable, Default[int]]] = Field(
@@ -178,7 +172,7 @@ class SecurityConfig(BaseModel):
 
 
 class SSID(BaseModel):
-    model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True, extra="forbid")
+    model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True)
 
     name: Global[str]
     admin_state: Union[Global[bool], Variable, Default[bool]] = Field(
@@ -199,18 +193,28 @@ class SSID(BaseModel):
     )
 
 
-class WirelessLanParcel(_ParcelBase):
-    type_: Literal["wirelesslan"] = Field(default="wirelesslan", exclude=True)
-    model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True, extra="forbid")
+class WirelessLanData(BaseModel):
+    model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True)
 
     enable_2_4G: Union[Global[bool], Variable, Default[bool]] = Field(
-        validation_alias=AliasPath("data", "enable24G"), default=Default[bool](value=True)
+        serialization_alias="enable24G", validation_alias="enable24G", default=Default[bool](value=True)
     )
     enable_5G: Union[Global[bool], Variable, Default[bool]] = Field(
-        validation_alias=AliasPath("data", "enable5G"), default=Default[bool](value=True)
+        serialization_alias="enable5G", validation_alias="enable5G", default=Default[bool](value=True)
+    )
+    ssid: List[SSID]
+    country: Union[Global[CountryCode], Variable]
+    username: Union[Global[str], Variable]
+    password: Union[Global[str], Variable]
+    me_ip_config: MeIpConfig = Field(
+        serialization_alias="meIpConfig", validation_alias="meIpConfig", default=MeIpConfig()
     )
-    ssid: List[SSID] = Field(validation_alias=AliasPath("data", "ssid"))
-    country: Union[Global[CountryCode], Variable] = Field(validation_alias=AliasPath("data", "country"))
-    username: Union[Global[str], Variable] = Field(validation_alias=AliasPath("data", "username"))
-    password: Union[Global[str], Variable] = Field(validation_alias=AliasPath("data", "password"))
-    me_ip_config: MeIpConfig = Field(validation_alias=AliasPath("data", "meIpConfig"), default=MeIpConfig())
+
+
+class WirelessLanCreationPayload(BaseModel):
+    model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True)
+
+    name: str
+    description: Optional[str] = None
+    data: WirelessLanData
+    metadata: Optional[dict] = None

catalystwan/models/configuration/feature_profile/sdwan/system/aaa.py

@@ -1,22 +1,21 @@
 # Copyright 2024 Cisco Systems, Inc. and its affiliates
 
 from ipaddress import IPv4Address, IPv6Address
-from typing import List, Literal, Optional, Union
+from typing import List, Optional, Union
 
 from pydantic import AliasPath, BaseModel, ConfigDict, Field
 
 from catalystwan.api.configuration_groups.parcel import Default, Global, Variable, _ParcelBase, as_default, as_global
 
-DEFAULT_USER_PRIVILEGE = "15"
-
 
 class PubkeyChainItem(BaseModel):
     model_config = ConfigDict(
-        extra="forbid", populate_by_name=True
+        extra="forbid",
     )
     key_string: Global[str] = Field(
         validation_alias="keyString",
         serialization_alias="keyString",
+        pattern="^AAAA[0-9A-Za-z+/]+[=]{0,3}$",
         description="Set the RSA key string",
     )
 
@@ -30,7 +29,7 @@ class PubkeyChainItem(BaseModel):
 
 
 class UserItem(BaseModel):
-    model_config = ConfigDict(extra="ignore", populate_by_name=True)
+    model_config = ConfigDict(extra="forbid", populate_by_name=True)
 
     name: Union[Global[str], Variable] = Field(description="Set the username")
     password: Union[Global[str], Variable] = Field(
@@ -40,7 +39,7 @@ class UserItem(BaseModel):
         )
     )
     privilege: Union[Global[str], Variable, Default[str], None] = Field(
-        default=as_default(DEFAULT_USER_PRIVILEGE), description="Set Privilege Level for this user"
+        None, description="Set Privilege Level for this user"
     )
     pubkey_chain: Optional[List[PubkeyChainItem]] = Field(
         default=None,
@@ -121,7 +120,7 @@ class Radius(BaseModel):
     vpn: Union[Global[int], Default[int], None] = Field(
         default=None, description="Set VPN in which Radius server is located"
     )
-    source_interface: Optional[Union[Global[str], Default[None], Variable]] = Field(
+    source_interface: Union[Global[str], Default[None], Variable, None] = Field(
         default=None,
         validation_alias="sourceInterface",
         serialization_alias="sourceInterface",
@@ -196,7 +195,7 @@ class Tacacs(BaseModel):
     vpn: Union[Global[int], Default[int], None] = Field(
         default=None, description="Set VPN in which TACACS server is located"
     )
-    source_interface: Optional[Union[Global[str], Default[str], Variable]] = Field(
+    source_interface: Union[Global[str], Default[str], None] = Field(
         default=None,
         validation_alias="sourceInterface",
         serialization_alias="sourceInterface",
@@ -261,10 +260,7 @@ class AuthorizationRuleItem(BaseModel):
     )
 
 
-class AAAParcel(_ParcelBase):
-    type_: Literal["aaa"] = Field(default="aaa", exclude=True)
-    model_config = ConfigDict(extra="forbid", populate_by_name=True)
-
+class AAA(_ParcelBase):
     authentication_group: Union[Variable, Global[bool], Default[bool]] = Field(
         default=as_default(False),
         validation_alias=AliasPath("data", "authenticationGroup"),
@@ -275,16 +271,14 @@ class AAAParcel(_ParcelBase):
         validation_alias=AliasPath("data", "accountingGroup"),
         description="Accounting configurations parameters",
     )
+    # local, radius, tacacs
     server_auth_order: Global[List[str]] = Field(
-        # local, radius, tacacs
         validation_alias=AliasPath("data", "serverAuthOrder"),
         min_length=1,
         max_length=4,
         description="ServerGroups priority order",
     )
-    user: Optional[List[UserItem]] = Field(
-        default=None, validation_alias=AliasPath("data", "user"), description="Create local login account", min_length=1
-    )
+    user: Optional[List[UserItem]] = Field(default=None, description="Create local login account", min_length=1)
     radius: Optional[List[Radius]] = Field(
         default=None, validation_alias=AliasPath("data", "radius"), description="Configure the Radius serverGroup"
     )
@@ -310,48 +304,6 @@ class AAAParcel(_ParcelBase):
         description="Configure the Authorization Rules",
     )
 
-    @classmethod
-    def new(
-        cls,
-        parcel_name: str,
-        server_auth_order: List[str],
-        *,
-        parcel_description: Optional[str] = None,
-        accounting_group: bool = False,
-        authorization_console: bool = False,
-        authorization_config_commands: bool = False
-    ) -> "AAAParcel":
-        return cls(
-            parcel_name=parcel_name,
-            parcel_description=parcel_description,
-            server_auth_order=as_global(server_auth_order),
-            accounting_group=as_global(accounting_group),
-            authorization_console=as_global(authorization_console),
-            authorization_config_commands=as_global(authorization_config_commands),
-        )
-
-    def add_user(
-        self,
-        name: str,
-        password: str,
-        *,
-        privilege: str = DEFAULT_USER_PRIVILEGE,
-        pubkey_chain: Optional[List[PubkeyChainItem]] = None
-    ) -> UserItem:
-        user = UserItem(
-            name=as_global(name),
-            password=as_global(password),
-            privilege=as_global(privilege),
-            pubkey_chain=pubkey_chain,
-        )
-        if self.user is None:
-            self.user = []
-        self.user.append(user)
-        return user
-
-    def set_server_auth_order(self, server_auth_order: List[str]) -> None:
-        self.server_auth_order = as_global(server_auth_order)
-
     def add_authorization_rule(
         self, rule_id: str, method: str, level: str, group: List[str], if_authenticated: bool
     ) -> AuthorizationRuleItem:

catalystwan/models/configuration/feature_profile/sdwan/transport/cellular_controller.py

@@ -1,33 +1,37 @@
-# Copyright 2023 Cisco Systems, Inc. and its affiliates
+# Copyright 2024 Cisco Systems, Inc. and its affiliates
 
-from typing import Literal, Optional, Union
+from typing import Literal, Union
 
 from pydantic import AliasPath, BaseModel, ConfigDict, Field
 
-from catalystwan.api.configuration_groups.parcel import Default, Global, Variable, _ParcelBase, as_default
+from catalystwan.api.configuration_groups.parcel import Default, Global, Variable, _ParcelBase
 
 ConfigTypeValue = Literal["non-eSim"]
 
 
 class ControllerConfig(BaseModel):
-    model_config = ConfigDict(extra="forbid", populate_by_name=True)
-    id: Union[Variable, Global[str]] = Field(description="Cellular ID", examples=["0/2/0"])
-    slot: Optional[Union[Variable, Global[int], Default[int]]] = Field(
-        default=None, description="Set primary SIM slot. 0 or 1"
+    model_config = ConfigDict(extra="forbid", arbitrary_types_allowed=True, populate_by_name=True)
+    id: Union[Variable, Global[str]] = Field(min_length=1, max_length=5, description="Cellular ID")
+    slot: Union[Variable, Global[int], Default[int], None] = Field(
+        default=None, description="Set primary SIM slot", ge=0, le=1
     )
-    max_retry: Optional[Union[Variable, Global[int], Default[None]]] = Field(
+    max_retry: Union[Variable, Global[int], Default[None], None] = Field(
         default=None,
         description="Set SIM failover retries",
+        ge=0,
+        le=65535,
         serialization_alias="maxRetry",
         validation_alias="maxRetry",
     )
-    failover_timer: Optional[Union[Variable, Global[int], Default[None]]] = Field(
+    failover_timer: Union[Variable, Global[int], Default[None], None] = Field(
         default=None,
         description="Set SIM failover timeout in minutes",
+        ge=3,
+        le=7,
         serialization_alias="failovertimer",
         validation_alias="failovertimer",
     )
-    auto_sim: Optional[Union[Variable, Global[bool], Default[None]]] = Field(
+    auto_sim: Union[Variable, Global[bool], Default[None], None] = Field(
         default=None,
         description="Enable/Disable Firmware Auto Sim",
         serialization_alias="autoSim",
@@ -35,24 +39,17 @@ class ControllerConfig(BaseModel):
     )
 
 
-class CellularControllerParcel(_ParcelBase):
-    model_config = ConfigDict(
-        extra="forbid",
-        populate_by_name=True,
-    )
-    type_: Literal["cellular-controller"] = Field(default="cellular-controller", exclude=True, frozen=True)
+class CellularController(_ParcelBase):
     config_type: Default[ConfigTypeValue] = Field(
-        default=as_default("non-eSim", ConfigTypeValue), validation_alias=AliasPath("data", "configType")
+        default=Default(value="non-eSim"), validation_alias=AliasPath("data", "configType")
     )
     controller_config: ControllerConfig = Field(validation_alias=AliasPath("data", "controllerConfig"))
 
-    def set_controller_config(
-        self,
-        id: Union[Global[str]],
-        max_retry: Optional[Union[Global[int]]] = None,
-        failover_timer: Optional[Union[Global[int]]] = None,
-        auto_sim: Optional[Union[Global[bool]]] = None,
+    @staticmethod
+    def add_controller_config(
+        id: Union[Variable, Global[str]],
+        max_retry: Union[Variable, Global[int], Default[None], None] = None,
+        failover_timer: Union[Variable, Global[int], Default[None], None] = None,
+        auto_sim: Union[Variable, Global[bool], Default[None], None] = None,
     ):
-        self.controller_config = ControllerConfig(
-            id=id, max_retry=max_retry, failover_timer=failover_timer, auto_sim=auto_sim
-        )
+        return ControllerConfig(id=id, max_retry=max_retry, failover_timer=failover_timer, auto_sim=auto_sim)

catalystwan/models/configuration/profile_type.py

@@ -2,4 +2,9 @@
 
 from typing import Literal
 
-ProfileType = Literal["transport", "system", "cli", "service", "other"]
+ProfileType = Literal[
+    "transport",
+    "system",
+    "cli",
+    "service",
+]