catalystwan 0.41.6.dev1__tar.gz → 0.41.6.dev2__tar.gz

{catalystwan-0.41.6.dev1 → catalystwan-0.41.6.dev2}/PKG-INFO

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

{catalystwan-0.41.6.dev1 → catalystwan-0.41.6.dev2}/catalystwan/models/configuration/feature_profile/sdwan/dns_security/dns.py

@@ -8,6 +8,8 @@ from typing_extensions import Self
 from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, as_global, as_optional_global
 from catalystwan.models.configuration.feature_profile.common import RefIdItem
 
+CloudProvider = Literal["umbrella", "cisco-secure-access"]
+
 
 class TargetVpns(BaseModel):
     model_config = ConfigDict(populate_by_name=True, extra="forbid")
@@ -69,6 +71,9 @@ class DnsParcel(_ParcelBase):
     umbrella_default: Optional[Global[bool]] = Field(
         default=None, validation_alias=AliasPath("data", "umbrellaDefault")
     )
+    cloud_provider: Optional[Global[CloudProvider]] = Field(
+        default=None, validation_alias=AliasPath("data", "cloudProvider")
+    )
 
     @model_validator(mode="after")
     def check_target_vpns(self):
@@ -91,6 +96,7 @@ class DnsParcel(_ParcelBase):
         local_domain_bypass_enabled: Optional[bool],
         local_domain_bypass_list: Optional[UUID],
         target_vpns: Optional[List[TargetVpns]] = None,
+        cloud_provider: Optional[CloudProvider] = None,
     ) -> Self:
         _child_org_id = as_global(str(child_org_id)) if child_org_id is not None else None
         _dns_server_ip = as_global(dns_server_ip) if dns_server_ip else None
@@ -107,4 +113,5 @@ class DnsParcel(_ParcelBase):
             child_org_id=_child_org_id,
             dns_server_ip=_dns_server_ip,
             target_vpns=target_vpns,
+            cloud_provider=as_optional_global(cloud_provider),
         )

{catalystwan-0.41.6.dev1 → catalystwan-0.41.6.dev2}/catalystwan/models/configuration/feature_profile/sdwan/system/global_parcel.py

@@ -17,6 +17,7 @@ EtherchannelFlowLoadBalance = Literal[
     "src-ip",
     "src-mac",
 ]
+InterfaceIntervalOptions = Literal["1", "5"]
 
 
 class ServicesIp(BaseModel):
@@ -109,7 +110,7 @@ class ServicesIp(BaseModel):
         serialization_alias="globalOtherSettingsVtyLineLogging",
         validation_alias="globalOtherSettingsVtyLineLogging",
     )
