catalystwan 0.41.2.dev8__py3-none-any.whl → 0.41.2.dev9__py3-none-any.whl

catalystwan/endpoints/configuration/network_hierarchy.py

@@ -3,30 +3,45 @@
 # mypy: disable-error-code="empty-body"
 from uuid import UUID
 
-from catalystwan.endpoints import APIEndpoints, delete, get, post, versions
+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]:
-        ...
+    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:
-        ...
+    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]]:
-        ...
+    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:
-        ...
+    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/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/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/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/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/models/configuration/feature_profile/sdwan/policy_object/security/url.py

@@ -1,10 +1,12 @@
 # Copyright 2024 Cisco Systems, Inc. and its affiliates
 
-from typing import List, Literal
+from typing import List, Literal, Optional
 
-from pydantic import AliasPath, ConfigDict, Field
+from pydantic import AliasPath, ConfigDict, Field, model_serializer
 
-from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, _ParcelEntry, as_global
+from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, _ParcelEntry
+
+URLListSubtype = Literal["urlallowed", "urlblocked"]
 
 
 class BaseURLListEntry(_ParcelEntry):
@@ -14,19 +16,33 @@ class BaseURLListEntry(_ParcelEntry):
 
 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)
-    type: Literal["urlallowed", "urlblocked"]
     entries: List[BaseURLListEntry] = Field(default_factory=list, validation_alias=AliasPath("data", "entries"))
 
     def add_url(self, pattern: str):
-        self.entries.append(BaseURLListEntry(pattern=as_global(pattern)))
-
-
-class URLAllowParcel(URLParcel):
-    model_config = ConfigDict(populate_by_name=True)
-    type: Literal["urlallowed"] = "urlallowed"
-
-
-class URLBlockParcel(URLParcel):
-    model_config = ConfigDict(populate_by_name=True)
-    type: Literal["urlblocked"] = "urlblocked"
+        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/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/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/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/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/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/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/session.py

@@ -11,7 +11,7 @@ from typing import TYPE_CHECKING, Any, Callable, Dict, List, Optional, Union
 from urllib.parse import urljoin, urlparse, urlunparse
 
 from packaging.version import Version  # type: ignore
-from requests import PreparedRequest, Request, Response, Session, get, head
+from requests import PreparedRequest, Request, Response, Session, Timeout, get, head
 from requests.exceptions import ConnectionError, HTTPError, RequestException
 
 from catalystwan import USER_AGENT
@@ -394,10 +394,13 @@ class ManagerSession(ManagerResponseAdapter, APIEndpointClient):
                     headers={"User-Agent": USER_AGENT},
                 )
                 self.logger.debug(self.response_trace(resp, None))
-                if resp.status_code != 503:
+                if resp.ok:
                     available = True
-            except ConnectionError as error:
+            except (ConnectionError, Timeout) as error:
                 self.logger.debug(self.response_trace(error.response, error.request))
+            except RequestException as exception:
+                self.logger.debug(self.response_trace(exception.response, exception.request))
+                raise ManagerRequestException(*exception.args)
             if not available:
                 sleep(poll_period)
                 continue

catalystwan/tests/models/configuration/feature_profile/sdwan/policy_object/security/test_url.py

