catalystwan 0.41.2.dev7__tar.gz → 0.41.2.dev9__tar.gz

{catalystwan-0.41.2.dev7 → catalystwan-0.41.2.dev9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: catalystwan
-Version: 0.41.2.dev7
+Version: 0.41.2.dev9
 Summary: Cisco Catalyst WAN SDK for Python
 Author: kagorski
 Author-email: kagorski@cisco.com

{catalystwan-0.41.2.dev7 → catalystwan-0.41.2.dev9}/catalystwan/endpoints/cluster_management.py

@@ -14,7 +14,7 @@ TenancyModes = Literal["SingleTenant", "MultiTenant"]
 
 class TenancyMode(BaseModel):
     mode: TenancyModes
-    deploymentmode: str
+    deploymentmode: Optional[str] = None
     domain: Optional[str] = None
     clusterid: Optional[str] = None
 
@@ -125,6 +125,7 @@ class ClusterManagement(APIEndpoints):
         # POST /clusterManagement/remove
         ...
 
-    def set_tenancy_mode(self):
+    @post("/clusterManagement/tenancy/mode")
+    def set_tenancy_mode(self, payload: TenancyMode) -> None:
         # POST /clusterManagement/tenancy/mode
         ...

catalystwan-0.41.2.dev9/catalystwan/endpoints/configuration/network_hierarchy.py

@@ -0,0 +1,47 @@
+# Copyright 2024 Cisco Systems, Inc. and its affiliates
+
+# mypy: disable-error-code="empty-body"
+from uuid import UUID
+
+from catalystwan.endpoints import APIEndpoints, delete, get, post, put, versions
+from catalystwan.models.configuration.feature_profile.parcel import Parcel, ParcelCreationResponse
+from catalystwan.models.configuration.network_hierarchy.cflowd import CflowdParcel
+from catalystwan.models.configuration.network_hierarchy.node import NodeInfo
+from catalystwan.models.configuration.network_hierarchy.security_logging import SecurityLoggingParcel
+from catalystwan.typed_list import DataSequence
+
+
+class NetworkHierarchy(APIEndpoints):
+    @get("/v1/network-hierarchy")
+    @versions(">=20.10")
+    def list_nodes(self) -> DataSequence[NodeInfo]: ...
+
+    @post("/v1/network-hierarchy/{node_id}/network-settings/cflowd")
+    @versions(">20.12")
+    def create_cflowd(self, node_id: UUID, payload: CflowdParcel) -> ParcelCreationResponse: ...
+
+    @get("/v1/network-hierarchy/{node_id}/network-settings/cflowd", resp_json_key="data")
+    @versions(">20.12")
+    def get_cflowd(self, node_id: UUID) -> DataSequence[Parcel[CflowdParcel]]: ...
+
+    @delete("/v1/network-hierarchy/{node_id}/network-settings/cflowd/{parcel_id}")
+    @versions(">20.12")
+    def delete_cflowd(self, node_id: UUID, parcel_id: UUID) -> None: ...
+
+    @post("/v1/network-hierarchy/{node_id}/network-settings/security-logging")
+    @versions(">20.12")
+    def create_security_logging(self, node_id: UUID, payload: SecurityLoggingParcel) -> ParcelCreationResponse: ...
+
+    @get("/v1/network-hierarchy/{node_id}/network-settings/security-logging", resp_json_key="data")
+    @versions(">20.12")
+    def get_security_logging(self, node_id: UUID) -> DataSequence[Parcel[SecurityLoggingParcel]]: ...
+
+    @put("/v1/network-hierarchy/{node_id}/network-settings/security-logging/{parcel_id}")
+    @versions(">20.12")
+    def edit_security_logging(
+        self, node_id: UUID, payload: SecurityLoggingParcel, parcel_id: UUID
+    ) -> ParcelCreationResponse: ...
+
+    @delete("/v1/network-hierarchy/{node_id}/network-settings/security-logging/{parcel_id}")
+    @versions(">20.12")
+    def delete_security_logging(self, node_id: UUID, parcel_id: UUID) -> None: ...

catalystwan-0.41.2.dev9/catalystwan/endpoints/configuration/packages.py

@@ -0,0 +1,36 @@
+# Copyright 2026 Cisco Systems, Inc. and its affiliates
+
+# mypy: disable-error-code="empty-body"
+
+from pathlib import Path
+
+from catalystwan.endpoints import APIEndpoints, CustomPayloadType, PreparedPayload, post, versions
+from catalystwan.models.configuration.packages import (
+    CatalogPackageExportRequest,
+    CatalogPackageImportResponse,
+    TemplatePackageExportRequest,
+)
+
+
+class CatalogImportTarballFile(CustomPayloadType):
+    def __init__(self, filename: Path):
+        self.filename = filename
+
+    def prepared(self) -> PreparedPayload:
+        data = open(self.filename, "rb")
+        return PreparedPayload(files={"file": (Path(data.name).name, data)})
+
+
+class DeviceConfigPackageEndpoints(APIEndpoints):
+
+    @versions(supported_versions=(">=20.12"), raises=False)
+    @post("/templates/package/export")
+    def export_templates(self, payload: TemplatePackageExportRequest = TemplatePackageExportRequest()) -> bytes: ...
+
+    @versions(supported_versions=(">=20.14"), raises=False)
+    @post("/v1/packages/export")
+    def export_catalog(self, payload: CatalogPackageExportRequest) -> bytes: ...
+
+    @versions(supported_versions=(">=20.14"), raises=False)
+    @post("/v1/packages/import")
+    def import_catalog(self, payload: CatalogImportTarballFile) -> CatalogPackageImportResponse: ...

{catalystwan-0.41.2.dev7 → catalystwan-0.41.2.dev9}/catalystwan/endpoints/endpoints_container.py

@@ -19,6 +19,7 @@ from catalystwan.endpoints.configuration.feature_profile.sdwan.system import Sys
 from catalystwan.endpoints.configuration.feature_profile.sdwan.topology import TopologyFeatureProfile
 from catalystwan.endpoints.configuration.feature_profile.sdwan.transport import TransportFeatureProfile
 from catalystwan.endpoints.configuration.network_hierarchy import NetworkHierarchy
+from catalystwan.endpoints.configuration.packages import DeviceConfigPackageEndpoints
 from catalystwan.endpoints.configuration.policy.definition.access_control_list import ConfigurationPolicyAclDefinition
 from catalystwan.endpoints.configuration.policy.definition.access_control_list_ipv6 import (
     ConfigurationPolicyAclIPv6Definition,
@@ -230,8 +231,11 @@ class ConfigurationContainer:
     def __init__(self, session: ManagerSession):
         self.policy = ConfigurationPolicyContainer(session)
         self.feature_profile = ConfigurationFeatureProfileContainer(session)
+        self.config_group = ConfigurationGroup(session)
         self.topology_group = TopologyGroupEndpoints(session)
         self.policy_group = PolicyGroupEndpoints(session)
+        self.feature_profile = ConfigurationFeatureProfileContainer(session=session)
+        self.packages = DeviceConfigPackageEndpoints(session)
 
 
 class TroubleshootingToolsContainer:

{catalystwan-0.41.2.dev7 → catalystwan-0.41.2.dev9}/catalystwan/models/configuration/feature_profile/parcel.py

@@ -94,6 +94,7 @@ ParcelType = Literal[
     "security-ipssignature",
     "security-localapp",
     "security-localdomain",
+    "security-logging",
     "security-port",
     "security-protocolname",
     "security-scalablegrouptag",

{catalystwan-0.41.2.dev7 → catalystwan-0.41.2.dev9}/catalystwan/models/configuration/feature_profile/sdwan/other/ucse.py

@@ -6,7 +6,7 @@ from typing import List, Literal, Optional, Union
 
 from pydantic import AliasPath, BaseModel, ConfigDict, Field
 
-from catalystwan.api.configuration_groups.parcel import Default, Global, Variable, _ParcelBase, as_default, as_variable
+from catalystwan.api.configuration_groups.parcel import Default, Global, Variable, _ParcelBase
 
 FailOverType = Literal["ge2", "te2"]
 LomType = Literal["ge1", "ge2", "ge3", "te2", "te3", "console", "failover"]
@@ -27,8 +27,8 @@ class AccessPort(BaseModel):
     model_config = ConfigDict(
         populate_by_name=True,
     )
-    dedicated: Union[Global[bool], Default[bool]] = Field(default=as_default(True), description="Dedicated")
-    shared_lom: SharedLom = Field(..., serialization_alias="sharedLom", validation_alias="sharedLom")
+    dedicated: Union[Global[bool], Default[bool]] = Field(default=Default[bool](value=True), description="Dedicated")
+    shared_lom: Optional[SharedLom] = Field(default=None, serialization_alias="sharedLom", validation_alias="sharedLom")
 
 
 class Ip(BaseModel):
@@ -37,7 +37,7 @@ class Ip(BaseModel):
         populate_by_name=True,
     )
     address: Union[Global[str], Global[IPv4Interface], Variable] = Field(
-        default=as_variable("{{ipv4Addr}}"), description="Assign IPv4 address"
+        default=Variable(value="{{ipv4Addr}}"), description="Assign IPv4 address"
     )
     default_gateway: Union[Global[IPv4Address], Variable, Default[None]] = Field(
         default=Default[None](value=None),
@@ -82,7 +82,7 @@ class InterfaceItem(BaseModel):
         validation_alias="ifName",
         description="Set Inteface name",
     )
-    l3: Default[bool] = Field(default=as_default(True), description="L3")
+    l3: Default[bool] = Field(default=Default[bool](value=True), description="L3")
     ucse_interface_vpn: Optional[Union[Global[int], Variable, Default[None]]] = Field(
         default=Default[None](value=None),
         serialization_alias="ucseInterfaceVpn",

{catalystwan-0.41.2.dev7 → catalystwan-0.41.2.dev9}/catalystwan/models/configuration/feature_profile/sdwan/policy_object/__init__.py

@@ -5,7 +5,7 @@ from typing import List, Union
 from pydantic import Field
 from typing_extensions import Annotated
 
-from .policy.app_probe import AppProbeMapItem, AppProbeParcel
+from .policy.app_probe import AppProbeEntry, AppProbeMapItem, AppProbeParcel
 from .policy.application_list import ApplicationFamilyListEntry, ApplicationListEntry, ApplicationListParcel
 from .policy.as_path import AsPathParcel
 from .policy.color_list import ColorEntry, ColorParcel
@@ -20,7 +20,7 @@ from .policy.policer import PolicerEntry, PolicerParcel
 from .policy.prefered_group_color import Preference, PreferredColorGroupEntry, PreferredColorGroupParcel
 from .policy.prefix_list import PrefixListEntry, PrefixListParcel
 from .policy.service_object_group import ServiceObjectGroupParcel
-from .policy.sla_class import SLAClassListEntry, SLAClassParcel
+from .policy.sla_class import FallbackBestTunnel, SLAClassCriteria, SLAClassListEntry, SLAClassParcel
 from .policy.standard_community import StandardCommunityEntry, StandardCommunityParcel
 from .policy.tloc_list import TlocEntry, TlocParcel
 from .security.aip import AdvancedInspectionProfileParcel
@@ -43,7 +43,7 @@ from .security.scalable_group_tag import ScalableGroupTagEntry, ScalableGroupTag
 from .security.security_port import SecurityPortListEntry, SecurityPortParcel
 from .security.ssl_decryption import SslDecryptionParcel
 from .security.ssl_decryption_profile import SslDecryptionProfileParcel
-from .security.url import BaseURLListEntry, URLAllowParcel, URLBlockParcel, URLParcel
+from .security.url import BaseURLListEntry, URLParcel
 from .security.url_filtering import UrlFilteringParcel
 from .security.zone import SecurityZoneListEntry, SecurityZoneListParcel
 
@@ -93,12 +93,12 @@ __all__ = (
     "AdvancedInspectionProfileParcel",
     "AdvancedMalwareProtectionParcel",
     "AnyPolicyObjectParcel",
-    "ApplicationFamilyListEntry",
-    "ApplicationListEntry",
-    "ApplicationListParcel",
     "AppProbeEntry",
     "AppProbeMapItem",
     "AppProbeParcel",
+    "ApplicationFamilyListEntry",
+    "ApplicationListEntry",
+    "ApplicationListParcel",
     "AsPathParcel",
     "BaseURLListEntry",
     "ColorEntry",
@@ -107,24 +107,22 @@ __all__ = (
     "DataPrefixParcel",
     "ExpandedCommunityParcel",
     "ExtendedCommunityParcel",
+    "FQDNDomainParcel",
+    "FQDNListEntry",
     "FallbackBestTunnel",
     "FowardingClassParcel",
     "FowardingClassQueueEntry",
-    "FQDNDomainParcel",
-    "FQDNListEntry",
     "GeoLocationListEntry",
     "GeoLocationListParcel",
-    "IdentityEntry",
-    "IdentityEntry",
-    "IdentityParcel",
-    "IdentityParcel",
-    "IntrusionPreventionParcel",
     "IPSSignatureListEntry",
     "IPSSignatureParcel",
     "IPv6DataPrefixEntry",
     "IPv6DataPrefixParcel",
     "IPv6PrefixListEntry",
     "IPv6PrefixListParcel",
+    "IdentityEntry",
+    "IdentityParcel",
+    "IntrusionPreventionParcel",
     "LocalDomainListEntry",
     "LocalDomainParcel",
     "MirrorParcel",
@@ -137,9 +135,11 @@ __all__ = (
     "PrefixListParcel",
     "ProtocolListEntry",
     "ProtocolListParcel",
+    "SLAClassCriteria",
+    "SLAClassListEntry",
+    "SLAClassParcel",
     "ScalableGroupTagEntry",
     "ScalableGroupTagParcel",
-    "ServiceObjectGroupParcel",
     "SecurityApplicationFamilyListEntry",
     "SecurityApplicationListEntry",
     "SecurityApplicationListParcel",
@@ -151,18 +151,13 @@ __all__ = (
     "SecurityPortParcel",
     "SecurityZoneListEntry",
     "SecurityZoneListParcel",
-    "SLAAppProbeClass",
-    "SLAClassCriteria",
-    "SLAClassListEntry",
-    "SLAClassParcel",
+    "ServiceObjectGroupParcel",
     "SslDecryptionParcel",
     "SslDecryptionProfileParcel",
     "StandardCommunityEntry",
     "StandardCommunityParcel",
     "TlocEntry",
     "TlocParcel",
-    "URLAllowParcel",
-    "URLBlockParcel",
     "URLParcel",
 )
 

catalystwan-0.41.2.dev9/catalystwan/models/configuration/feature_profile/sdwan/policy_object/security/url.py

@@ -0,0 +1,48 @@
+# Copyright 2024 Cisco Systems, Inc. and its affiliates
+
+from typing import List, Literal, Optional
+
+from pydantic import AliasPath, ConfigDict, Field, model_serializer
+
+from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, _ParcelEntry
+
+URLListSubtype = Literal["urlallowed", "urlblocked"]
+
+
+class BaseURLListEntry(_ParcelEntry):
+    model_config = ConfigDict(populate_by_name=True)
+    pattern: Global[str]
+
+
+class URLParcel(_ParcelBase):
+    model_config = ConfigDict(populate_by_name=True)
+    subtype: Optional[URLListSubtype] = Field(  # field name must not clash with any of aliases
+        default=None,
+        validation_alias=AliasPath("data", "type"),
+        # serialization alias handled by _BaseParcel model serializer
+        description="must be used only for versions > 20.15.2",
+    )
+    legacy_subtype: Optional[URLListSubtype] = Field(  # field name must not clash with any of aliases
+        exclude=True,
+        default=None,
+        validation_alias="type",
+        serialization_alias="type",
+        description="must be used only for versions <= 20.15.2",
+    )
+    type_: Literal["security-urllist"] = Field(default="security-urllist", exclude=True)
+    entries: List[BaseURLListEntry] = Field(default_factory=list, validation_alias=AliasPath("data", "entries"))
+
+    def add_url(self, pattern: str):
+        self.entries.append(BaseURLListEntry(pattern=Global[str](value=pattern)))
+
+    def use_legacy_subtype(self):
+        if self.subtype is not None:
+            self.legacy_subtype = self.subtype
+            self.subtype = None
+
+    @model_serializer(mode="wrap")
+    def serialize_model(self, handler, info):
+        serialized = _ParcelBase.envelope_parcel_data(self, handler, info)
+        if self.legacy_subtype:
+            serialized["type"] = self.legacy_subtype
+        return serialized

{catalystwan-0.41.2.dev7 → catalystwan-0.41.2.dev9}/catalystwan/models/configuration/feature_profile/sdwan/service/lan/ethernet.py

@@ -334,8 +334,8 @@ 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: Union[InterfaceDynamicIPv4Address, InterfaceStaticIPv4Address] = Field(
-        validation_alias=AliasPath("data", "intfIpAddress"), default_factory=InterfaceStaticIPv4Address
+    interface_ip_address: Optional[Union[InterfaceDynamicIPv4Address, InterfaceStaticIPv4Address]] = 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

{catalystwan-0.41.2.dev7 → catalystwan-0.41.2.dev9}/catalystwan/models/configuration/feature_profile/sdwan/system/snmp.py

@@ -75,7 +75,7 @@ class UserItem(BaseModel):
         populate_by_name=True,
     )
     name: Global[str] = Field(..., description="Name of the SNMP user")
-    auth: Optional[Union[Global[Literal["sha"]], Variable, Default[None]]] = Field(
+    auth: Optional[Union[Global[Literal["sha", "sha256"]], Variable, Default[None]]] = Field(
         default=None, description="Configure authentication protocol"
     )
     auth_password: Optional[Union[Global[str], Variable, Default[None]]] = Field(

{catalystwan-0.41.2.dev7 → catalystwan-0.41.2.dev9}/catalystwan/models/configuration/feature_profile/sdwan/transport/wan/interface/ethernet.py

@@ -308,8 +308,8 @@ 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: Union[InterfaceDynamicIPv4Address, InterfaceStaticIPv4Address] = Field(
-        validation_alias=AliasPath("data", "intfIpAddress"), default_factory=InterfaceStaticIPv4Address
+    interface_ip_address: Optional[Union[InterfaceDynamicIPv4Address, InterfaceStaticIPv4Address]] = 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")

{catalystwan-0.41.2.dev7 → catalystwan-0.41.2.dev9}/catalystwan/models/configuration/network_hierarchy/__init__.py

@@ -6,14 +6,16 @@ from typing_extensions import Annotated
 
 from .cflowd import CflowdParcel
 from .node import NodeInfo
+from .security_logging import SecurityLoggingParcel
 
 AnyNetworkHierarchyParcel = Annotated[
-    Union[CflowdParcel],
+    Union[CflowdParcel, SecurityLoggingParcel],
     Field(discriminator="type_"),
 ]
 
 __all__ = [
     "CflowdParcel",
+    "SecurityLoggingParcel",
     "NodeInfo",
 ]
 

{catalystwan-0.41.2.dev7 → catalystwan-0.41.2.dev9}/catalystwan/models/configuration/network_hierarchy/cflowd.py

@@ -29,7 +29,7 @@ class Collectors(BaseModel):
         default=Global[bool](value=False), validation_alias="bfdMetricsExport", serialization_alias="bfdMetricsExport"
     )
     export_interval: Optional[Global[int]] = Field(
-        default=Global[int](value=600), validation_alias="exportInterval", serialization_alias="exportInterval"
+        default=None, validation_alias="exportInterval", serialization_alias="exportInterval"
     )
     export_spread: Optional[Global[bool]] = Field(
         default=Global[bool](value=False), validation_alias="exportSpread", serialization_alias="exportSpread"
@@ -81,13 +81,20 @@ class CflowdParcel(_ParcelBase):
         self,
         address: Optional[str] = None,
         bfd_metrics_export: Optional[bool] = False,
-        export_interval: Optional[int] = 600,
+        export_interval: Optional[int] = None,
         export_spread: Optional[bool] = False,
         udp_port: Optional[int] = 4739,
         vpn_id: Optional[int] = None,
     ):
         if self.collectors is None:
             self.collectors = []
+        if export_interval is not None:
+            # bfd_metrics_export must be True if export_interval is set
+            bfd_metrics_export = True
+        if bfd_metrics_export and export_interval is None:
+            # export_interval should be default 600 only if bfd_metrics_export is True
+            export_interval = 600
+
         self.collectors.append(
             Collectors(
                 address=as_optional_global(address),

catalystwan-0.41.2.dev9/catalystwan/models/configuration/network_hierarchy/security_logging.py

@@ -0,0 +1,91 @@
+# Copyright 2026 Cisco Systems, Inc. and its affiliates
+from ipaddress import IPv4Address, IPv6Address
+from typing import List, Literal, Optional, Tuple, Union, get_args
+
+from pydantic import AliasPath, BaseModel, ConfigDict, Field
+
+from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase
+
+HSLName = Literal[
+    "server1",
+    "server2",
+    "server3",
+    "server4",
+]
+SERVER_NAMES: Tuple[HSLName, ...] = get_args(HSLName)
+
+
+class HSLEntry(BaseModel):
+    model_config = ConfigDict(extra="forbid", populate_by_name=True)
+    name: Optional[HSLName] = Field(
+        default=None,
+        validation_alias="name",
+        serialization_alias="name",
+        description="This field is required in version >=20.16. In versions <20.16 it must be None",
+    )
+    vrf: Global[str] = Field(validation_alias="vrf", serialization_alias="vrf")
+    serverIp: Global[Union[IPv4Address, IPv6Address]] = Field(
+        validation_alias="serverIp", serialization_alias="serverIp"
+    )
+    port: Global[int] = Field(validation_alias="port", serialization_alias="port")
+
+
+class UTDSyslog(BaseModel):
+    model_config = ConfigDict(extra="forbid", populate_by_name=True)
+    vpn: Global[str] = Field(validation_alias="vpn", serialization_alias="vpn")
+    server_ip: Global[IPv4Address] = Field(validation_alias="serverIp", serialization_alias="serverIp")
+
+
+class SecurityLoggingParcel(_ParcelBase):
+    model_config = ConfigDict(extra="forbid", populate_by_name=True)
+    type_: Literal["security-logging"] = Field(default="security-logging", exclude=True)
+    parcel_name: str = Field(
+        default="SecurityLogging",
+        exclude=True,
+        description="This field is not defined for this model",
+        serialization_alias="name",
+        validation_alias="name",
+    )
+    high_speed_logging: List[HSLEntry] = Field(
+        default_factory=list,
+        max_length=4,
+        validation_alias=AliasPath("data", "highSpeedLogging"),
+        description="High Speed Logging",
+    )
+    utd_syslog: List[UTDSyslog] = Field(
+        default_factory=list,
+        validation_alias=AliasPath("data", "utdSyslog"),
+        description="UTD Syslog",
+    )
+
+    def add_hsl_server(
+        self,
+        vrf: str,
+        serverIp: Union[IPv4Address, IPv6Address],
+        port: int,
+        name: Optional[HSLName] = None,
+    ):
+        if self.high_speed_logging is None:
+            self.high_speed_logging = []
+
+        if len(self.high_speed_logging) >= 4:
+            raise ValueError("Max 4 servers allowed")
+
+        taken_server_names = {entry.name for entry in self.high_speed_logging}
+
+        if name is not None and name in taken_server_names:
+            raise ValueError(f"{name} is already used")
+
+        self.high_speed_logging.append(
+            HSLEntry(
+                name=name,
+                vrf=Global[str](value=vrf),
+                serverIp=Global[Union[IPv4Address, IPv6Address]](value=serverIp),
+                port=Global[int](value=port),
+            )
+        )
+
+    def get_next_server_name(self) -> Optional[HSLName]:
+        taken_server_names = {entry.name for entry in self.high_speed_logging}
+        name: Optional[HSLName] = next((name for name in SERVER_NAMES if name not in taken_server_names), None)
+        return name

catalystwan-0.41.2.dev9/catalystwan/models/configuration/packages.py

@@ -0,0 +1,57 @@
+# Copyright 2026 Cisco Systems, Inc. and its affiliates
+from typing import Iterable, List, Literal, Optional
+from uuid import UUID
+
+from pydantic import BaseModel, ConfigDict, Field
+from typing_extensions import Self
+
+CatalogObjectType = Literal[
+    "config-group",
+    "policy-group",
+    "topology-group",
+]
+
+
+class CatalogPackageContents(BaseModel):
+    model_config = ConfigDict(populate_by_name=True)
+    object_list: List[UUID] = Field(
+        default_factory=list,
+        validation_alias="objectList",
+        serialization_alias="objectList",
+        description="list of object uuids",
+    )
+    object_type: Optional[CatalogObjectType] = Field(
+        default=None, validation_alias="objectType", serialization_alias="objectType"
+    )
+
+
+class CatalogPackageExportRequest(BaseModel):
+    model_config = ConfigDict(populate_by_name=True)
+    package_contents: List[CatalogPackageContents] = Field(
+        default_factory=list,
+        validation_alias="packageContents",
+        serialization_alias="packageContents",
+        description="package contents",
+    )
+
+    def add_objects(self, object_type: CatalogObjectType, ids: Iterable[UUID]) -> Self:
+        contents = CatalogPackageContents(object_type=object_type, object_list=list(ids))
+        self.package_contents.append(contents)
+        return self
+
+
+class CatalogPackageImportResponse(BaseModel):
+    model_config = ConfigDict(populate_by_name=True)
+    task_id: UUID = Field(validation_alias="taskId", serialization_alias="taskId")
+
+
+class TemplatePackageExportRequest(BaseModel):
+    model_config = ConfigDict(populate_by_name=True)
+    template_ids: Optional[List[UUID]] = Field(
+        default=list(),
+        validation_alias="templateIds",
+        serialization_alias="templateIds",
+        description="Select Device Templates for export by providing list of Ids"
+        "when list empty or parameter is missing all templates will be provided",
+    )
+    extras: bool = Field(default=True, description="Include extra items for Config Migration Tool")

{catalystwan-0.41.2.dev7 → catalystwan-0.41.2.dev9}/catalystwan/models/policy/definition/ssl_decryption_utd_profile.py

@@ -2,11 +2,12 @@
 
 from itertools import chain
 from typing import List, Literal, Optional
+from uuid import UUID
 
 from pydantic import BaseModel, ConfigDict, Field
 
 from catalystwan.models.common import PolicyModeType, WebCategory, WebReputation
-from catalystwan.models.policy import URLAllowListInfo, URLBlockListInfo
+from catalystwan.models.policy import URLAllowList, URLBlockList
 from catalystwan.models.policy.policy_definition import (
     PolicyDefinitionBase,
     PolicyDefinitionGetResponse,
@@ -35,10 +36,10 @@ class SslDecryptionUtdProfileDefinition(BaseModel):
         default=None, validation_alias="decryptThreshold", serialization_alias="decryptThreshold"
     )
 
-    filtered_url_white_list: List[URLAllowListInfo] = Field(
+    filtered_url_white_list: List[URLAllowList] = Field(
         default_factory=list, validation_alias="filteredUrlWhiteList", serialization_alias="filteredUrlWhiteList"
     )
-    filtered_url_black_list: List[URLBlockListInfo] = Field(
+    filtered_url_black_list: List[URLBlockList] = Field(
         default_factory=list, validation_alias="filteredUrlBlackList", serialization_alias="filteredUrlBlackList"
     )
 
@@ -62,11 +63,11 @@ class SslDecryptionUtdProfileDefinition(BaseModel):
         self._check_category_already_added(category)
         self.decrypt_categories.append(category)
 
-    def add_decrypt_domain_list(self, black_list: URLBlockListInfo):
-        self.url_black_list = Reference(ref=black_list.list_id)
+    def add_decrypt_domain_list(self, black_list_id: UUID):
+        self.url_black_list = Reference(ref=black_list_id)
 
-    def add_no_decrypt_domain_list(self, white_list: URLAllowListInfo):
-        self.url_white_list = Reference(ref=white_list.list_id)
+    def add_no_decrypt_domain_list(self, white_list_id: UUID):
+        self.url_white_list = Reference(ref=white_list_id)
 
     def _check_category_already_added(self, category: WebCategory):
         if category in chain(self.decrypt_categories, self.never_decrypt_categories, self.skip_decrypt_categories):

{catalystwan-0.41.2.dev7 → catalystwan-0.41.2.dev9}/catalystwan/models/policy/list/url.py

@@ -14,7 +14,7 @@ class URLListEntry(BaseModel):
 
 
 class URLAllowList(PolicyListBase):
-    type: Literal["urlWhiteList"] = "urlWhiteList"
+    type: Literal["urlWhiteList", "urlwhitelist"] = "urlWhiteList"
     entries: List[URLListEntry] = []
 
 
@@ -27,7 +27,7 @@ class URLAllowListInfo(URLAllowList, PolicyListInfo):
 
 
 class URLBlockList(PolicyListBase):
-    type: Literal["urlBlackList"] = "urlBlackList"
+    type: Literal["urlBlackList", "urlblacklist"] = "urlBlackList"
     entries: List[URLListEntry] = []
 
 

{catalystwan-0.41.2.dev7 → catalystwan-0.41.2.dev9}/catalystwan/models/policy/policy.py

@@ -39,7 +39,7 @@ class NGFirewallAssemblyItem(AssemblyItemBase):
 
 
 class DNSSecurityAssemblyItem(AssemblyItemBase):
-    type: Literal["DNSSecurity"] = "DNSSecurity"
+    type: Literal["DNSSecurity", "dnsSecurity"] = "DNSSecurity"
 
 
 class IntrusionPreventionAssemblyItem(AssemblyItemBase):