-    snmp_ifindex_persist: (Union[Variable, Global[bool], Default[bool]]) = Field(
+    snmp_ifindex_persist: Union[Variable, Global[bool], Default[bool]] = Field(
         default=Default[bool](value=True),
         serialization_alias="globalOtherSettingsSnmpIfindexPersist",
         validation_alias="globalOtherSettingsSnmpIfindexPersist",
@@ -142,6 +143,13 @@ class ServicesIp(BaseModel):
     lacp_system_priority: Optional[Union[Variable, Global[int], Default[None]]] = Field(
         default=None, validation_alias="lacpSystemPriority", serialization_alias="lacpSystemPriority"
     )
+    intf_per_min: Optional[Union[Variable, Global[InterfaceIntervalOptions], Default[InterfaceIntervalOptions]]] = (
+        Field(
+            default=None,
+            serialization_alias="globalOtherSettingsIntfPerMin",
+            validation_alias="globalOtherSettingsIntfPerMin",
+        )
+    )
 
 
 class ServicesGlobal(BaseModel):

{catalystwan-0.41.6.dev1 → catalystwan-0.41.6.dev2}/catalystwan/models/configuration/feature_profile/sdwan/topology/custom_control.py

@@ -220,17 +220,36 @@ class Sequence(BaseModel):
 
     @property
     def _action(self) -> Actions:
+        # get or create dedicated action entry for action set
         if not self.actions:
             self.actions = [Actions()]
-        return self.actions[0]
+        for action in self.actions:
+            if action.export_to is None:
+                return action
+        action = Actions()
+        self.actions.insert(0, action)
+        return action
 
     @property
     def _action_set(self) -> ActionSet:
+        # get or create action set item
         action = self._action
         if action.set is None:
             action.set = [ActionSet()]
         return action.set[0]
 
+    @property
+    def _action_export_to(self) -> Actions:
+        # get or create dedicated action entry for exportTo
+        if self.actions is None:
+            self.actions = []
+        for action in self.actions:
+            if action.export_to is not None:
+                return action
+        action = Actions()
+        self.actions.append(action)
+        return action
+
     def match_carrier(self, carrier: CarrierType):
         entry = Entry(carrier=as_global(carrier, CarrierType))
         self._match(entry)
@@ -325,6 +344,9 @@ class Sequence(BaseModel):
     def associate_community_action(self, community: str) -> None:
         self._action_set.community = as_global(community)
 
+    def associate_export_to_action(self, vpns: List[str]) -> None:
+        self._action_export_to.export_to = Global[List[str]](value=vpns)
+
     def associate_omp_tag_action(self, omp_tag: int) -> None:
         self._action_set.omp_tag = as_global(omp_tag)
 
@@ -332,14 +354,14 @@ class Sequence(BaseModel):
         self._action_set.preference = as_global(preference)
 
     @overload
-    def associate_service_action(self, service_type: ServiceType, vpn: Optional[int], *, tloc_list_id: UUID) -> None:
-        ...
+    def associate_service_action(
+        self, service_type: ServiceType, vpn: Optional[int], *, tloc_list_id: UUID
+    ) -> None: ...
 
     @overload
     def associate_service_action(
         self, service_type: ServiceType, vpn: Optional[int], *, ip: IPv4Address, color: TLOCColor, encap: EncapType
-    ) -> None:
-        ...
+    ) -> None: ...
 
     def associate_service_action(
         self, service_type=ServiceType, vpn=Optional[int], *, tloc_list_id=None, ip=None, color=None, encap=None

catalystwan-0.41.6.dev2/catalystwan/tests/models/configuration/feature_profile/sdwan/topology/test_custom_control.py

@@ -0,0 +1,49 @@
+# Copyright 2026 Cisco Systems, Inc. and its affiliates
+import pytest
+
+from catalystwan.models.configuration.feature_profile.sdwan.topology.custom_control import Sequence
+
+
+@pytest.mark.parametrize("export_first", [False, True])
+def test_community_and_export_to_use_separate_actions(export_first):
+    sequence = Sequence()
+    vpns = ["gold_vpn1_tron", "gold_vpn14_oga"]
+
+    if export_first:
+        sequence.associate_export_to_action(vpns)
+        sequence.associate_community_action("99:999")
+    else:
+        sequence.associate_community_action("99:999")
+        sequence.associate_export_to_action(vpns)
+
+    assert sequence.model_dump(by_alias=True, exclude_none=True)["actions"] == [
+        {
+            "set": [
+                {
+                    "community": {
+                        "optionType": "global",
+                        "value": "99:999",
+                    }
+                }
+            ]
+        },
+        {
+            "exportTo": {
+                "optionType": "global",
+                "value": vpns,
+            }
+        },
+    ]
+
+
+def test_export_to_action_updates_existing_entry():
+    sequence = Sequence()
+
+    sequence.associate_export_to_action(["vpn1"])
+    sequence.associate_export_to_action(["vpn2"])
+
+    assert sequence.actions is not None
+    assert len(sequence.actions) == 1
+    export_to = sequence.actions[0].export_to
+    assert export_to is not None
+    assert export_to.value == ["vpn2"]

{catalystwan-0.41.6.dev1 → catalystwan-0.41.6.dev2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "catalystwan"
-version = "0.41.6dev1"
+version = "0.41.6dev2"
 description = "Cisco Catalyst WAN SDK for Python"
 authors = ["sbasan <sbasan@cisco.com>"]
 readme = "README.md"