@@ -0,0 +1,73 @@
+# Copyright 2026 Cisco Systems, Inc. and its affiliates
+import json
+
+from catalystwan.models.configuration.feature_profile.sdwan.policy_object.security.url import URLParcel
+
+
+def test_url_parcel_round_trip():
+    # Arrange
+    json_data = """
+    {
+        "name": "Forbidden",
+        "description": "Uses new format with type field inside data structure > 20.15.2",
+        "data": {
+            "type": "urlblocked",
+            "entries": [
+                {
+                    "pattern": {
+                        "optionType": "global",
+                        "value": "bbc.com"
+                    }
+                }
+            ]
+        }
+    }
+    """
+    # Act
+    validated_parcel = URLParcel.model_validate_json(json_data)
+    serialized_data = validated_parcel.model_dump_json(by_alias=True, exclude_none=True)
+    serialized_data_dict = json.loads(serialized_data)
+    round_trip_parcel = URLParcel.model_validate_json(serialized_data)
+
+    # Assert
+    assert validated_parcel.subtype == "urlblocked"
+    assert validated_parcel.legacy_subtype is None
+    assert serialized_data_dict.get("data", {}).get("type") == "urlblocked"
+    assert serialized_data_dict.get("type") is None
+    assert round_trip_parcel.subtype == "urlblocked"
+    assert round_trip_parcel.legacy_subtype is None
+    assert validated_parcel == round_trip_parcel
+
+
+def test_url_parcel_round_trip_legacy_type_field():
+    json_data = """
+    {
+        "name": "Forbidden",
+        "description": "Uses legacy format with type field on top level <= 20.15.2",
+        "type": "urlblocked",
+        "data": {
+            "entries": [
+                {
+                    "pattern": {
+                        "optionType": "global",
+                        "value": "bbc.com"
+                    }
+                }
+            ]
+        }
+    }
+    """
+    # Act
+    validated_parcel = URLParcel.model_validate_json(json_data)
+    serialized_data = validated_parcel.model_dump_json(by_alias=True, exclude_none=True)
+    serialized_data_dict = json.loads(serialized_data)
+    round_trip_parcel = URLParcel.model_validate_json(serialized_data)
+
+    # Assert
+    assert validated_parcel.subtype is None
+    assert validated_parcel.legacy_subtype == "urlblocked"
+    assert serialized_data_dict.get("data", {}).get("type") is None
+    assert serialized_data_dict.get("type") == "urlblocked"
+    assert round_trip_parcel.subtype is None
+    assert round_trip_parcel.legacy_subtype == "urlblocked"
+    assert validated_parcel == round_trip_parcel

{catalystwan-0.41.2.dev8.dist-info → catalystwan-0.41.2.dev9.dist-info}/METADATA

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

{catalystwan-0.41.2.dev8.dist-info → catalystwan-0.41.2.dev9.dist-info}/RECORD

@@ -109,7 +109,8 @@ catalystwan/endpoints/configuration/feature_profile/sdwan/system.py,sha256=b8QFq
 catalystwan/endpoints/configuration/feature_profile/sdwan/topology.py,sha256=h1pZ3WXhAnOOFRSj8XfaMb4hC1DZPhfx3tBoXeIzGSc,3676
 catalystwan/endpoints/configuration/feature_profile/sdwan/transport.py,sha256=EFAsy9AvnGrh6I70jesrxbLChQGUfG_cAzlJPnfl780,9711
 catalystwan/endpoints/configuration/feature_profile/sdwan/uc_voice.py,sha256=0yn4peVqLxljGvYGC5G6BpXUseP4lOC4WPxZ1jxJyoo,3398
-catalystwan/endpoints/configuration/network_hierarchy.py,sha256=ZorYXyH4Rs6y0lXtMNlSsVX0k1iucv_wyvaagvX1TJk,1260
+catalystwan/endpoints/configuration/network_hierarchy.py,sha256=WgJA6CvU4m6ptKOe5nsCSBIGh3Sdq_WA2WQHo9kVsZE,2243
+catalystwan/endpoints/configuration/packages.py,sha256=hcKee_1YYWLlwzSQ7fAoHIGvdGAlxDBVIhEnt0R27_o,1309
 catalystwan/endpoints/configuration/policy/abstractions.py,sha256=d9W8YCNclZAHAEwRW3L113dKzPdHvUDYH042tM4bDGI,1417
 catalystwan/endpoints/configuration/policy/definition/access_control_list.py,sha256=XJ6CfF_6QNjTy782yv_0mF-1GFca-KIlTb9ZyVO8RHI,1969
 catalystwan/endpoints/configuration/policy/definition/access_control_list_ipv6.py,sha256=HhRNMZYyRgMhdkHfBGMg3FgfPt9pFgdU_6fNgj_M9PU,2024
@@ -199,7 +200,7 @@ catalystwan/endpoints/configuration_general_template.py,sha256=s5haSNhTFZwts9rcu
 catalystwan/endpoints/configuration_group.py,sha256=gyzDKieiARmLx0dbod8zVkByheuyIB2oCALYh_Mj5lQ,6387
 catalystwan/endpoints/configuration_settings.py,sha256=sQmBHQsDi8bAjLQ9ehNY22sibTnm0YnCL35fXG8uYQ4,28843
 catalystwan/endpoints/configuration_template_master.py,sha256=1TFFp32cGZf6SUXSqa2LgFrMerxkG1xZl6mBDI8fMgk,1494
