catalystwan 0.41.2.dev2__py3-none-any.whl → 0.41.2.dev4__py3-none-any.whl

catalystwan/models/configuration/feature_profile/sdwan/service/appqoe.py

@@ -5,7 +5,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_global
+from catalystwan.api.configuration_groups.parcel import Default, Global, Variable, _ParcelBase, as_global
 
 VirtualApplicationType = Literal["dreopt"]
 
@@ -254,7 +254,7 @@ class AppqoeParcel(_ParcelBase):
     model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True, extra="forbid")
 
     dreopt: Optional[Union[Global[bool], Default[bool]]] = Field(
-        default=as_default(False), validation_alias=AliasPath("data", "dreopt")
+        default=None, validation_alias=AliasPath("data", "dreopt")
     )
     virtual_application: Optional[List[VirtualApplication]] = Field(
         default=None, validation_alias=AliasPath("data", "virtualApplication")

catalystwan/models/configuration/network_hierarchy/cflowd.py

@@ -3,7 +3,7 @@ from typing import List, Literal, Optional
 
 from pydantic import AliasPath, BaseModel, ConfigDict, Field
 
-from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, as_global, as_optional_global
+from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, as_optional_global
 
 Protocol = Literal[
     "both",
@@ -73,7 +73,9 @@ class CflowdParcel(_ParcelBase):
     flow_sampling_interval: Optional[Global[int]] = Field(
         default=Global[int](value=1), validation_alias=AliasPath("data", "flowSamplingInterval")
     )
-    protocol: Optional[Global[Protocol]] = Field(default=None, validation_alias=AliasPath("data", "protocol"))
+    protocol: Optional[Global[Protocol]] = Field(
+        default=Global[Protocol](value="ipv4"), validation_alias=AliasPath("data", "protocol")
+    )
 
     def add_collector(
         self,
@@ -97,24 +99,23 @@ class CflowdParcel(_ParcelBase):
             )
         )
 
-    def set_customized_ipv4_record_fields(
-        self, collect_dscp_output: Optional[bool] = False, collect_tos: Optional[bool] = False
-    ):
+    def set_customized_ipv4_record_fields(self, collect_dscp_output: bool = False, collect_tos: bool = False):
         self.customized_ipv4_record_fields = CustomizedIpv4RecordFields(
-            collect_dscp_output=as_optional_global(collect_dscp_output), collect_tos=as_optional_global(collect_tos)
+            collect_dscp_output=Global[bool](value=collect_dscp_output),
+            collect_tos=Global[bool](value=collect_tos),
         )
 
     def set_flow(
         self,
-        active_timeout: Optional[int] = 600,
-        inactive_timeout: Optional[int] = 60,
-        refresh_time: Optional[int] = 600,
-        sampling_interval: Optional[int] = 1,
+        active_timeout: Optional[int],
+        inactive_timeout: Optional[int],
+        refresh_time: Optional[int],
+        sampling_interval: Optional[int],
     ):
-        self.flow_active_timeout = as_optional_global(active_timeout)
-        self.flow_inactive_timeout = as_optional_global(inactive_timeout)
-        self.flow_refresh_time = as_optional_global(refresh_time)
-        self.flow_sampling_interval = as_optional_global(sampling_interval)
+        self.flow_active_timeout = Global[int](value=active_timeout or 600)
+        self.flow_inactive_timeout = Global[int](value=inactive_timeout or 60)
+        self.flow_refresh_time = Global[int](value=refresh_time or 600)
+        self.flow_sampling_interval = Global[int](value=sampling_interval or 1)
 
     def set_protocol(self, protocol: Protocol):
-        self.protocol = as_global(protocol, Protocol)
+        self.protocol = Global[Protocol](value=protocol)

catalystwan/models/policy/definition/dns_security.py

@@ -118,7 +118,7 @@ class DnsSecurityDefinition(BaseModel):
 
 
 class DnsSecurityPolicy(PolicyDefinitionBase):
-    type: Literal["dnsSecurity"] = "dnsSecurity"
+    type: Literal["DNSSecurity", "dnsSecurity"] = "DNSSecurity"
     definition: DnsSecurityDefinition
 
 

catalystwan/utils/feature_template/find_template_values.py

@@ -11,7 +11,7 @@ def find_template_values(
     template_definition: dict,
     templated_values: Optional[dict] = None,
     target_key: str = "vipType",
-    target_key_value_to_ignore: str = "ignore",
+    target_key_default_values: List[str] = ["ignore", "notIgnore"],
     target_key_for_template_value: str = "vipValue",
     path: Optional[List[str]] = None,
 ) -> Dict[str, Union[str, list, dict]]:
@@ -22,8 +22,8 @@ def find_template_values(
         templated_values: dictionary, empty at the beginning and filed out with names of fields as keys
             and values of those fields as values
         target_key: name of the key specifying if field is used in template, defaults to 'vipType'
-        target_key_value_to_ignore: value of the target key indicating
-            that field is not used in template, defaults to 'ignore'
+        target_key_default_values: list of values of the target key indicating
+            that a field is not used in template, defaults to ['ignore', 'notIgnore']
         target_key_for_template_value: name of the key specifying value of field used in template,
             defaults to 'vipValue'
         path: a list of keys indicating current path, defaults to None
@@ -36,7 +36,7 @@ def find_template_values(
         templated_values = {}
     # if value object is reached, try to extract the value
     if target_key in template_definition:
-        if template_definition[target_key] == target_key_value_to_ignore:
+        if template_definition[target_key] in target_key_default_values:
             return templated_values
 
         value = template_definition[target_key]  # vipType
@@ -88,7 +88,7 @@ def find_template_values(
 
     # iterate the dict to extract values and assign them to their fields
     for key, value in template_definition.items():
-        if isinstance(value, dict) and value != target_key_value_to_ignore:
+        if isinstance(value, dict) and value not in target_key_default_values:
             find_template_values(value, templated_values, path=path + [key])
     return templated_values
 

{catalystwan-0.41.2.dev2.dist-info → catalystwan-0.41.2.dev4.dist-info}/METADATA

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

{catalystwan-0.41.2.dev2.dist-info → catalystwan-0.41.2.dev4.dist-info}/RECORD

@@ -314,7 +314,7 @@ catalystwan/models/configuration/feature_profile/sdwan/routing/bgp.py,sha256=4vX
 catalystwan/models/configuration/feature_profile/sdwan/routing/ospf.py,sha256=hfsfL9Fy4q7eUybhSzPDGTFgdlK1VO3zPUy1aNOOCIc,7647
 catalystwan/models/configuration/feature_profile/sdwan/routing/ospfv3.py,sha256=KW0UgMPt08OxLbX4JoShNby83HCMhlHICRLLW8pYinQ,13268
 catalystwan/models/configuration/feature_profile/sdwan/service/__init__.py,sha256=AzPWWFozmwg5nzwEj-bYhg2HTeJJ8FFPQHmvyxDvSnQ,2378
-catalystwan/models/configuration/feature_profile/sdwan/service/appqoe.py,sha256=08p0ZkVquudHG2BmGKJx81H9GdEIepbkXg5lkOzd32I,10235
+catalystwan/models/configuration/feature_profile/sdwan/service/appqoe.py,sha256=4V5BWUYDBJEQJ7OWZRXe9Qasw4VzD52_XqmMIUv6cK8,10210
 catalystwan/models/configuration/feature_profile/sdwan/service/dhcp_server.py,sha256=XCYUektYRLZaIzJAiAuSeuKg2DdAYio38t0niN8CkhA,5289
 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
@@ -385,7 +385,7 @@ catalystwan/models/configuration/feature_profile/sdwan/uc_voice/trunk_group.py,s
 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/cflowd.py,sha256=dNeIZbUTcsu39vbRfq11Vww7wWiwWP6IzTxVqBwK5PA,5205
+catalystwan/models/configuration/network_hierarchy/cflowd.py,sha256=AEWc29t-fF3eKJDfTzlBFfBEP5z4RyaGWMAXPgshgOg,5216
 catalystwan/models/configuration/network_hierarchy/node.py,sha256=Ex1OMLl00uU3y4fSSD-xl-t1AJYotYhFRr0KQ826pK8,2792
 catalystwan/models/configuration/policy_group.py,sha256=8A_TsNmjSRVx1BAlYUgQQWkpp_SizDL_ZTS8zUTtHgs,2235
 catalystwan/models/configuration/profile_type.py,sha256=qIlobJmEYQ5qEGZeYJZsVMaXtFbR7RgFr6eH8YyoNAo,157
@@ -407,7 +407,7 @@ catalystwan/models/policy/definition/control.py,sha256=tjS8SjhbMUIt8LPfA3HVX7t09
 catalystwan/models/policy/definition/device_access.py,sha256=SOVwcqtZRN1aKABnGpsxqsSArc_hK_Lpslsh6EuzH_o,4219
 catalystwan/models/policy/definition/device_access_ipv6.py,sha256=AGX8Ax4UNXs7nOjd2DeB1r12QZoDPszUgFI3UUEdiZ8,4303
 catalystwan/models/policy/definition/dial_peer.py,sha256=GRKlK-vY1A1i6sB5cNKzRim8970d16ba16707OefD2M,2190
-catalystwan/models/policy/definition/dns_security.py,sha256=I9bMpzVwH6DXQwk0cyquyJCAqyTMxFSw2hYThDrzuLU,4617
+catalystwan/models/policy/definition/dns_security.py,sha256=UHx1k4e_eTHu3ytPaP0Kr2C5H7Ls_D3xinTbz8QPo_g,4632
 catalystwan/models/policy/definition/fxo_port.py,sha256=_6que7pcvvIELqj6Vfm4B7a2DxXRdLB2lP2mvRkeSmE,2461
 catalystwan/models/policy/definition/fxs_did_port.py,sha256=CVEWHAT_17EAOhwyjlFdZf15sHFNlZthuQFmG2wvoO8,2214
 catalystwan/models/policy/definition/fxs_port.py,sha256=L7Ot4ZupJdaK9IJQNYVlgiqk8I_WqGuGVBcArEBx7ms,2045
@@ -614,7 +614,7 @@ catalystwan/utils/dashboard.py,sha256=5DBDdnFuNEebo9R8UpXDETrYJsfZp-vv9OCr9ahU6V
 catalystwan/utils/device_model.py,sha256=IPEQD7yYyhCH91Uw9P-dF34TcIEimYEnImYVaaQOjRY,15996
 catalystwan/utils/dict.py,sha256=1IC4pcPFQ7yS39-ZWSFwyCvQKYzfZoxsz3YtJ-S6l7w,2110
 catalystwan/utils/feature_template/choose_model.py,sha256=JoQ7l_TF2PTH8bciOSVAFavevo35n2F4DbusIIvapM8,953
-catalystwan/utils/feature_template/find_template_values.py,sha256=UpGx4-MDhgyqOGkd-8bTKGXIVu8KxjI4ensxsRTSmqQ,5358
+catalystwan/utils/feature_template/find_template_values.py,sha256=nEi-hFmOaX5cHeS4VBSJmhxIl3jOn42o6mNSkS9Htak,5405
 catalystwan/utils/model.py,sha256=UCqpk2kpgT8YYRp4prv9kmR4ciBNvQDCl3ZB8Ln941k,1506
 catalystwan/utils/operation_status.py,sha256=SeT34c_x8F98mwl9x0-klvGTMKbrKSTY_w0zaKyuds8,584
 catalystwan/utils/persona.py,sha256=fZEMM2wgvvSuNaGwsLk-qWJUuZzkhYm1C3YUnRGOqRw,147
@@ -630,7 +630,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.dev2.dist-info/LICENSE,sha256=97ROi91Vxrj_Jio2v8FI9E8-y6x2uYdQRaFlrEbVjkc,11375
-catalystwan-0.41.2.dev2.dist-info/METADATA,sha256=EdpUTh06aKf4INOCcCuVYw0uIiX7JStFwu9feSdVSo4,21275
-catalystwan-0.41.2.dev2.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-catalystwan-0.41.2.dev2.dist-info/RECORD,,
+catalystwan-0.41.2.dev4.dist-info/LICENSE,sha256=97ROi91Vxrj_Jio2v8FI9E8-y6x2uYdQRaFlrEbVjkc,11375
+catalystwan-0.41.2.dev4.dist-info/METADATA,sha256=ZkC0Yt4J1N7cnoV_D_9X0FMsVLZEq2rhO1v7FFtfQ9M,21275
+catalystwan-0.41.2.dev4.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+catalystwan-0.41.2.dev4.dist-info/RECORD,,