catalystwan 0.41.5.dev5__tar.gz → 0.41.5.dev7__tar.gz

{catalystwan-0.41.5.dev5 → catalystwan-0.41.5.dev7}/PKG-INFO

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

{catalystwan-0.41.5.dev5 → catalystwan-0.41.5.dev7}/catalystwan/api/configuration_groups/parcel.py

@@ -163,7 +163,7 @@ def as_global(value: Any, generic_alias: Any = None):
     )
 
 
-def as_variable(value: str):
+def as_variable(value: str) -> Variable:
     """Produces Variable object from variable name string
 
     Args:

{catalystwan-0.41.5.dev5 → catalystwan-0.41.5.dev7}/catalystwan/models/common.py

@@ -994,7 +994,7 @@ MediaType = Literal[
     "sfp",
 ]
 
-Speed = Literal["10", "100", "1000", "2500", "5000", "10000", "25000"]
+Speed = Literal["10", "100", "1000", "2500", "5000", "10000", "25000", "40000", "100000"]
 
 EthernetNatType = Literal["pool", "loopback", "interface"]
 

{catalystwan-0.41.5.dev5 → catalystwan-0.41.5.dev7}/catalystwan/models/configuration/feature_profile/sdwan/acl/ipv4acl.py

@@ -178,9 +178,10 @@ class Sequence(BaseModel):
         value = as_global(str(prefix))
         self._entry.destination_data_prefix = DestinationDataPrefix(destination_ip_prefix=value)
 
-    def match_destination_data_prefix_variable(self, prefix: str):
-        value = as_variable(prefix)
-        self._entry.destination_data_prefix = DestinationDataPrefix(destination_ip_prefix=value)
+    def match_destination_data_prefix_variable(self, prefix: str) -> Variable:
+        prefix_var = as_variable(prefix)
+        self._entry.destination_data_prefix = DestinationDataPrefix(destination_ip_prefix=prefix_var)
+        return prefix_var
 
     def match_destination_data_prefix_list(self, prefix: UUID):
         self._entry.destination_data_prefix = DestinationDataPrefixList(
@@ -220,9 +221,10 @@ class Sequence(BaseModel):
         value = as_global(str(prefix))
         self._entry.source_data_prefix = SourceDataPrefix(source_ip_prefix=value)
 
-    def match_source_data_prefix_variable(self, prefix: str):
-        value = as_variable(prefix)
-        self._entry.source_data_prefix = SourceDataPrefix(source_ip_prefix=value)
+    def match_source_data_prefix_variable(self, prefix: str) -> Variable:
+        prefix_var = as_variable(prefix)
+        self._entry.source_data_prefix = SourceDataPrefix(source_ip_prefix=prefix_var)
+        return prefix_var
 
     def match_source_data_prefix_list(self, prefix: UUID):
         self._entry.source_data_prefix = SourceDataPrefixList(source_data_prefix_list=RefIdItem.from_uuid(prefix))

{catalystwan-0.41.5.dev5 → catalystwan-0.41.5.dev7}/catalystwan/models/configuration/feature_profile/sdwan/application_priority/qos_policy.py

@@ -95,8 +95,10 @@ class QosPolicyParcel(_ParcelBase):
             )
         )
 
-    def set_variable_target(self, variable: str) -> None:
-        self.target = QosPolicyTarget(interfaces=as_variable(value=variable))
+    def set_variable_target(self, variable: str) -> Variable:
+        target_if_var = as_variable(variable)
+        self.target = QosPolicyTarget(interfaces=target_if_var)
+        return target_if_var
 
     def set_list_target(self, interfaces: List[str]) -> None:
         self.target = QosPolicyTarget(interfaces=as_global(value=interfaces))

{catalystwan-0.41.5.dev5 → catalystwan-0.41.5.dev7}/catalystwan/models/configuration/feature_profile/sdwan/application_priority/traffic_policy.py

@@ -666,6 +666,14 @@ class SseAction(BaseModel):
     sse: Sse
 
 
+LoadBalanceType = Literal["src-dst-ip", "ppl", "ip-and-ports", "src-ip-only"]
+
+
+class LoadBalanceAction(BaseModel):
+    model_config = ConfigDict(populate_by_name=True, extra="forbid")
+    load_balance: Global[LoadBalanceType] = Field(validation_alias="loadBalance", serialization_alias="loadBalance")
+
+
 Action = Union[
     AppqoeOptimizationAction,
     BackupSlaPreferredColorAction,
@@ -683,6 +691,7 @@ Action = Union[
     SigAction,
     SlaClassAction,
     SseAction,
+    LoadBalanceAction,
 ]
 
 TA = TypeVar("TA", bound=Action)
@@ -1060,6 +1069,9 @@ class Sequence(BaseModel):
     def associate_sse_action(self) -> None:
         pass  # TODO
 
+    def associate_load_balance_action(self, load_balance: LoadBalanceType) -> None:
+        self._insert_action(LoadBalanceAction(load_balance=as_global(load_balance, LoadBalanceType)))
+
 
 class TrafficPolicyParcel(_ParcelBase):
     type_: Literal["traffic-policy"] = Field(default="traffic-policy", exclude=True)

{catalystwan-0.41.5.dev5 → catalystwan-0.41.5.dev7}/catalystwan/models/configuration/feature_profile/sdwan/routing/bgp.py

@@ -231,6 +231,9 @@ class NeighborItem(BaseModel):
         description="Set BGP address family",
         max_length=3,
     )
+    originate: Optional[Union[Variable, Global[bool], Default[Literal[False]]]] = Field(
+        default=None, description="BGP Default Information Originate"
+    )
 
 
 class Ipv6NeighborItem(BaseModel):
@@ -323,6 +326,9 @@ class Ipv6NeighborItem(BaseModel):
         description="Set IPv6 BGP address family",
         max_length=2,
     )
+    originate: Optional[Union[Variable, Global[bool], Default[Literal[False]]]] = Field(
+        default=None, description="BGP Default Information Originate"
+    )
 
 
 class AggregateAddres(BaseModel):
@@ -377,6 +383,13 @@ class RedistributeItem(BaseModel):
     ospf_match_route: Optional[Union[Global[List[OspfMatchRoute]], Variable, Default[None]]] = Field(
         default=None, validation_alias="ospfMatchRoute", serialization_alias="ospfMatchRoute"
     )
+    dia_outside: Optional[Union[Variable, Global[bool], Default[Literal[False]]]] = Field(
+        default=None,
+        serialization_alias="diaOutside",
+        validation_alias="diaOutside",
+        description="When diaOutside is enabled, only DIA outside routes are redistributed into BGP."
+        " Available only in NAT protocol.",
+    )
 
 
 class AddressFamily(BaseModel):

{catalystwan-0.41.5.dev5 → catalystwan-0.41.5.dev7}/catalystwan/models/configuration/feature_profile/sdwan/service/lan/ethernet.py

@@ -15,7 +15,7 @@ from pydantic import (
 from typing_extensions import Annotated
 
 from catalystwan.api.configuration_groups.parcel import Default, Global, Variable, _ParcelBase
-from catalystwan.models.common import EthernetDuplexMode, MediaType, VersionedField
+from catalystwan.models.common import EthernetDuplexMode, MediaType, Speed, VersionedField
 from catalystwan.models.configuration.feature_profile.common import (
     AddressType,
     Arp,
@@ -251,7 +251,7 @@ class VrrpIPv4(BaseModel):
     tloc_pref_change: Union[Global[bool], Default[bool]] = Field(
         serialization_alias="tlocPrefChange", validation_alias="tlocPrefChange", default=Default[bool](value=False)
     )
-    tloc_pref_change_value: Optional[Union[Global[int], Default[None]]] = Field(
+    tloc_pref_change_value: Optional[Union[Global[int], Variable, Default[None]]] = Field(
         serialization_alias="tlocPrefChangeValue", validation_alias="tlocPrefChangeValue", default=None
     )
     tracking_object: Optional[List[VrrpTrackingObject]] = Field(
@@ -318,7 +318,7 @@ class AdvancedEthernetAttributes(BaseModel):
     tcp_mss: Optional[Union[Global[int], Variable, Default[int]]] = Field(
         serialization_alias="tcpMss", validation_alias="tcpMss", default=None
     )
-    speed: Optional[Union[Global[str], Variable, Default[None]]] = None
+    speed: Optional[Union[Global[Speed], Variable, Default[None]]] = None
     arp_timeout: Union[Global[int], Variable, Default[int]] = Field(
         serialization_alias="arpTimeout", validation_alias="arpTimeout", default=Default[int](value=1200)
     )

{catalystwan-0.41.5.dev5 → catalystwan-0.41.5.dev7}/catalystwan/models/configuration/feature_profile/sdwan/service/route_policy.py

@@ -340,9 +340,11 @@ class RoutePolicySequence(BaseModel):
         set_community = SetCommunity(additive=as_global(additive), community=as_global(communities))
         self._accept_action.community = set_community
 
-    def associate_community_variable_action(self, additive: bool, community: str) -> None:
-        set_community = SetCommunity(additive=as_global(additive), community=as_variable(community))
+    def associate_community_variable_action(self, additive: bool, community: str) -> SetCommunity:
+        community_var = as_variable(community)
+        set_community = SetCommunity(additive=as_global(additive), community=community_var)
         self._accept_action.community = set_community
+        return set_community
 
     def associate_local_preference_action(self, preference: int) -> None:
         self._accept_action.local_preference = as_global(preference)

{catalystwan-0.41.5.dev5 → catalystwan-0.41.5.dev7}/catalystwan/models/configuration/feature_profile/sdwan/service/switchport.py

@@ -47,6 +47,7 @@ class SwitchportInterface(BaseModel):
     model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True, extra="forbid")
 
     interface_name: Union[Global[str], Variable] = Field(serialization_alias="ifName", validation_alias="ifName")
+    description: Optional[Union[Global[str], Default[None], Variable]] = Field(default=None)
     control_direction: Optional[Union[Global[ControlDirection], Default[None], Variable]] = Field(
         default=None, validation_alias="controlDirection", serialization_alias="controlDirection"
     )

{catalystwan-0.41.5.dev5 → catalystwan-0.41.5.dev7}/catalystwan/models/configuration/feature_profile/sdwan/system/device_access.py

@@ -86,10 +86,10 @@ class Sequence(BaseModel):
             destination_data_prefix_list=RefIdItem.from_uuid(list_id)
         )
 
-    def match_destination_data_prefix_variable(self, variable_name: str):
-        self.match_entries.destination_data_prefix = DestinationIPPrefix(
-            destination_ip_prefix_list=as_variable(value=variable_name)
-        )
+    def match_destination_data_prefix_variable(self, variable_name: str) -> Variable:
+        prefix_var = as_variable(variable_name)
+        self.match_entries.destination_data_prefix = DestinationIPPrefix(destination_ip_prefix_list=prefix_var)
+        return prefix_var
 
     def match_destination_port(self, port: DeviceAccessProtocolPort):
         self.match_entries.destination_port = Global[DeviceAccessProtocolPort](value=port)
@@ -102,8 +102,10 @@ class Sequence(BaseModel):
     def match_source_data_prefix_list(self, list_id: UUID):
         self.match_entries.source_data_prefix = SourceDataPrefix(source_data_prefix_list=RefIdItem.from_uuid(list_id))
 
-    def match_source_data_prefix_variable(self, variable_name: str):
-        self.match_entries.source_data_prefix = SourceIPPrefix(source_ip_prefix_list=as_variable(value=variable_name))
+    def match_source_data_prefix_variable(self, variable_name: str) -> Variable:
+        prefix_var = as_variable(variable_name)
+        self.match_entries.source_data_prefix = SourceIPPrefix(source_ip_prefix_list=prefix_var)
+        return prefix_var
 
     def match_source_ports(self, ports: List[int]):
         self.match_entries.source_ports = Global[List[int]](value=ports)

{catalystwan-0.41.5.dev5 → catalystwan-0.41.5.dev7}/catalystwan/models/configuration/feature_profile/sdwan/system/device_access_ipv6.py

@@ -86,10 +86,10 @@ class Sequence(BaseModel):
             destination_data_prefix_list=RefIdItem.from_uuid(list_id)
         )
 
-    def match_destination_data_prefix_variable(self, variable_name: str):
-        self.match_entries.destination_data_prefix = DestinationIPPrefix(
-            destination_ip_prefix_list=as_variable(value=variable_name)
-        )
+    def match_destination_data_prefix_variable(self, variable_name: str) -> Variable:
+        prefix_var = as_variable(variable_name)
+        self.match_entries.destination_data_prefix = DestinationIPPrefix(destination_ip_prefix_list=prefix_var)
+        return prefix_var
 
     def match_destination_port(self, port: DeviceAccessProtocolPort):
         self.match_entries.destination_port = Global[DeviceAccessProtocolPort](value=port)
@@ -102,8 +102,10 @@ class Sequence(BaseModel):
     def match_source_data_prefix_list(self, list_id: UUID):
         self.match_entries.source_data_prefix = SourceDataPrefix(source_data_prefix_list=RefIdItem.from_uuid(list_id))
 
-    def match_source_data_prefix_variable(self, variable_name: str):
-        self.match_entries.source_data_prefix = SourceIPPrefix(source_ip_prefix_list=as_variable(value=variable_name))
+    def match_source_data_prefix_variable(self, variable_name: str) -> Variable:
+        prefix_var = as_variable(variable_name)
+        self.match_entries.source_data_prefix = SourceIPPrefix(source_ip_prefix_list=prefix_var)
+        return prefix_var
 
     def match_source_ports(self, ports: List[int]):
         self.match_entries.source_ports = Global[List[int]](value=ports)

{catalystwan-0.41.5.dev5 → catalystwan-0.41.5.dev7}/catalystwan/models/configuration/feature_profile/sdwan/transport/management/ethernet.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
-from catalystwan.models.common import EthernetDuplexMode, MediaType, Speed
+from catalystwan.models.common import EthernetDuplexMode, MediaType
 from catalystwan.models.configuration.feature_profile.common import (
     AddressType,
     Arp,
@@ -14,6 +14,8 @@ from catalystwan.models.configuration.feature_profile.common import (
     InterfaceStaticIPv4Address,
 )
 
+Speed = Literal["10", "100", "1000", "2500", "5000", "10000", "25000"]
+
 
 class DhcpClient(BaseModel):
     model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True, extra="forbid")

{catalystwan-0.41.5.dev5 → catalystwan-0.41.5.dev7}/pyproject.toml

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