-catalystwan/endpoints/endpoints_container.py,sha256=2WzprZWaw3ElfrV4X_DQKwISd4HJxXGtTa-z1PxoBsU,19463
+catalystwan/endpoints/endpoints_container.py,sha256=NedpkjeZOg-Uqv2H8rr8wX1zW3kxH50141cmEr7dN8w,19752
 catalystwan/endpoints/misc.py,sha256=1XaP-xVq0SgjlBL2jmDbdeHswRYikELl4BbhCYQabgU,760
 catalystwan/endpoints/monitoring/device_details.py,sha256=9OjJbH7hXGnKkhb8tAI3RFMDcDyrDbAH1i2d4LmJhBc,8272
 catalystwan/endpoints/monitoring/security_policy.py,sha256=oE58nDgcQwn6l2DHigwjzJe8SjqVrn5UcPYwWQDwdVw,400
@@ -246,7 +247,7 @@ catalystwan/models/configuration/common.py,sha256=2X9gj5awWPKtLPFgWfxhkRrMoX22t1
 catalystwan/models/configuration/feature_profile/README.md,sha256=IQMhbnEAbLtotT80aL2emekH-ou8CqR0WSYXhZXilJw,10050
 catalystwan/models/configuration/feature_profile/builder.py,sha256=GDqK7ZxnWHTKWHRw13xvD1aDl60xe6gFsP_B9z5T8a8,663
 catalystwan/models/configuration/feature_profile/common.py,sha256=a5xohaoXzAewtqYYdk2GJy7B-rxxlxYatlP2WZ1eZqY,30423
-catalystwan/models/configuration/feature_profile/parcel.py,sha256=OD7rG4j55M_uAnA_rLGnX_Y0xddcxuEflAOL9-DPXPQ,7582
+catalystwan/models/configuration/feature_profile/parcel.py,sha256=Ai8hoV4gbb8UyiS47Kg08nqx_8QDwjkDVJPpLLhieks,7606
 catalystwan/models/configuration/feature_profile/sdwan/acl/__init__.py,sha256=-AXvVMLyaAYWUnwzTT_mvar37ZpO2vNRy_ZsUIA5dGo,324
 catalystwan/models/configuration/feature_profile/sdwan/acl/ipv4acl.py,sha256=HpiY0DCZWE9EHCbMbyIJ-iRharSRO3IGcSV3kWbMXjY,12167
 catalystwan/models/configuration/feature_profile/sdwan/acl/ipv6acl.py,sha256=MRtDNb2v1TNNf3yijLFlzL3H1KxHOquPmww1V9ZCacI,12969
@@ -267,7 +268,7 @@ catalystwan/models/configuration/feature_profile/sdwan/other/__init__.py,sha256=
 catalystwan/models/configuration/feature_profile/sdwan/other/cybervision.py,sha256=lrnbpHvceKTYZM73FbYtY_1_G_dXjfat7x5g_BAnfSM,2070
 catalystwan/models/configuration/feature_profile/sdwan/other/thousandeyes.py,sha256=aA5PmFl5v_uvGIIAt16tlVf0OxQKuc-FkEEyg2OmD_I,4806
 catalystwan/models/configuration/feature_profile/sdwan/other/ucse.py,sha256=fdaqQQSutvGXClaXsn89IfR2fQS2AJNKZqhCg3pWqPg,4021
-catalystwan/models/configuration/feature_profile/sdwan/policy_object/__init__.py,sha256=RbQgaZxz7dEikwAYVdh4oSA6rZUA0muZIS-bhOUWzBM,6047
+catalystwan/models/configuration/feature_profile/sdwan/policy_object/__init__.py,sha256=P-i2iM9De62DZuy_YxC2RHhwFVlXx60PlLdBs_GTCm4,5957
 catalystwan/models/configuration/feature_profile/sdwan/policy_object/policy/app_probe.py,sha256=sLmhwa63b5OnxXqHrCMLMSQspUDx3LBcmEyCssup9CY,1989
 catalystwan/models/configuration/feature_profile/sdwan/policy_object/policy/application_list.py,sha256=-ctN0OraZt3rG-Wddn8oQ4R4z4rxYcz2YXhiQptQtec,1275
 catalystwan/models/configuration/feature_profile/sdwan/policy_object/policy/as_path.py,sha256=vBB7ZMET0P6im7ydGVvEC5fr_fjRX1h5InTZBPqFxZM,894
