catalystwan 0.41.4.dev1__tar.gz → 0.41.4.dev2__tar.gz

{catalystwan-0.41.4.dev1 → catalystwan-0.41.4.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: catalystwan
-Version: 0.41.4.dev1
+Version: 0.41.4.dev2
 Summary: Cisco Catalyst WAN SDK for Python
 Author: sbasan
 Author-email: sbasan@cisco.com

{catalystwan-0.41.4.dev1 → catalystwan-0.41.4.dev2}/catalystwan/models/configuration/feature_profile/common.py

@@ -663,6 +663,24 @@ class InterfaceStaticIPv4Address(BaseModel):
     static: StaticIPv4AddressConfig = Field(default_factory=StaticIPv4AddressConfig)
 
 
+AddressType = Literal["dynamic", "static"]
+
+
+class EitherIPv4AddressConfig(BaseModel):
+    model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True, extra="forbid")
+
+    address_type: Union[Global[AddressType], Variable] = Field(
+        serialization_alias="addressType", validation_alias="addressType"
+    )
+    static: Optional[StaticIPv4AddressConfig] = Field(default=None)
+    dynamic: Optional[DynamicDhcpDistance] = Field(default=None)
+
+
+class InterfaceEitherIPv4Address(BaseModel):
+    model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True, extra="forbid")
+    either: EitherIPv4AddressConfig = Field()
+
+
 class DynamicIPv6Dhcp(BaseModel):
     model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True, extra="forbid")
 

{catalystwan-0.41.4.dev1 → catalystwan-0.41.4.dev2}/catalystwan/models/configuration/feature_profile/sdwan/service/dhcp_server.py

@@ -125,3 +125,6 @@ class LanVpnDhcpServerParcel(_ParcelBase):
     option_code: Optional[List[OptionCode]] = Field(
         default=None, validation_alias=AliasPath("data", "optionCode"), description="Configure Options Code"
     )
+    dhcp_ha_enable: Optional[Union[Variable, Global[bool], Default[bool]]] = Field(
+        default=None, validation_alias=AliasPath("data", "dhcpHaEnable"), description="Available only in >= 20.18.2"
+    )

{catalystwan-0.41.4.dev1 → catalystwan-0.41.4.dev2}/catalystwan/models/configuration/feature_profile/sdwan/service/lan/ethernet.py

@@ -17,11 +17,14 @@ from typing_extensions import Annotated
 from catalystwan.api.configuration_groups.parcel import Default, Global, Variable, _ParcelBase
 from catalystwan.models.common import EthernetDuplexMode, MediaType, VersionedField
 from catalystwan.models.configuration.feature_profile.common import (
+    AddressType,
     Arp,
     DynamicDhcpDistance,
+    DynamicIPv6Dhcp,
     EthernetNatAttributesIpv4,
     InterfaceDynamicIPv4Address,
     InterfaceDynamicIPv6Address,
+    InterfaceEitherIPv4Address,
     InterfaceStaticIPv4Address,
     RefIdItem,
     StaticIPv4Address,
@@ -166,6 +169,21 @@ class InterfaceStaticIPv6Address(BaseModel):
     static: StaticIPv6AddressConfig
 
 
+class EitherIPv6AddressConfig(BaseModel):
+    model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True, extra="forbid")
+
+    address_type: Union[Global[AddressType], Variable] = Field(
+        serialization_alias="addressType", validation_alias="addressType"
+    )
+    static: Optional[StaticIPv6AddressConfig] = Field(default=None)
+    dynamic: Optional[DynamicIPv6Dhcp] = Field(default=None)
+
+
+class InterfaceEitherIPv6Address(BaseModel):
+    model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True, extra="forbid")
+    either: EitherIPv6AddressConfig = Field()
+
+
 class NatAttributesIPv6(BaseModel):
     model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True, extra="forbid")
 
