catalystwan 0.41.2.dev7__tar.gz → 0.41.2.dev8__tar.gz

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

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

{catalystwan-0.41.2.dev7 → catalystwan-0.41.2.dev8}/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.dev7 → catalystwan-0.41.2.dev8}/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.dev8}/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.dev7 → catalystwan-0.41.2.dev8}/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.dev8}/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.dev8}/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):

{catalystwan-0.41.2.dev7 → catalystwan-0.41.2.dev8}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "catalystwan"
-version = "0.41.2dev7"
+version = "0.41.2dev8"
 description = "Cisco Catalyst WAN SDK for Python"
 authors = ["kagorski <kagorski@cisco.com>"]
 readme = "README.md"