@@ -307,7 +308,7 @@ catalystwan/models/configuration/feature_profile/sdwan/policy_object/security/sc
 catalystwan/models/configuration/feature_profile/sdwan/policy_object/security/security_port.py,sha256=t2EMKO9EKAIdiTnsVVSBhaodJIhfjJJdI-_NFhsaQgw,1537
 catalystwan/models/configuration/feature_profile/sdwan/policy_object/security/ssl_decryption.py,sha256=e8d0kMGFJgA5Vq1S1IwtS5cfoJwUQeZSX9N76TdSjIw,6060
 catalystwan/models/configuration/feature_profile/sdwan/policy_object/security/ssl_decryption_profile.py,sha256=cZrB1zD-I_bwVmO4RUy1JqwCoDzi2g54j6h_xUfrxY4,5686
-catalystwan/models/configuration/feature_profile/sdwan/policy_object/security/url.py,sha256=XlfqSuw7fQ0ZMHiP0kd8G-mOQYjazpm5ou6lGAOGKZw,1076
+catalystwan/models/configuration/feature_profile/sdwan/policy_object/security/url.py,sha256=DCE40uXFsomS9FM8HN4KFbocoVk21Uty4DO7SuJPu50,1855
 catalystwan/models/configuration/feature_profile/sdwan/policy_object/security/url_filtering.py,sha256=q3bxXSORhiawD7bkC6FS_MzZ5O1F40PRjff13--jgdE,5006
 catalystwan/models/configuration/feature_profile/sdwan/policy_object/security/zone.py,sha256=AvVybeixunDcAYvAc_SrxgO9hqMLklI3jgAV5Pynp-8,1366
 catalystwan/models/configuration/feature_profile/sdwan/routing/__init__.py,sha256=THVlfBCt30hlpTOZ9XqCEdcO5IF9hhXxf5q7CfoDmBk,667
@@ -320,7 +321,7 @@ catalystwan/models/configuration/feature_profile/sdwan/service/dhcp_server.py,sh
 catalystwan/models/configuration/feature_profile/sdwan/service/dual_router_ha.py,sha256=MMwnBKBth3E91EYCPLtGJqwQYilZPWelGF6KLJmtOPw,1134
 catalystwan/models/configuration/feature_profile/sdwan/service/eigrp.py,sha256=d02hMwUFq5ycoknQci0SAgRlxuiYh0kSKDBxOzn-ves,4075
 catalystwan/models/configuration/feature_profile/sdwan/service/lan/common.py,sha256=-cLq6fmlJS0rXUP07QH-ItMfZrqzj5bJCFl2D1t0iU0,1349
-catalystwan/models/configuration/feature_profile/sdwan/service/lan/ethernet.py,sha256=t4LI4VroBqRDAn54ZSv1BYg_YHCZojNsbRnQEnUvJE8,18738
+catalystwan/models/configuration/feature_profile/sdwan/service/lan/ethernet.py,sha256=icQXfd8dUa1AIjRCHDIfu6laxXKS8crKtQPw3dNfzE4,18718
 catalystwan/models/configuration/feature_profile/sdwan/service/lan/gre.py,sha256=gGyTnQPVmJqj2PF-976XwoItSG3ZiNBtE9vB0zQPbHc,6912
 catalystwan/models/configuration/feature_profile/sdwan/service/lan/ipsec.py,sha256=jFwQK-xLl_l9aahCX326wRIcEobElfdFxeZY0ofXD5w,7043
 catalystwan/models/configuration/feature_profile/sdwan/service/lan/multilink.py,sha256=EKUIQDq40P01irYFWZ1fACFK6R8AusT6s96bH4qHWUg,5403
@@ -349,7 +350,7 @@ catalystwan/models/configuration/feature_profile/sdwan/system/mrf.py,sha256=8GWp
 catalystwan/models/configuration/feature_profile/sdwan/system/ntp.py,sha256=CzCUErRvlYR27r90G2PM8symb-9pCJaU7O3MxfxODTI,4008
 catalystwan/models/configuration/feature_profile/sdwan/system/omp.py,sha256=Fat_1uTQ4MA3vUz5klBBTdxtPouHWGRchP6AJvsvD6M,5603
 catalystwan/models/configuration/feature_profile/sdwan/system/security.py,sha256=tU81HD7lU6DHCXZT_8ssYHqX9awmcUfBG-I671BQNio,6663