@@ -263,19 +281,20 @@ class Trustsec(BaseModel):
     propogate: Annotated[
         Optional[Union[Global[bool], Default[bool]]], VersionedField(versions="<=20.12", forbidden=True)
     ] = Default[bool](value=True)
-    security_group_tag: Optional[Union[Global[int], Variable, Default[None]]] = Field(
+    security_group_tag: Optional[Union[Global[int], Variable, Default[str], Default[None]]] = Field(
         serialization_alias="securityGroupTag", validation_alias="securityGroupTag", default=None
     )
     enable_enforced_propogation: Union[Global[bool], Default[None]] = Field(
-        default=Default[None](value=None),
+        default=Default[None](),
         serialization_alias="enableEnforcedPropogation",
         validation_alias="enableEnforcedPropogation",
     )
-    enforced_security_group_tag: Union[Global[int], Variable, Default[None]] = Field(
-        default=Default[None](value=None),
+    enforced_security_group_tag: Union[Global[int], Variable, Default[str], Default[None]] = Field(
+        default=Default[None](),
         serialization_alias="enforcedSecurityGroupTag",
         validation_alias="enforcedSecurityGroupTag",
     )
+    trusted: Optional[Union[Global[bool], Default[bool]]] = Field(default=None)
 
     @model_serializer(mode="wrap", when_used="json")
     def serialize(self, handler: SerializerFunctionWrapHandler, info: SerializationInfo) -> Dict[str, Any]:
@@ -334,15 +353,15 @@ class InterfaceEthernetParcel(_ParcelBase):
     ethernet_description: Optional[Union[Global[str], Variable, Default[None]]] = Field(
         default=Default[None](value=None), validation_alias=AliasPath("data", "description")
     )
-    interface_ip_address: Optional[Union[InterfaceDynamicIPv4Address, InterfaceStaticIPv4Address]] = Field(
-        validation_alias=AliasPath("data", "intfIpAddress"), default=None
-    )
+    interface_ip_address: Optional[
+        Union[InterfaceDynamicIPv4Address, InterfaceStaticIPv4Address, InterfaceEitherIPv4Address]
+    ] = Field(validation_alias=AliasPath("data", "intfIpAddress"), default=None)
     dhcp_helper: Optional[Union[Variable, Global[List[str]], Default[None]]] = Field(
         validation_alias=AliasPath("data", "dhcpHelper"), default=None
     )
-    interface_ipv6_address: Optional[Union[InterfaceDynamicIPv6Address, InterfaceStaticIPv6Address]] = Field(
-        validation_alias=AliasPath("data", "intfIpV6Address"), default=None
-    )
+    interface_ipv6_address: Optional[
+        Union[InterfaceDynamicIPv6Address, InterfaceStaticIPv6Address, InterfaceEitherIPv6Address]
+    ] = Field(validation_alias=AliasPath("data", "intfIpV6Address"), default=None)
     nat: Union[Global[bool], Default[bool]] = Field(
         validation_alias=AliasPath("data", "nat"), default=Default[bool](value=False)
     )
@@ -398,6 +417,15 @@ class InterfaceEthernetParcel(_ParcelBase):
             raise ValueError("Interface IP Address is already dynamic")
 
         secondary_ip_address = StaticIPv4Address(ip_address=ip_address, subnet_mask=subnet_mask)
-        if self.interface_ip_address.static.secondary_ip_address is None:
-            self.interface_ip_address.static.secondary_ip_address = []
-        self.interface_ip_address.static.secondary_ip_address.append(secondary_ip_address)
+
+        if isinstance(self.interface_ip_address, InterfaceStaticIPv4Address):
+            if self.interface_ip_address.static.secondary_ip_address is None:
+                self.interface_ip_address.static.secondary_ip_address = []
+            self.interface_ip_address.static.secondary_ip_address.append(secondary_ip_address)
+
+        if isinstance(self.interface_ip_address, InterfaceEitherIPv4Address):
+            if self.interface_ip_address.either.static is None:
+                raise ValueError("Missing static primary IP Address")
+            if self.interface_ip_address.either.static.secondary_ip_address is None:
+                self.interface_ip_address.either.static.secondary_ip_address = []
+            self.interface_ip_address.either.static.secondary_ip_address.append(secondary_ip_address)

{catalystwan-0.41.4.dev1 → catalystwan-0.41.4.dev2}/catalystwan/models/configuration/feature_profile/sdwan/system/aaa.py

@@ -11,9 +11,7 @@ DEFAULT_USER_PRIVILEGE = "15"
 
 
 class PubkeyChainItem(BaseModel):
-    model_config = ConfigDict(
-        extra="forbid", populate_by_name=True
-    )
+    model_config = ConfigDict(extra="forbid", populate_by_name=True)
     key_string: Global[str] = Field(
         validation_alias="keyString",
         serialization_alias="keyString",
@@ -118,7 +116,7 @@ class Radius(BaseModel):
         validation_alias="groupName", serialization_alias="groupName", description="Set Radius server Group Name"
     )
 
-    vpn: Union[Global[int], Default[int], None] = Field(
+    vpn: Union[Global[int], Default[int], None, Variable] = Field(
         default=None, description="Set VPN in which Radius server is located"
     )
     source_interface: Optional[Union[Global[str], Default[None], Variable]] = Field(
@@ -193,7 +191,7 @@ class Tacacs(BaseModel):
     group_name: Global[str] = Field(
         validation_alias="groupName", serialization_alias="groupName", description="Set TACACS server Group Name"
     )
-    vpn: Union[Global[int], Default[int], None] = Field(
+    vpn: Union[Global[int], Default[int], None, Variable] = Field(
         default=None, description="Set VPN in which TACACS server is located"
     )
     source_interface: Optional[Union[Global[str], Default[str], Variable]] = Field(
@@ -285,9 +283,17 @@ class AAAParcel(_ParcelBase):
     user: Optional[List[UserItem]] = Field(
         default=None, validation_alias=AliasPath("data", "user"), description="Create local login account", min_length=1
     )
+    cts_auth_list: Optional[Union[Global[str], Variable, Default[Literal[""]]]] = Field(
+        default=None, validation_alias=AliasPath("data", "ctsAuthList"), description="Available only in >= 20.18.1"
+    )
     radius: Optional[List[Radius]] = Field(
         default=None, validation_alias=AliasPath("data", "radius"), description="Configure the Radius serverGroup"
     )
+    radius_trustsec_group: Optional[Union[Global[str], Default[Literal[""]]]] = Field(
+        default=None,
+        validation_alias=AliasPath("data", "radiusTrustsecGroup"),
+        description="Available only in >= 20.18.1",
+    )
     tacacs: Optional[List[Tacacs]] = Field(
         default=None, validation_alias=AliasPath("data", "tacacs"), description="Configure the TACACS serverGroup"
     )

{catalystwan-0.41.4.dev1 → catalystwan-0.41.4.dev2}/catalystwan/models/configuration/feature_profile/sdwan/transport/management/ethernet.py

@@ -7,8 +7,10 @@ from pydantic import AliasPath, BaseModel, ConfigDict, Field
 from catalystwan.api.configuration_groups.parcel import Default, Global, Variable, _ParcelBase
 from catalystwan.models.common import EthernetDuplexMode, MediaType, Speed
 from catalystwan.models.configuration.feature_profile.common import (
+    AddressType,
     Arp,
     InterfaceDynamicIPv4Address,
+    InterfaceEitherIPv4Address,
     InterfaceStaticIPv4Address,
 )
 
@@ -50,6 +52,21 @@ class InterfaceStaticIPv6Address(BaseModel):
     static: StaticIPv6AddressConfig
 
 
+class EitherIPv6AddressConfig(BaseModel):
+    model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True, extra="forbid")
+
+    address_type: Union[Global[AddressType], Variable] = Field(
+        serialization_alias="addressType", validation_alias="addressType"
+    )
+    static: Optional[StaticIPv6AddressConfig] = Field(default=None)
+    dynamic: Optional[DhcpClient] = Field(default=None)
+
+
+class InterfaceEitherIPv6Address(BaseModel):
+    model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True, extra="forbid")
+    either: EitherIPv6AddressConfig = Field()
+
+
 class Advanced(BaseModel):
     model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True, extra="forbid")
 
@@ -98,7 +115,7 @@ class InterfaceEthernetParcel(_ParcelBase):
     interface_description: Union[Variable, Global[str], Default[None]] = Field(
         default=Default[None](value=None), validation_alias=AliasPath("data", "description")
     )
-    intf_ip_address: Union[InterfaceDynamicIPv4Address, InterfaceStaticIPv4Address] = Field(
+    intf_ip_address: Union[InterfaceDynamicIPv4Address, InterfaceStaticIPv4Address, InterfaceEitherIPv4Address] = Field(
         validation_alias=AliasPath("data", "intfIpAddress")
     )
     shutdown: Union[Variable, Global[bool], Default[bool]] = Field(
@@ -113,9 +130,9 @@ class InterfaceEthernetParcel(_ParcelBase):
     dhcp_helper: Optional[Union[Variable, Default[None], Global[List[str]]]] = Field(
         default=None, validation_alias=AliasPath("data", "dhcpHelper")
     )
-    intf_ip_v6_address: Optional[Union[InterfaceDynamicIPv6Address, InterfaceStaticIPv6Address]] = Field(
-        default=None, validation_alias=AliasPath("data", "intfIpV6Address")
-    )
+    intf_ip_v6_address: Optional[
+        Union[InterfaceDynamicIPv6Address, InterfaceStaticIPv6Address, InterfaceEitherIPv6Address]
+    ] = Field(default=None, validation_alias=AliasPath("data", "intfIpV6Address"))
     iperf_server: Optional[Union[Variable, Global[str], Default[None]]] = Field(
         default=None, validation_alias=AliasPath("data", "iperfServer")
     )

{catalystwan-0.41.4.dev1 → catalystwan-0.41.4.dev2}/catalystwan/models/configuration/feature_profile/sdwan/transport/wan/interface/ethernet.py

@@ -16,12 +16,15 @@ from catalystwan.models.common import (
 )
 from catalystwan.models.configuration.feature_profile.common import (
     AclQos,
+    AddressType,
     AllowService,
     Arp,
+    DynamicIPv6Dhcp,
     Encapsulation,
     EthernetNatAttributesIpv4,
     InterfaceDynamicIPv4Address,
     InterfaceDynamicIPv6Address,
+    InterfaceEitherIPv4Address,
     InterfaceStaticIPv4Address,
     MultiRegionFabric,
     RefIdItem,
@@ -149,6 +152,46 @@ class InterfaceStaticIPv6Address(BaseModel):
     static: Static = Field()
 
 
+class EitherIPv6AddressConfig(BaseModel):
+    model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True, extra="forbid")
+
+    address_type: Union[Global[AddressType], Variable] = Field(
+        serialization_alias="addressType", validation_alias="addressType"
+    )
+    static: Optional[Static] = Field(default=None)
+    dynamic: Optional[DynamicIPv6Dhcp] = Field(default=None)
+
+
+class InterfaceEitherIPv6Address(BaseModel):
+    model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True, extra="forbid")
+    either: EitherIPv6AddressConfig = Field()
+
+
+class Trustsec(BaseModel):
+    model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True, extra="forbid")
+
+    enable_sgt_propogation: Union[Global[bool], Default[bool]] = Field(
+        serialization_alias="enableSGTPropogation",
+        validation_alias="enableSGTPropogation",
+        default=Default[bool](value=False),
+    )
+    propagate: Optional[Union[Global[bool], Default[bool]]] = Default[bool](value=True)
+    security_group_tag: Optional[Union[Global[int], Variable, Default[str]]] = Field(
+        serialization_alias="securityGroupTag", validation_alias="securityGroupTag", default=None
+    )
+    enable_enforced_propogation: Union[Global[bool], Default[None]] = Field(
+        default=Default[None](),
+        serialization_alias="enableEnforcedPropogation",
+        validation_alias="enableEnforcedPropogation",
+    )
+    enforced_security_group_tag: Union[Global[int], Variable, Default[str]] = Field(
+        default=Default[str](value=""),
+        serialization_alias="enforcedSecurityGroupTag",
+        validation_alias="enforcedSecurityGroupTag",
+    )
+    trusted: Optional[Union[Global[bool], Default[bool]]] = Field(default=None)
+
+
 class Tunnel(BaseModel):
     model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True, extra="forbid")
     bandwidth_percent: Optional[Union[Variable, Default[int], Global[int]]] = Field(
@@ -314,9 +357,9 @@ class InterfaceEthernetParcel(_ParcelBase):
         default_factory=list, validation_alias=AliasPath("data", "encapsulation"), description="Encapsulation for TLOC"
     )
     interface_name: Union[Variable, Global[str]] = Field(validation_alias=AliasPath("data", "interfaceName"))
-    interface_ip_address: Optional[Union[InterfaceDynamicIPv4Address, InterfaceStaticIPv4Address]] = Field(
-        validation_alias=AliasPath("data", "intfIpAddress"), default=None
-    )
+    interface_ip_address: Optional[
+        Union[InterfaceDynamicIPv4Address, InterfaceStaticIPv4Address, InterfaceEitherIPv4Address]
+    ] = Field(validation_alias=AliasPath("data", "intfIpAddress"), default=None)
     interface_description: Optional[Union[Variable, Global[str], Default[None]]] = Field(
         default=None, validation_alias=AliasPath("data", "description")
     )
@@ -330,6 +373,7 @@ class InterfaceEthernetParcel(_ParcelBase):
         default=Global[bool](value=False), validation_alias=AliasPath("data", "tunnelInterface")
     )
     acl_qos: Optional[AclQos] = Field(default=None, validation_alias=AliasPath("data", "aclQos"), description="ACL/QOS")
+    trustsec: Optional[Trustsec] = Field(validation_alias=AliasPath("data", "trustsec"), default=None)
     advanced: Optional[Advanced] = Field(
         default=None, validation_alias=AliasPath("data", "advanced"), description="Advanced Attributes"
     )
@@ -354,9 +398,9 @@ class InterfaceEthernetParcel(_ParcelBase):
     dhcp_helper: Optional[Union[Variable, Default[None], Global[List[str]]]] = Field(
         default=None, validation_alias=AliasPath("data", "dhcpHelper")
     )
-    intf_ip_v6_address: Optional[Union[InterfaceDynamicIPv6Address, InterfaceStaticIPv6Address]] = Field(
-        default=None, validation_alias=AliasPath("data", "intfIpV6Address")
-    )
+    intf_ip_v6_address: Optional[
+        Union[InterfaceDynamicIPv6Address, InterfaceStaticIPv6Address, InterfaceEitherIPv6Address]
+    ] = Field(default=None, validation_alias=AliasPath("data", "intfIpV6Address"))
     iperf_server: Optional[Union[Variable, Global[str], Default[None]]] = Field(
         default=None, validation_alias=AliasPath("data", "iperfServer")
     )

{catalystwan-0.41.4.dev1 → catalystwan-0.41.4.dev2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "catalystwan"
-version = "0.41.4dev1"
+version = "0.41.4dev2"
 description = "Cisco Catalyst WAN SDK for Python"
 authors = ["sbasan <sbasan@cisco.com>"]
 readme = "README.md"