catalystwan 0.33.4.dev0__tar.gz → 0.33.4.dev2__tar.gz

{catalystwan-0.33.4.dev0 → catalystwan-0.33.4.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: catalystwan
-Version: 0.33.4.dev0
+Version: 0.33.4.dev2
 Summary: Cisco Catalyst WAN SDK for Python
 Home-page: https://github.com/cisco-open/cisco-catalyst-wan-sdk
 Author: kagorski

{catalystwan-0.33.4.dev0 → catalystwan-0.33.4.dev2}/catalystwan/api/config_group_api.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Optional, Union
+from typing import TYPE_CHECKING, Any, Optional, overload
 from uuid import UUID
 
 from catalystwan.typed_list import DataSequence
@@ -32,8 +32,8 @@ from catalystwan.endpoints.configuration_group import (
 
 class ConfigGroupAPI:
     def __init__(self, session: ManagerSession):
-        self.session = session
-        self.endpoint = ConfigurationGroup(session)
+        self._session = session
+        self._endpoints = ConfigurationGroup(session)
 
     def associate(self, cg_id: str, device_ids: list) -> None:
         """
@@ -46,7 +46,7 @@ class ConfigGroupAPI:
 
         payload = ConfigGroupAssociatePayload(devices=devices)
 
-        self.endpoint.associate(config_group_id=cg_id, payload=payload)
+        self._endpoints.associate(config_group_id=cg_id, payload=payload)
 
     def create(self, name: str, description: str, solution: Solution, profile_ids: list) -> ConfigGroupCreationResponse:
         """
@@ -60,7 +60,7 @@ class ConfigGroupAPI:
             name=name, description=description, solution=solution, profiles=profiles
         )
 
-        return self.endpoint.create_config_group(cg_payload)
+        return self._endpoints.create_config_group(cg_payload)
 
     def create_variables(
         self, cg_id: str, device_ids: list, suggestions: bool = True
@@ -69,13 +69,13 @@ class ConfigGroupAPI:
         Creates device specific variable data in given config-group
         """
         payload = ConfigGroupVariablesCreatePayload(deviceIds=device_ids, suggestions=suggestions)
-        return self.endpoint.create_variables(config_group_id=cg_id, payload=payload)
+        return self._endpoints.create_variables(config_group_id=cg_id, payload=payload)
 
     def delete(self, cg_id: str) -> None:
         """
         Deletes existing config-group with given ID
         """
-        self.endpoint.delete_config_group(cg_id)
+        self._endpoints.delete_config_group(cg_id)
 
     def deploy(self, cg_id: str, device_ids: list) -> ConfigGroupDeployResponse:
         """
@@ -86,7 +86,7 @@ class ConfigGroupAPI:
             devices.append(DeviceId(id=device_id))
 
         payload = ConfigGroupDeployPayload(devices=devices)
-        return self.endpoint.deploy(config_group_id=cg_id, payload=payload)
+        return self._endpoints.deploy(config_group_id=cg_id, payload=payload)
 
     def disassociate(self, cg_id: str, device_ids: list) -> ConfigGroupDisassociateResponse:
         """
@@ -97,7 +97,7 @@ class ConfigGroupAPI:
             devices.append(DeviceId(id=device_id))
 
         payload = ConfigGroupAssociatePayload(devices=devices)
-        return self.endpoint.disassociate(config_group_id=cg_id, payload=payload)
+        return self._endpoints.disassociate(config_group_id=cg_id, payload=payload)
 
     def edit(
         self, cg_id: str, name: str, description: str, solution: Solution, profile_ids: list
@@ -111,16 +111,24 @@ class ConfigGroupAPI:
             profiles.append(ProfileId(id=profile_id))
         payload = ConfigGroupEditPayload(name=name, description=description, solution=solution, profiles=profiles)
 
-        return self.endpoint.edit_config_group(config_group_id=cg_id, payload=payload)
+        return self._endpoints.edit_config_group(config_group_id=cg_id, payload=payload)
 
-    def get(self, group_id: Optional[UUID] = None) -> Union[DataSequence[ConfigGroup], ConfigGroup, None]:
+    @overload
+    def get(self) -> DataSequence[ConfigGroup]:
+        ...
+
+    @overload
+    def get(self, group_id: UUID) -> ConfigGroup:
+        ...
+
+    def get(self, group_id: Optional[UUID] = None) -> Any:
         """
         Gets list of existing config-groups or single config-group with given ID
-         If given ID is not correct return None
+        If given ID is not correct return None
         """
         if group_id is None:
-            return self.endpoint.get()
-        return self.endpoint.get().filter(id=group_id).single_or_default()
+            return self._endpoints.get()
+        return self._endpoints.get().filter(id=group_id).single_or_default()
 
     def update_variables(self, cg_id: str, solution: Solution, device_variables: list) -> None:
         """
@@ -128,4 +136,4 @@ class ConfigGroupAPI:
         """
         payload = ConfigGroupVariablesEditPayload(solution=solution, devices=device_variables)
 
-        self.endpoint.update_variables(config_group_id=cg_id, payload=payload)
+        self._endpoints.update_variables(config_group_id=cg_id, payload=payload)

{catalystwan-0.33.4.dev0 → catalystwan-0.33.4.dev2}/catalystwan/api/policy_api.py

@@ -164,7 +164,7 @@ from catalystwan.models.policy.policy_definition import (
 from catalystwan.models.policy.policy_list import PolicyListBase
 from catalystwan.models.policy.security import (
     AnySecurityPolicy,
-    AnySecurityPolicyInfo,
+    AnySecurityPolicyInfoList,
     SecurityPolicy,
     SecurityPolicyEditResponse,
     UnifiedSecurityPolicy,
@@ -328,7 +328,7 @@ class SecurityPolicyAPI:
         self._endpoints.delete_security_template(id)
 
     @overload
-    def get(self) -> List[AnySecurityPolicyInfo]:
+    def get(self) -> AnySecurityPolicyInfoList:
         ...
 
     @overload
@@ -338,7 +338,7 @@ class SecurityPolicyAPI:
     def get(self, id: Optional[UUID] = None) -> Any:
         if id is not None:
             return self._endpoints.get_security_template(id).root
-        return [info.root for info in self._endpoints.generate_security_template_list()]
+        return self._endpoints.generate_security_template_list()
 
 
 class PolicyListsAPI:

{catalystwan-0.33.4.dev0 → catalystwan-0.33.4.dev2}/catalystwan/endpoints/configuration/policy/security_template.py

@@ -6,11 +6,10 @@ from uuid import UUID
 from catalystwan.endpoints import JSON, APIEndpoints, delete, get, post, put
 from catalystwan.models.policy.security import (
     AnySecurityPolicy,
+    AnySecurityPolicyInfoList,
     SecurityPolicyEditResponse,
-    SecurityPolicyInfoRoot,
     SecurityPolicyRoot,
 )
-from catalystwan.typed_list import DataSequence
 
 
 class ConfigurationSecurityTemplatePolicy(APIEndpoints):
@@ -36,7 +35,7 @@ class ConfigurationSecurityTemplatePolicy(APIEndpoints):
         ...
 
     @get("/template/policy/security", "data")
-    def generate_security_template_list(self) -> DataSequence[SecurityPolicyInfoRoot]:
+    def generate_security_template_list(self) -> AnySecurityPolicyInfoList:
         ...
 
     def get_device_list_by_id(self):

{catalystwan-0.33.4.dev0 → catalystwan-0.33.4.dev2}/catalystwan/endpoints/configuration_group.py

@@ -2,7 +2,7 @@
 
 # mypy: disable-error-code="empty-body"
 from datetime import datetime
-from typing import List, Optional
+from typing import Any, List, Optional
 from uuid import UUID
 
 from pydantic import BaseModel, ConfigDict, Field
@@ -58,7 +58,7 @@ class ConfigGroup(BaseModel):
         serialization_alias="numberOfDevicesUpToDate", validation_alias="numberOfDevicesUpToDate"
     )
     origin: Optional[str] = None
-    topology: Optional[str] = None
+    topology: Any = None
     full_config_cli: Optional[bool] = Field(
         default=None, serialization_alias="fullConfigCli", validation_alias="fullConfigCli"
     )

{catalystwan-0.33.4.dev0 → catalystwan-0.33.4.dev2}/catalystwan/models/configuration/feature_profile/common.py

@@ -221,3 +221,11 @@ class WANIPv6StaticRoute(BaseModel):
 
 class WANService(BaseModel):
     service_type: Global[Literal["TE"]] = Field(alias="serviceType")
+
+
+class RefIdItem(BaseModel):
+    model_config = ConfigDict(
+        extra="forbid",
+        populate_by_name=True,
+    )
+    ref_id: Global[str] = Field(..., serialization_alias="refId", validation_alias="refId")

{catalystwan-0.33.4.dev0 → catalystwan-0.33.4.dev2}/catalystwan/models/configuration/feature_profile/parcel.py

@@ -22,6 +22,7 @@ ParcelType = Literal[
     "security",
     "snmp",
     "appqoe",
+    "as-path",
     "lan/vpn",
     "lan/vpn/interface/ethernet",
     "lan/vpn/interface/gre",
@@ -46,6 +47,7 @@ ParcelType = Literal[
     "class",
     "data-ipv6-prefix",
     "ipv6-prefix",
+    "mirror",
     "prefix",
     "policer",
     "preferred-color-group",
@@ -62,7 +64,12 @@ ParcelType = Literal[
     "security-geolocation",
     "security-zone",
     "security-localapp",
-    "security-data-ip-prefix",
+    "unified/advanced-inspection-profile",
+    "unified/advanced-malware-protection",
+    "unified/intrusion-prevention",
+    "unified/ssl-decryption",
+    "unified/ssl-decryption-profile",
+    "unified/url-filtering",
 ]
 
 

{catalystwan-0.33.4.dev0 → catalystwan-0.33.4.dev2}/catalystwan/models/configuration/feature_profile/sdwan/policy_object/__init__.py

@@ -14,12 +14,14 @@ from .policy.expanded_community_list import ExpandedCommunityParcel
 from .policy.fowarding_class import FowardingClassParcel, FowardingClassQueueEntry
 from .policy.ipv6_data_prefix import IPv6DataPrefixEntry, IPv6DataPrefixParcel
 from .policy.ipv6_prefix_list import IPv6PrefixListEntry, IPv6PrefixListParcel
+from .policy.mirror import MirrorParcel
 from .policy.policer import PolicerEntry, PolicerParcel
 from .policy.prefered_group_color import Preference, PreferredColorGroupEntry, PreferredColorGroupParcel
 from .policy.prefix_list import PrefixListEntry, PrefixListParcel
 from .policy.sla_class import FallbackBestTunnel, SLAAppProbeClass, SLAClassCriteria, SLAClassListEntry, SLAClassParcel
 from .policy.standard_community import StandardCommunityEntry, StandardCommunityParcel
 from .policy.tloc_list import TlocEntry, TlocParcel
+from .security.aip import AdvancedInspectionProfileParcel
 from .security.amp import AdvancedMalwareProtectionParcel
 from .security.application_list import (
     SecurityApplicationFamilyListEntry,
@@ -34,11 +36,14 @@ from .security.ips_signature import IPSSignatureListEntry, IPSSignatureParcel
 from .security.local_domain import LocalDomainListEntry, LocalDomainParcel
 from .security.protocol_list import ProtocolListEntry, ProtocolListParcel
 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.zone import SecurityZoneListEntry, SecurityZoneListParcel
 
 AnyPolicyObjectParcel = Annotated[
     Union[
+        AdvancedInspectionProfileParcel,
         AdvancedMalwareProtectionParcel,
         URLParcel,
         ApplicationListParcel,
@@ -55,6 +60,7 @@ AnyPolicyObjectParcel = Annotated[
         IPv6DataPrefixParcel,
         IPv6PrefixListParcel,
         LocalDomainParcel,
+        MirrorParcel,
         PolicerParcel,
         PreferredColorGroupParcel,
         PrefixListParcel,
@@ -64,6 +70,8 @@ AnyPolicyObjectParcel = Annotated[
         SecurityPortParcel,
         SecurityZoneListParcel,
         SLAClassParcel,
+        SslDecryptionParcel,
+        SslDecryptionProfileParcel,
         StandardCommunityParcel,
         TlocParcel,
     ],
@@ -71,6 +79,7 @@ AnyPolicyObjectParcel = Annotated[
 ]
 
 __all__ = (
+    "AdvancedInspectionProfileParcel",
     "AdvancedMalwareProtectionParcel",
     "AnyPolicyObjectParcel",
     "ApplicationFamilyListEntry",
@@ -102,6 +111,7 @@ __all__ = (
     "IPv6PrefixListParcel",
     "LocalDomainListEntry",
     "LocalDomainParcel",
+    "MirrorParcel",
     "PolicerEntry",
     "PolicerParcel",
     "Preference",
@@ -124,6 +134,8 @@ __all__ = (
     "SLAClassCriteria",
     "SLAClassListEntry",
     "SLAClassParcel",
+    "SslDecryptionParcel",
+    "SslDecryptionProfileParcel",
     "StandardCommunityEntry",
     "StandardCommunityParcel",
     "TlocEntry",

{catalystwan-0.33.4.dev0 → catalystwan-0.33.4.dev2}/catalystwan/models/configuration/feature_profile/sdwan/policy_object/policy/as_path.py

@@ -15,7 +15,7 @@ class AsPathEntry(BaseModel):
 class AsPathParcel(_ParcelBase):
     type_: Literal["as-path"] = Field(default="as-path", exclude=True)
     as_path_list_num: Global[int] = Field(validation_alias=AliasPath("data", "asPathListNum"))
-    entries: List[AsPathEntry] = Field(validation_alias=AliasPath("data", "entries"))
+    entries: List[AsPathEntry] = Field(default=[], validation_alias=AliasPath("data", "entries"))
 
     def add_as_path(self, as_path: str):
         self.entries.append(AsPathEntry(as_path=as_global(as_path)))

catalystwan-0.33.4.dev2/catalystwan/models/configuration/feature_profile/sdwan/policy_object/policy/mirror.py

@@ -0,0 +1,18 @@
+# Copyright 2024 Cisco Systems, Inc. and its affiliates
+
+from typing import List, Literal
+
+from pydantic import AliasPath, BaseModel, ConfigDict, Field
+
+from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase
+
+
+class MirrorEntry(BaseModel):
+    model_config = ConfigDict(populate_by_name=True)
+    remote_dest_ip: Global[str] = Field(validation_alias="remoteDestIp", serialization_alias="remoteDestIp")
+    source_ip: Global[str] = Field(validation_alias="sourceIp", serialization_alias="sourceIp")
+
+
+class MirrorParcel(_ParcelBase):
+    type_: Literal["mirror"] = Field(default="mirror", exclude=True)
+    entries: List[MirrorEntry] = Field(validation_alias=AliasPath("data", "entries"), min_length=1, max_length=1)

catalystwan-0.33.4.dev2/catalystwan/models/configuration/feature_profile/sdwan/policy_object/security/aip.py

@@ -0,0 +1,32 @@
+# Copyright 2024 Cisco Systems, Inc. and its affiliates
+
+from typing import Literal
+
+from pydantic import AliasPath, Field
+
+from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase
+from catalystwan.models.configuration.feature_profile.sdwan.transport.bgp import RefIdItem
+
+TlsDecryptionAction = Literal["decrypt", "neverDecrypt", "skipDecrypt"]
+
+
+class AdvancedInspectionProfileParcel(_ParcelBase):
+    type_: Literal["unified/advanced-inspection-profile"] = Field(
+        default="unified/advanced-inspection-profile", exclude=True
+    )
+    parcel_description: str = Field(
+        default="",
+        serialization_alias="description",
+        validation_alias="description",
+        description="Set the parcel description",
+    )
+    tls_decryption_action: Global[TlsDecryptionAction] = Field(
+        default=Global[TlsDecryptionAction](value="skipDecrypt"),
+        validation_alias=AliasPath("data", "tlsDecryptionAction"),
+    )
+    intrusion_prevention: RefIdItem = Field(default=None, validation_alias=AliasPath("data", "intrusionPrevention"))
+    url_filtering: RefIdItem = Field(default=None, validation_alias=AliasPath("data", "urlFiltering"))
+    advanced_malware_protection: RefIdItem = Field(
+        default=None, validation_alias=AliasPath("data", "advancedMalwareProtection")
+    )
+    ssl_decryption_profile: RefIdItem = Field(default=None, validation_alias=AliasPath("data", "sslDecryptionProfile"))

{catalystwan-0.33.4.dev0 → catalystwan-0.33.4.dev2}/catalystwan/models/configuration/feature_profile/sdwan/policy_object/security/intrusion_prevention.py

@@ -5,7 +5,7 @@ from typing import Literal
 from pydantic import AliasPath, Field
 
 from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase
-from catalystwan.models.configuration.feature_profile.sdwan.transport.bgp import RefIdItem
+from catalystwan.models.configuration.feature_profile.common import RefIdItem
 
 SignatureSet = Literal["balanced", "connectivity", "security"]
 InspectionMode = Literal["detection", "protection"]

catalystwan-0.33.4.dev2/catalystwan/models/configuration/feature_profile/sdwan/policy_object/security/ssl_decryption.py

@@ -0,0 +1,69 @@
+# Copyright 2024 Cisco Systems, Inc. and its affiliates
+
+from typing import Literal
+
+from pydantic import AliasPath, BaseModel, ConfigDict, Field
+
+from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase
+
+Action = Literal["decrypt", "drop"]
+CertificateRevocationStatus = Literal["oscp", "none"]
+FailureMode = Literal["close", "open"]
+KeyModulus = Literal["1024", "2048", "4096"]
+EckeyType = Literal["P256", "P384", "P521"]
+TlsVersion = Literal["TLSv1", "TLSv1.1", "TLSv1.2"]
+CaTpLabel = Literal["PROXY-SIGNING-CA"]
+
+
+class CaCertBundle(BaseModel):
+    model_config = ConfigDict(populate_by_name=True, extra="forbid")
+    default: Global[bool] = Field(default=Global[bool](value=True), validation_alias="default")
+    file_name: Global[str] = Field(default=None, validation_alias="fileName")
+    bundle_string: Global[str] = Field(default=None, validation_alias="bundle_string")
+
+
+class SslDecryptionParcel(_ParcelBase):
+    type_: Literal["unified/ssl-decryption"] = Field(default="unified/ssl-decryption", exclude=True)
+    parcel_description: str = Field(
+        default="",
+        serialization_alias="description",
+        validation_alias="description",
+        description="Set the parcel description",
+    )
+    ssl_enable: Global[bool] = Field(default=Global[bool](value=True), validation_alias=AliasPath("data", "sslEnable"))
+    expired_certificate: Global[Action] = Field(
+        default=Global[Action](value="drop"), validation_alias=AliasPath("data", "expiredCertificate")
+    )
+    untrusted_certificate: Global[Action] = Field(
+        default=Global[Action](value="drop"), validation_alias=AliasPath("data", "untrustedCertificate")
+    )
+    certificate_revocation_status: Global[CertificateRevocationStatus] = Field(
+        default=Global[CertificateRevocationStatus](value="none"),
+        validation_alias=AliasPath("data", "certificateRevocationStatus"),
+    )
+    unknown_status: Global[Action] = Field(default=None, validation_alias=AliasPath("data", "unknownStatus"))
+    unsupported_protocol_versions: Global[Action] = Field(
+        default=Global[Action](value="drop"), validation_alias=AliasPath("data", "unsupportedProtocolVersions")
+    )
+    unsupported_cipher_suites: Global[Action] = Field(
+        default=Global[Action](value="drop"), validation_alias=AliasPath("data", "unsupportedCipherSuites")
+    )
+    failure_mode: Global[FailureMode] = Field(
+        default=Global[FailureMode](value="close"), validation_alias=AliasPath("data", "failureMode")
+    )
+    ca_cert_bundle: CaCertBundle = Field(default=CaCertBundle(), validation_alias=AliasPath("data", "caCertBundle"))
+    key_modulus: Global[KeyModulus] = Field(
+        default=Global[KeyModulus](value="1024"), validation_alias=AliasPath("data", "keyModulus")
+    )
+    eckey_type: Global[EckeyType] = Field(
+        default=Global[EckeyType](value="P256"), validation_alias=AliasPath("data", "eckeyType")
+    )
+    certificate_lifetime: Global[str] = Field(
+        default=Global[str](value="1"), validation_alias=AliasPath("data", "certificateLifetime")
+    )
+    min_tls_ver: Global[TlsVersion] = Field(
+        default=Global[TlsVersion](value="TLSv1"), validation_alias=AliasPath("data", "minTlsVer")
+    )
+    ca_tp_label: Global[CaTpLabel] = Field(
+        default=Global[CaTpLabel](value="PROXY-SIGNING-CA"), validation_alias=AliasPath("data", "caTpLabel")
+    )

catalystwan-0.33.4.dev2/catalystwan/models/configuration/feature_profile/sdwan/policy_object/security/ssl_decryption_profile.py

@@ -0,0 +1,129 @@
+# Copyright 2024 Cisco Systems, Inc. and its affiliates
+
+from typing import List, Literal
+
+from pydantic import AliasPath, Field
+
+from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase
+from catalystwan.models.configuration.feature_profile.common import RefIdItem
+
+Categories = Literal[
+    "abortion",
+    "abused-drugs",
+    "adult-and-pornography",
+    "alcohol-and-tobacco",
+    "auctions",
+    "bot-nets",
+    "business-and-economy",
+    "cdns",
+    "cheating",
+    "computer-and-internet-info",
+    "computer-and-internet-security",
+    "confirmed-spam-sources",
+    "cult-and-occult",
+    "dating",
+    "dead-sites",
+    "dynamic-content",
+    "educational-institutions",
+    "entertainment-and-arts",
+    "fashion-and-beauty",
+    "financial-services",
+    "gambling",
+    "games",
+    "government",
+    "gross",
+    "hacking",
+    "hate-and-racism",
+    "health-and-medicine",
+    "home",
+    "hunting-and-fishing",
+    "illegal",
+    "image-and-video-search",
+    "individual-stock-advice-and-tools",
+    "internet-communications",
+    "internet-portals",
+    "job-search",
+    "keyloggers-and-monitoring",
+    "kids",
+    "legal",
+    "local-information",
+    "malware-sites",
+    "marijuana",
+    "military",
+    "motor-vehicles",
+    "music",
+    "news-and-media",
+    "nudity",
+    "online-greeting-cards",
+    "online-personal-storage",
+    "open-http-proxies",
+    "p2p",
+    "parked-sites",
+    "pay-to-surf",
+    "personal-sites-and-blogs",
+    "philosophy-and-political-advocacy",
+    "phishing-and-other-frauds",
+    "private-ip-addresses",
+    "proxy-avoid-and-anonymizers",
+    "questionable",
+    "real-estate",
+    "recreation-and-hobbies",
+    "reference-and-research",
+    "religion",
+    "search-engines",
+    "sex-education",
+    "shareware-and-freeware",
+    "shopping",
+    "social-network",
+    "society",
+    "spam-urls",
+    "sports",
+    "spyware-and-adware",
+    "streaming-media",
+    "swimsuits-and-intimate-apparel",
+    "training-and-tools",
+    "translation",
+    "travel",
+    "uncategorized",
+    "unconfirmed-spam-sources",
+    "violence",
+    "weapons",
+    "web-advertisements",
+    "web-based-email",
+    "web-hosting",
+]
+
+DecryptThreshold = Literal["high-risk", "low-risk", "moderate-risk", "suspicious", "trustworthy"]
+
+
+class SslDecryptionProfileParcel(_ParcelBase):
+    type_: Literal["unified/ssl-decryption-profile"] = Field(default="unified/ssl-decryption-profile", exclude=True)
+    parcel_description: str = Field(
+        default="",
+        serialization_alias="description",
+        validation_alias="description",
+        description="Set the parcel description",
+    )
+    decrypt_categories: Global[List[Categories]] = Field(
+        default=Global[List[Categories]](value=[]), validation_alias=AliasPath("data", "decryptCategories")
+    )
+    never_decrypt_categories: Global[List[Categories]] = Field(
+        default=Global[List[Categories]](value=[]), validation_alias=AliasPath("data", "neverDecryptCategories")
+    )
+    skip_decrypt_categories: Global[List[Categories]] = Field(
+        default=None, validation_alias=AliasPath("data", "skipDecryptCategories")
+    )
+    reputation: Global[bool] = Field(
+        default=Global[bool](value=False), validation_alias=AliasPath("data", "reputation")
+    )
+    decrypt_threshold: Global[DecryptThreshold] = Field(
+        default=None, validation_alias=AliasPath("data", "decryptThreshold")
+    )
+    skip_decrypt_threshold: Global[DecryptThreshold] = Field(
+        default=None, validation_alias=AliasPath("data", "skipDecryptThreshold")
+    )
+    fail_decrypt: Global[bool] = Field(
+        default=Global[bool](value=False), validation_alias=AliasPath("data", "failDecrypt")
+    )
+    url_allowed_list: RefIdItem = Field(default=None, validation_alias=AliasPath("data", "urlAllowedList"))
+    url_blocked_list: RefIdItem = Field(default=None, validation_alias=AliasPath("data", "urlBlockedList"))

{catalystwan-0.33.4.dev0 → catalystwan-0.33.4.dev2}/catalystwan/models/configuration/feature_profile/sdwan/policy_object/security/url_filtering.py

@@ -5,7 +5,7 @@ from typing import List, Literal
 from pydantic import AliasPath, Field
 
 from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase
-from catalystwan.models.configuration.feature_profile.sdwan.transport.bgp import RefIdItem
+from catalystwan.models.configuration.feature_profile.common import RefIdItem
 
 WebCategories = Literal[
     "abortion",

{catalystwan-0.33.4.dev0 → catalystwan-0.33.4.dev2}/catalystwan/models/configuration/feature_profile/sdwan/transport/bgp.py

@@ -8,6 +8,7 @@ from typing import List, Literal, Optional, Union
 from pydantic import BaseModel, ConfigDict, Field
 
 from catalystwan.api.configuration_groups.parcel import Default, Global, Variable, _ParcelBase, as_variable
+from catalystwan.models.configuration.feature_profile.common import RefIdItem
 
 FamilyType = Literal["ipv4-unicast", "vpnv4-unicast", "vpnv6-unicast"]
 FamilyTypeIpv6 = Literal["ipv6-unicast", "vpnv6-unicast"]
@@ -52,14 +53,6 @@ Protocol = Literal["static", "connected", "ospf", "ospfv3", "nat"]
 Protocol2 = Literal["static", "connected", "ospf"]
 
 
-class RefIdItem(BaseModel):
-    model_config = ConfigDict(
-        extra="forbid",
-        populate_by_name=True,
-    )
-    ref_id: Global[str] = Field(..., serialization_alias="refId", validation_alias="refId")
-
-
 class MaxPrefixConfigDisabled(BaseModel):
     """
     Set maximum number of prefixes accepted from BGP peer and threshold exceeded policy actions(restart or warning)

{catalystwan-0.33.4.dev0 → catalystwan-0.33.4.dev2}/catalystwan/models/policy/definition/amp.py

@@ -57,7 +57,7 @@ class AdvancedMalwareProtectionDefinition(BaseModel):
 
 class AdvancedMalwareProtectionPolicy(PolicyDefinitionBase):
     type: Literal["advancedMalwareProtection"] = "advancedMalwareProtection"
-    mode: AMPPolicyType
+    mode: AMPPolicyType = "security"
     definition: AdvancedMalwareProtectionDefinition
 
 

{catalystwan-0.33.4.dev0 → catalystwan-0.33.4.dev2}/catalystwan/models/policy/definition/zone_based_firewall.py

@@ -21,6 +21,7 @@ from catalystwan.models.policy.policy_definition import (
     DestinationIPEntry,
     DestinationPortEntry,
     DestinationPortListEntry,
+    DestinationScalableGroupTagListEntry,
     LogAction,
     Match,
     PolicyActionType,
@@ -40,6 +41,7 @@ from catalystwan.models.policy.policy_definition import (
     SourceIPEntry,
     SourcePortEntry,
     SourcePortListEntry,
+    SourceScalableGroupTagListEntry,
 )
 
 ZoneBasedFWPolicySequenceEntry = Annotated[
@@ -53,6 +55,7 @@ ZoneBasedFWPolicySequenceEntry = Annotated[
         DestinationIPEntry,
         DestinationPortEntry,
         DestinationPortListEntry,
+        DestinationScalableGroupTagListEntry,
         ProtocolEntry,
         ProtocolNameEntry,
         ProtocolNameListEntry,
@@ -65,6 +68,7 @@ ZoneBasedFWPolicySequenceEntry = Annotated[
         SourceIPEntry,
         SourcePortEntry,
         SourcePortListEntry,
+        SourceScalableGroupTagListEntry,
     ],
     Field(discriminator="field"),
 ]

{catalystwan-0.33.4.dev0 → catalystwan-0.33.4.dev2}/catalystwan/models/policy/policy.py

@@ -6,14 +6,16 @@ from uuid import UUID
 
 from pydantic import BaseModel, ConfigDict, Field
 
+ZoneListId = Union[UUID, Literal["self", "default"]]
+
 
 class PolicyId(BaseModel):
     policy_id: UUID = Field(serialization_alias="policyId", validation_alias="policyId")
 
 
 class NGFirewallZoneListEntry(BaseModel):
-    src_zone_list_id: UUID = Field(serialization_alias="srcZoneListId", validation_alias="srcZoneListId")
-    dst_zone_list_id: UUID = Field(serialization_alias="dstZoneListId", validation_alias="dstZoneListId")
+    src_zone_list_id: ZoneListId = Field(serialization_alias="srcZoneListId", validation_alias="srcZoneListId")
+    dst_zone_list_id: ZoneListId = Field(serialization_alias="dstZoneListId", validation_alias="dstZoneListId")
     model_config = ConfigDict(populate_by_name=True)