-catalystwan/models/configuration/feature_profile/sdwan/system/snmp.py,sha256=mNLdqslMlti637lRA-ImZDbRJ17w-Mn7AiyPocQEAfc,6962
+catalystwan/models/configuration/feature_profile/sdwan/system/snmp.py,sha256=f9ZgOnEdeTPrAHD1QX2RjowJ57BllG7jIsfDFlmG-jU,6972
 catalystwan/models/configuration/feature_profile/sdwan/topology/__init__.py,sha256=lDDba2HdpMV6yBnFFfRMjZ_5pZU1IAdzezl5HPVhct0,782
 catalystwan/models/configuration/feature_profile/sdwan/topology/custom_control.py,sha256=0ssncF2vpEweExSDoUwv1xxiJthoMiIVH_n-Nhor_pY,16414
 catalystwan/models/configuration/feature_profile/sdwan/topology/hubspoke.py,sha256=UeCZacMO_t5UGmKjlMkH33fLtHi1XVDGWMTidQe60yw,2228
@@ -365,7 +366,7 @@ catalystwan/models/configuration/feature_profile/sdwan/transport/management/ethe
 catalystwan/models/configuration/feature_profile/sdwan/transport/t1e1controller.py,sha256=CGYgVu6S0bH699KMutVLNaUwSN2W1r-7FpGirIBt-ig,4456
 catalystwan/models/configuration/feature_profile/sdwan/transport/vpn.py,sha256=rHHtuOC_6YGhuOFJkMd4vH_vNfwwJLQBDCOJYFxMs0s,10966
 catalystwan/models/configuration/feature_profile/sdwan/transport/wan/interface/cellular.py,sha256=UB5LQo9G-b4R7rE-jcJFKcjeGB173UPYK-9beXjcJ5I,8834
-catalystwan/models/configuration/feature_profile/sdwan/transport/wan/interface/ethernet.py,sha256=2jWoQv-A2LuRGsoRhBt6IRbeq3lb2g_y8AW0HYuEgf4,18669
+catalystwan/models/configuration/feature_profile/sdwan/transport/wan/interface/ethernet.py,sha256=XLflic6reXo85kjCqpoXblg0hdSXX7UryxCAp8TfCnU,18649
 catalystwan/models/configuration/feature_profile/sdwan/transport/wan/interface/gre.py,sha256=FwvbIr4I9Vz2CGPYmGgnJRfZQHd8Sy8FQWpVvdEpwsI,2169
 catalystwan/models/configuration/feature_profile/sdwan/transport/wan/interface/ipsec.py,sha256=_PEFBj2gufDmrTY4L4cG1xkStR1Y144-KcauVGq_yeA,7447
 catalystwan/models/configuration/feature_profile/sdwan/transport/wan/interface/multilink.py,sha256=n3CKi19rvGcspk7g6a8hUv_wOeWqYvCuszf9FAbT4m0,11487
@@ -385,9 +386,11 @@ catalystwan/models/configuration/feature_profile/sdwan/uc_voice/translation_rule
 catalystwan/models/configuration/feature_profile/sdwan/uc_voice/trunk_group.py,sha256=ZoL4g00rczi9VRDwhx11sskV7RqUfp8hK3cCsf2LA6M,1425
 catalystwan/models/configuration/feature_profile/sdwan/uc_voice/voice_global.py,sha256=9v3-IBHo0Qzxlguq6k8UbCE1SKJdoeoOO0q65HsoWIQ,2290
 catalystwan/models/configuration/feature_profile/sdwan/uc_voice/voice_tenant.py,sha256=7av6UzCBbztqFNbfhRIbJGDJg87n3QrTzZL9KT7Pems,1365
-catalystwan/models/configuration/network_hierarchy/__init__.py,sha256=jGlyKaRRsfrK0gGKoPXqRPmO-myVgfbZVm3FzVkWSts,425
+catalystwan/models/configuration/network_hierarchy/__init__.py,sha256=mOJHS_J4vCt6A6Zj1SD8iUQmK8f97zF1zBAP4U_iwgo,529
 catalystwan/models/configuration/network_hierarchy/cflowd.py,sha256=3C6UHFpc1isuBvpui9HLoIn63esS2-ucpnLBQS8I-Ak,5530
 catalystwan/models/configuration/network_hierarchy/node.py,sha256=Ex1OMLl00uU3y4fSSD-xl-t1AJYotYhFRr0KQ826pK8,2792
+catalystwan/models/configuration/network_hierarchy/security_logging.py,sha256=gE-bkLnAKAJTsLfxK1A3hSbET1bQCWH8X7ZQ-WFtF8I,3281
+catalystwan/models/configuration/packages.py,sha256=udhaMRv4zatrxUKCdpnXacsCdgjM61M4NAvlTAjjma8,2037
 catalystwan/models/configuration/policy_group.py,sha256=8A_TsNmjSRVx1BAlYUgQQWkpp_SizDL_ZTS8zUTtHgs,2235
 catalystwan/models/configuration/profile_type.py,sha256=qIlobJmEYQ5qEGZeYJZsVMaXtFbR7RgFr6eH8YyoNAo,157
 catalystwan/models/configuration/topology_group.py,sha256=zN2O9oEc_h1iwI9p8t6MNx5Oa-pA_Z2GreqMoHh9t6E,1804
@@ -479,11 +482,12 @@ catalystwan/models/tenant.py,sha256=UCACzI8n12UT-zpPvPqEQKfbkX9SsDMkET3Lm1kTP0Q,
 catalystwan/models/url_monitoring.py,sha256=y8xl0BefAFy5oJCGduiaCRowXRtadm8-ABiQVwQ7p34,924
 catalystwan/request_limiter.py,sha256=-SQCiA7CIjVHLXThxq034ufFigHEKA3xGPH9akBRK-w,577
 catalystwan/response.py,sha256=GRg2ivRb88TXLsXCRZRW1Ix6uyTF9iEyXmLEEYUzeMM,10561
-catalystwan/session.py,sha256=uSMOeDitZ8lyuFV9iFpDE5YdQKfXvQp27q6GcyilCJQ,22844
+catalystwan/session.py,sha256=mF4NyNnQG5opLNXtl_LxYS5XqBFpi-L3MvgU6A_P1Po,23055
 catalystwan/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 catalystwan/tests/builders/test_report.py,sha256=BAppdGUpkH_SQrYmnB5NYutK-beRsz7aoiDPk5o74zw,2227
 catalystwan/tests/builders/uc_voice.py,sha256=9oU5mxRK2quLXeutxVEhdMSbnj-UEY7gugYNupUYX_8,3265
 catalystwan/tests/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+catalystwan/tests/models/configuration/feature_profile/sdwan/policy_object/security/test_url.py,sha256=xpfNl5RSWQMRW4PPX51IbcqVUbsumXth4F0c41cd_YQ,2528
 catalystwan/tests/models/test_digital_interface.py,sha256=tYz6xAjy-IqVhYjY5_C_dGLZnFwlm0s9WJEUjhzl8uw,2302
 catalystwan/tests/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 catalystwan/tests/templates/definitions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -631,7 +635,7 @@ catalystwan/version.py,sha256=X5yIMPIrWPbdoF9eJfwxfjcvWr7JMfWQF98hQhlGB5I,3032
 catalystwan/vmanage_auth.py,sha256=UZ57lTihsLsXw4AdU7Vn8XuY1jo3732Vc9WuFoHSiiQ,10780
 catalystwan/workflows/backup_restore_device_templates.py,sha256=BoR2KlRbpCI6RxIWG7j7tucaLpw5w3ESN20dLhsrZFY,19796
 catalystwan/workflows/tenant_migration.py,sha256=4KLbqUwH4gEegE92PCGfRd226eZd_crCUpaYUWoGXDI,9790
-catalystwan-0.41.2.dev8.dist-info/LICENSE,sha256=97ROi91Vxrj_Jio2v8FI9E8-y6x2uYdQRaFlrEbVjkc,11375
-catalystwan-0.41.2.dev8.dist-info/METADATA,sha256=E80Sr2BaABziMkStuVLgJ3yWOf5DNI0qgYgGIKzr9N4,21275
-catalystwan-0.41.2.dev8.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-catalystwan-0.41.2.dev8.dist-info/RECORD,,
+catalystwan-0.41.2.dev9.dist-info/LICENSE,sha256=97ROi91Vxrj_Jio2v8FI9E8-y6x2uYdQRaFlrEbVjkc,11375
+catalystwan-0.41.2.dev9.dist-info/METADATA,sha256=OwxflrQMhQNMqE-1wyD756PVtpLJH5bFTEjYa_M0WFY,21275
+catalystwan-0.41.2.dev9.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+catalystwan-0.41.2.dev9.dist-info/RECORD,,