catalystwan 0.41.5.dev2__tar.gz → 0.41.5.dev4__tar.gz

{catalystwan-0.41.5.dev2 → catalystwan-0.41.5.dev4}/PKG-INFO

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

{catalystwan-0.41.5.dev2 → catalystwan-0.41.5.dev4}/catalystwan/api/builders/feature_profiles/mixins.py

@@ -17,14 +17,17 @@ class TrackerMixin:
     def _create_parcel(self, profile_uuid: UUID, tracker: Tracker | TrackerGroup) -> UUID:
         raise NotImplementedError()
 
-    def create_trackers(self, profile_uuid: UUID) -> None:
+    def _create_tracker_groups(self, profile_uuid: UUID) -> None:
         for tracker_group_tags, tracker_group, trackers in self._tracker_groups:
-            trackers_uuids: List[UUID] = []
-            for tracker_ in trackers:
-                tracker_uuid = self._create_parcel(profile_uuid, tracker_)
+            trackers_uuids: set[UUID] = set()
+            for tracker in trackers:
+                if tracker.parcel_name in self._shared_trackers:
+                    tracker_uuid = self._shared_trackers[tracker.parcel_name]
+                else:
+                    tracker_uuid = self._create_parcel(profile_uuid, tracker)
                 if tracker_uuid:
-                    trackers_uuids.append(tracker_uuid)
-                    self._shared_trackers[tracker_.parcel_name] = tracker_uuid
+                    trackers_uuids.add(tracker_uuid)
+                    self._shared_trackers[tracker.parcel_name] = tracker_uuid
 
             for tracker_uuid in trackers_uuids:
                 tracker_group.add_ref(tracker_uuid)
@@ -34,6 +37,7 @@ class TrackerMixin:
                 for tag in tracker_group_tags:
                     self._interface_tag_to_existing_tracker[tag] = tracker_group_uuid, tracker_group._get_parcel_type()
 
+    def _create_trackers(self, profile_uuid: UUID) -> None:
         for tracker_tags, tracker in self._trackers:
             if tracker.parcel_name in self._shared_trackers:
                 created_tracker_uuid = self._shared_trackers[tracker.parcel_name]
@@ -42,3 +46,7 @@ class TrackerMixin:
             if created_tracker_uuid:
                 for tag in tracker_tags:
                     self._interface_tag_to_existing_tracker[tag] = (created_tracker_uuid, tracker._get_parcel_type())
+
+    def create_trackers(self, profile_uuid: UUID) -> None:
+        self._create_tracker_groups(profile_uuid)
+        self._create_trackers(profile_uuid)

{catalystwan-0.41.5.dev2 → catalystwan-0.41.5.dev4}/catalystwan/models/configuration/feature_profile/common.py

@@ -308,12 +308,14 @@ class WANService(BaseModel):
     service_type: Global[Literal["TE"]] = Field(serialization_alias="serviceType", validation_alias="serviceType")
 
 
-class RefIdItem(BaseModel):
+class RefIdVariableItem(BaseModel):
     model_config = ConfigDict(
         extra="forbid",
         populate_by_name=True,
     )
-    ref_id: Union[Global[str], Default[None]] = Field(..., serialization_alias="refId", validation_alias="refId")
+    ref_id: Union[Global[str], Default[None], Variable] = Field(
+        ..., serialization_alias="refId", validation_alias="refId"
+    )
 
     @classmethod
     def from_uuid(cls, ref_id: UUID):
@@ -323,6 +325,10 @@ class RefIdItem(BaseModel):
         return hash(self.ref_id.value)
 
 
+class RefIdItem(RefIdVariableItem):
+    ref_id: Union[Global[str], Default[None]] = Field(..., serialization_alias="refId", validation_alias="refId")
+
+
 class RefIdList(BaseModel):
     model_config = ConfigDict(
         extra="forbid",
@@ -466,16 +472,16 @@ class AclQos(BaseModel):
     adaptive_qos: Optional[Union[Global[bool], Default[bool]]] = Field(
         default=None, validation_alias="adaptiveQoS", serialization_alias="adaptiveQoS"
     )
-    ipv4_acl_egress: Optional[RefIdItem] = Field(
+    ipv4_acl_egress: Optional[RefIdVariableItem] = Field(
         default=None, validation_alias="ipv4AclEgress", serialization_alias="ipv4AclEgress"
     )
-    ipv4_acl_ingress: Optional[RefIdItem] = Field(
+    ipv4_acl_ingress: Optional[RefIdVariableItem] = Field(
         default=None, validation_alias="ipv4AclIngress", serialization_alias="ipv4AclIngress"
     )
-    ipv6_acl_egress: Optional[RefIdItem] = Field(
+    ipv6_acl_egress: Optional[RefIdVariableItem] = Field(
         default=None, validation_alias="ipv6AclEgress", serialization_alias="ipv6AclEgress"
     )
-    ipv6_acl_ingress: Optional[RefIdItem] = Field(
+    ipv6_acl_ingress: Optional[RefIdVariableItem] = Field(
         default=None, validation_alias="ipv6AclIngress", serialization_alias="ipv6AclIngress"
     )
     shaping_rate: Optional[Union[Variable, Global[int], Default[None]]] = Field(

{catalystwan-0.41.5.dev2 → catalystwan-0.41.5.dev4}/catalystwan/models/configuration/feature_profile/sdwan/application_priority/traffic_policy.py

@@ -255,6 +255,9 @@ class SlaClass(BaseModel):
     preferred_color_group: Optional[RefIdItem] = Field(
         default=None, validation_alias="preferredColorGroup", serialization_alias="preferredColorGroup"
     )
+    preferred_color_group_restrict: Optional[Global[bool]] = Field(
+        default=None, validation_alias="preferredColorGroupRestrict", serialization_alias="preferredColorGroupRestrict"
+    )
     preferred_remote_color: Optional[Global[List[TLOCColor]]] = Field(
         default=None, validation_alias="preferredRemoteColor", serialization_alias="preferredRemoteColor"
     )
@@ -281,7 +284,7 @@ class LocalTlocList(BaseModel):
 class PreferredRemoteColor(BaseModel):
     model_config = ConfigDict(populate_by_name=True, extra="forbid")
     color: Global[List[TLOCColor]]
-    remote_color_restrict: Optional[Global[Global[bool]]] = Field(
+    remote_color_restrict: Optional[Global[bool]] = Field(
         default=None, validation_alias="remoteColorRestrict", serialization_alias="remoteColorRestrict"
     )
 
@@ -373,6 +376,13 @@ class SetPreferredColorGroup(BaseModel):
     )
 
 
+class SetPreferredColorGroupRestrict(BaseModel):
+    model_config = ConfigDict(populate_by_name=True, extra="forbid")
+    preferred_color_group_restrict: Optional[Global[bool]] = Field(
+        default=None, validation_alias="preferredColorGroupRestrict", serialization_alias="preferredColorGroupRestrict"
+    )
+
+
 class SetPreferredRemoteColor(BaseModel):
     model_config = ConfigDict(populate_by_name=True, extra="forbid")
     preferred_remote_color: Optional[PreferredRemoteColor] = Field(
@@ -416,6 +426,7 @@ Set = Union[
     SetNextHopLoose,
     SetPolicer,
     SetPreferredColorGroup,
+    SetPreferredColorGroupRestrict,
     SetPreferredRemoteColor,
     SetService,
     SetServiceChain,
@@ -515,6 +526,7 @@ class SlaClassAction(BaseModel):
         sla_name: Optional[UUID] = None,
         preferred_color: Optional[List[TLOCColor]] = None,
         preferred_color_group: Optional[UUID] = None,
+        preferred_color_group_restrict: Optional[bool] = None,
         preferred_remote_color: Optional[List[TLOCColor]] = None,
         remote_color_restrict: Optional[bool] = None,
         strict: Optional[bool] = None,
@@ -528,6 +540,10 @@ class SlaClassAction(BaseModel):
             action.sla_class.append(SlaClass(preferred_color=Global[List[TLOCColor]](value=preferred_color)))
         if preferred_color_group:
             action.sla_class.append(SlaClass(preferred_color_group=RefIdItem.from_uuid(preferred_color_group)))
+        if preferred_color_group_restrict is not None:
+            action.sla_class.append(
+                SlaClass(preferred_color_group_restrict=Global[bool](value=preferred_color_group_restrict))
+            )
         if preferred_remote_color:
             action.sla_class.append(
                 SlaClass(preferred_remote_color=Global[List[TLOCColor]](value=preferred_remote_color))
@@ -883,20 +899,27 @@ class Sequence(BaseModel):
     def associate_preferred_color_group_action(self, group_id: UUID) -> None:
         self._insert_action_in_set(SetPreferredColorGroup(preferred_color_group=RefIdItem.from_uuid(group_id)))
 
-    def associate_preferred_remote_color_action(self) -> None:
-        pass
+    def associate_preferred_color_group_restrict_action(self, restrict: bool) -> None:
+        self._insert_action_in_set(SetPreferredColorGroupRestrict(preferred_color_group_restrict=as_global(restrict)))
+
+    def associate_preferred_remote_color_action(self, color: List[TLOCColor], restrict: Optional[bool] = False) -> None:
+        self._insert_action_in_set(
+            SetPreferredRemoteColor(
+                preferred_remote_color=PreferredRemoteColor(
+                    color=Global[List[TLOCColor]](value=color), remote_color_restrict=as_global(restrict)
+                )
+            )
+        )
 
     @overload
     def associate_service_action(
         self, service_type: ServiceType, vpn: Optional[int] = None, *, tloc_list_id: UUID
-    ) -> None:
-        ...
+    ) -> None: ...
 
     @overload
     def associate_service_action(
         self, service_type: ServiceType, vpn: int, *, ip: IPv4Address, color: List[TLOCColor], encap: EncapType
-    ) -> None:
-        ...
+    ) -> None: ...
 
     def associate_service_action(
         self,
@@ -1016,6 +1039,7 @@ class Sequence(BaseModel):
         sla_name: Optional[UUID] = None,
         preferred_color: Optional[List[TLOCColor]] = None,
         preferred_color_group: Optional[UUID] = None,
+        preferred_color_group_restrict: Optional[bool] = None,
         preferred_remote_color: Optional[List[TLOCColor]] = None,
         remote_color_restrict: Optional[bool] = None,
         strict: Optional[bool] = None,
@@ -1025,6 +1049,7 @@ class Sequence(BaseModel):
             sla_name=sla_name,
             preferred_color=preferred_color,
             preferred_color_group=preferred_color_group,
+            preferred_color_group_restrict=preferred_color_group_restrict,
             preferred_remote_color=preferred_remote_color,
             remote_color_restrict=remote_color_restrict,
             strict=strict,

{catalystwan-0.41.5.dev2 → catalystwan-0.41.5.dev4}/catalystwan/models/configuration/feature_profile/sdwan/routing/bgp.py

@@ -8,7 +8,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.configuration.feature_profile.common import AddressWithMask, RefIdItem
+from catalystwan.models.configuration.feature_profile.common import AddressWithMask, RefIdVariableItem
 
 FamilyType = Literal["ipv4-unicast", "vpnv4-unicast", "vpnv6-unicast", "ipv6-unicast"]
 PolicyTypeOff = Literal["off"]
@@ -118,13 +118,13 @@ class AddressFamilyItem(BaseModel):
         description="Set maximum number of prefixes accepted from BGP peer"
         "and threshold exceeded policy actions (restart or warning)",
     )
-    in_route_policy: Optional[Union[RefIdItem, Default[None]]] = Field(
+    in_route_policy: Optional[Union[RefIdVariableItem, Default[None]]] = Field(
         default=None,
         serialization_alias="inRoutePolicy",
         validation_alias="inRoutePolicy",
         description="In direction route policy name",
     )
-    out_route_policy: Optional[Union[RefIdItem, Default[None]]] = Field(
+    out_route_policy: Optional[Union[RefIdVariableItem, Default[None]]] = Field(
         default=None,
         serialization_alias="outRoutePolicy",
         validation_alias="outRoutePolicy",
@@ -367,7 +367,7 @@ class RedistributeItem(BaseModel):
         description="Set the protocol to redistribute routes from. "
         "Transport and Management Protocols don't have a 'omp' option",
     )
-    route_policy: Optional[Union[Default[None], RefIdItem]] = Field(
+    route_policy: Optional[Union[Default[None], RefIdVariableItem]] = Field(
         default=None,
         serialization_alias="routePolicy",
         validation_alias="routePolicy",
@@ -404,7 +404,7 @@ class AddressFamily(BaseModel):
     originate: Optional[Union[Variable, Global[bool], Default[Literal[False]]]] = Field(
         default=None, description="BGP Default Information Variable"
     )
-    name: Optional[Union[Default[None], RefIdItem]] = Field(default=None, description="Table Map Policy name")
+    name: Optional[Union[Default[None], RefIdVariableItem]] = Field(default=None, description="Table Map Policy name")
     filter: Optional[Union[Variable, Global[bool], Default[Literal[False]]]] = Field(
         default=None, description="Table map filtered or not"
     )
@@ -450,7 +450,7 @@ class Ipv6RedistributeItem(BaseModel):
         description="Set the protocol to redistribute routes from. "
         "Transport and Management Protocols don't have a 'omp' option",
     )
-    route_policy: Optional[Union[Default[None], RefIdItem]] = Field(
+    route_policy: Optional[Union[Default[None], RefIdVariableItem]] = Field(
         default=None,
         serialization_alias="routePolicy",
         validation_alias="routePolicy",
@@ -490,7 +490,7 @@ class Ipv6AddressFamily(BaseModel):
     originate: Optional[Union[Variable, Global[bool], Default[Literal[False]]]] = Field(
         default=None, description="BGP Default Information Variable"
     )
-    name: Optional[Union[Default[None], RefIdItem]] = Field(default=None, description="Table Map Policy name")
+    name: Optional[Union[Default[None], RefIdVariableItem]] = Field(default=None, description="Table Map Policy name")
     filter: Optional[Union[Variable, Global[bool], Default[Literal[False]]]] = Field(
         default=None, description="Table map filtered or not"
     )

{catalystwan-0.41.5.dev2 → catalystwan-0.41.5.dev4}/catalystwan/models/configuration/feature_profile/sdwan/routing/ospf.py

@@ -8,7 +8,7 @@ from pydantic import AliasPath, BaseModel, ConfigDict, Field
 
 from catalystwan.api.configuration_groups.parcel import Default, Global, Variable, _ParcelBase, as_default
 from catalystwan.models.common import MetricType
-from catalystwan.models.configuration.feature_profile.common import RefIdItem
+from catalystwan.models.configuration.feature_profile.common import RefIdVariableItem
 
 NetworkType = Literal[
     "broadcast",
@@ -112,7 +112,7 @@ class RedistributedRoute(BaseModel):
 
     protocol: Union[Global[RedistributeProtocolOspf], Variable]
     dia: Optional[Union[Global[bool], Variable, Default[bool]]] = None
-    route_policy: Optional[Union[Default[None], RefIdItem]] = Field(
+    route_policy: Optional[Union[Default[None], RefIdVariableItem]] = Field(
         serialization_alias="routePolicy", validation_alias="routePolicy", default=None
     )
     translate_rib_metric: Optional[Union[Variable, Global[bool], Default[bool]]] = Field(
@@ -167,7 +167,7 @@ class RoutingOspfParcel(_ParcelBase):
         validation_alias=AliasPath("data", "redistribute"), default=None
     )
     router_lsa: Optional[List[RouterLsa]] = Field(validation_alias=AliasPath("data", "routerLsa"), default=None)
-    route_policy: Optional[Union[Default[None], RefIdItem]] = Field(
+    route_policy: Optional[Union[Default[None], RefIdVariableItem]] = Field(
         validation_alias=AliasPath("data", "routePolicy"), default=None
     )
     area: Optional[List[OspfArea]] = Field(validation_alias=AliasPath("data", "area"), default=None)

{catalystwan-0.41.5.dev2 → catalystwan-0.41.5.dev4}/catalystwan/models/configuration/feature_profile/sdwan/routing/ospfv3.py

@@ -7,7 +7,7 @@ from pydantic import AliasPath, BaseModel, ConfigDict, Field
 
 from catalystwan.api.configuration_groups.parcel import Default, Global, Variable, _ParcelBase, as_default
 from catalystwan.models.common import MetricType
-from catalystwan.models.configuration.feature_profile.common import AddressWithMask, RefIdItem
+from catalystwan.models.configuration.feature_profile.common import AddressWithMask, RefIdVariableItem
 
 NetworkType = Literal[
     "broadcast",
@@ -190,7 +190,7 @@ class RedistributedRoute(BaseModel):
     nat_dia: Optional[Union[Global[bool], Variable, Default[bool]]] = Field(
         serialization_alias="natDia", validation_alias="natDia", default=None
     )
-    route_policy: Optional[Union[Default[None], RefIdItem]] = Field(
+    route_policy: Optional[Union[Default[None], RefIdVariableItem]] = Field(
         default=Default[None](value=None),
         serialization_alias="routePolicy",
         validation_alias="routePolicy",
@@ -204,7 +204,7 @@ class RedistributedRouteIPv6(BaseModel):
     model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True, extra="forbid")
 
     protocol: Union[Global[RedistributeProtocolIPv6], Variable]
-    route_policy: Optional[Union[Default[None], RefIdItem]] = Field(
+    route_policy: Optional[Union[Default[None], RefIdVariableItem]] = Field(
         default=Default[None](value=None),
         serialization_alias="routePolicy",
         validation_alias="routePolicy",
@@ -247,7 +247,7 @@ class AdvancedOspfv3Attributes(BaseModel):
         serialization_alias="defaultOriginate", validation_alias="defaultOriginate", default=None
     )
     spf_timers: Optional[SpfTimers] = Field(serialization_alias="spfTimers", validation_alias="spfTimers", default=None)
-    policy_name: Optional[Union[Default[None], RefIdItem]] = Field(
+    policy_name: Optional[Union[Default[None], RefIdVariableItem]] = Field(
         default=Default[None](value=None), serialization_alias="policyName", validation_alias="policyName"
     )
     filter: Optional[Union[Global[bool], Variable, Default[bool]]] = None

{catalystwan-0.41.5.dev2 → catalystwan-0.41.5.dev4}/catalystwan/models/configuration/feature_profile/sdwan/service/eigrp.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.configuration.feature_profile.common import AddressWithMask, RefIdItem
+from catalystwan.models.configuration.feature_profile.common import AddressWithMask, RefIdVariableItem
 
 EigrpAuthType = Literal[
     "md5",
@@ -46,7 +46,7 @@ class EigrpAuthentication(BaseModel):
 class TableMap(BaseModel):
     model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True, extra="forbid")
 
-    name: Optional[Union[Default[None], RefIdItem]] = Default[None](value=None)
+    name: Optional[Union[Default[None], RefIdVariableItem]] = Default[None](value=None)
     filter: Optional[Union[Global[bool], Variable, Default[bool]]] = Default[bool](value=False)
 
 
@@ -70,7 +70,7 @@ class RedistributeIntoEigrp(BaseModel):
     model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True, extra="forbid")
 
     protocol: Union[Global[RedistributeProtocol], Variable]
-    route_policy: Optional[Union[Default[None], RefIdItem]] = Field(
+    route_policy: Optional[Union[Default[None], RefIdVariableItem]] = Field(
         default=Default[None](value=None), serialization_alias="routePolicy", validation_alias="routePolicy"
     )
 

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

@@ -27,6 +27,7 @@ from catalystwan.models.configuration.feature_profile.common import (
     InterfaceEitherIPv4Address,
     InterfaceStaticIPv4Address,
     RefIdItem,
+    RefIdVariableItem,
     StaticIPv4Address,
     StaticIPv4AddressConfig,
     StaticIPv6Address,
@@ -196,16 +197,16 @@ class AclQos(BaseModel):
     shaping_rate: Optional[Union[Global[int], Variable, Default[None]]] = Field(
         serialization_alias="shapingRate", validation_alias="shapingRate", default=None
     )
-    ipv4_acl_egress: Optional[RefIdItem] = Field(
+    ipv4_acl_egress: Optional[RefIdVariableItem] = Field(
         serialization_alias="ipv4AclEgress", validation_alias="ipv4AclEgress", default=None
     )
-    ipv4_acl_ingress: Optional[RefIdItem] = Field(
+    ipv4_acl_ingress: Optional[RefIdVariableItem] = Field(
         serialization_alias="ipv4AclIngress", validation_alias="ipv4AclIngress", default=None
     )
-    ipv6_acl_egress: Optional[RefIdItem] = Field(
+    ipv6_acl_egress: Optional[RefIdVariableItem] = Field(
         serialization_alias="ipv6AclEgress", validation_alias="ipv6AclEgress", default=None
     )
-    ipv6_acl_ingress: Optional[RefIdItem] = Field(
+    ipv6_acl_ingress: Optional[RefIdVariableItem] = Field(
         serialization_alias="ipv6AclIngress", validation_alias="ipv6AclIngress", default=None
     )
 

{catalystwan-0.41.5.dev2 → catalystwan-0.41.5.dev4}/catalystwan/models/configuration/feature_profile/sdwan/service/lan/multilink.py

@@ -12,7 +12,7 @@ from catalystwan.models.configuration.feature_profile.common import (
     MultilinkControllerType,
     MultilinkMethod,
     MultilinkNimList,
-    RefIdItem,
+    RefIdVariableItem,
 )
 
 
@@ -67,10 +67,18 @@ class InterfaceMultilinkParcel(_ParcelBase):
     ip_directed_broadcast: Optional[Union[Default[bool], Global[bool], Variable]] = Field(
         default=None, validation_alias=AliasPath("data", "ipDirectedBroadcast")
     )
-    ipv4_acl_egress: Optional[RefIdItem] = Field(default=None, validation_alias=AliasPath("data", "ipv4AclEgress"))
-    ipv4_acl_ingress: Optional[RefIdItem] = Field(default=None, validation_alias=AliasPath("data", "ipv4AclIngress"))
-    ipv6_acl_egress: Optional[RefIdItem] = Field(default=None, validation_alias=AliasPath("data", "ipv6AclEgress"))
-    ipv6_acl_ingress: Optional[RefIdItem] = Field(default=None, validation_alias=AliasPath("data", "ipv6AclIngress"))
+    ipv4_acl_egress: Optional[RefIdVariableItem] = Field(
+        default=None, validation_alias=AliasPath("data", "ipv4AclEgress")
+    )
+    ipv4_acl_ingress: Optional[RefIdVariableItem] = Field(
+        default=None, validation_alias=AliasPath("data", "ipv4AclIngress")
+    )
+    ipv6_acl_egress: Optional[RefIdVariableItem] = Field(
+        default=None, validation_alias=AliasPath("data", "ipv6AclEgress")
+    )
+    ipv6_acl_ingress: Optional[RefIdVariableItem] = Field(
+        default=None, validation_alias=AliasPath("data", "ipv6AclIngress")
+    )
     mask_ipv4: Optional[Union[Global[SubnetMask], Default[None], Variable]] = Field(
         default=None, validation_alias=AliasPath("data", "maskIpv4")
     )

{catalystwan-0.41.5.dev2 → catalystwan-0.41.5.dev4}/catalystwan/models/configuration/feature_profile/sdwan/service/lan/svi.py

@@ -6,7 +6,12 @@ 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.configuration.feature_profile.common import Arp, RefIdItem, StaticIPv4Address, StaticIPv6Address
+from catalystwan.models.configuration.feature_profile.common import (
+    Arp,
+    RefIdVariableItem,
+    StaticIPv4Address,
+    StaticIPv6Address,
+)
 from catalystwan.models.configuration.feature_profile.sdwan.service.lan.common import (
     VrrpIPv6Address,
     VrrpTrackingObject,
@@ -138,16 +143,16 @@ class IPv6AddressConfiguration(BaseModel):
 class AclQos(BaseModel):
     model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True, extra="forbid")
 
-    ipv4_acl_egress: Optional[RefIdItem] = Field(
+    ipv4_acl_egress: Optional[RefIdVariableItem] = Field(
         serialization_alias="ipv4AclEgress", validation_alias="ipv4AclEgress", default=None
     )
-    ipv4_acl_ingress: Optional[RefIdItem] = Field(
+    ipv4_acl_ingress: Optional[RefIdVariableItem] = Field(
         serialization_alias="ipv4AclIngress", validation_alias="ipv4AclIngress", default=None
     )
-    ipv6_acl_egress: Optional[RefIdItem] = Field(
+    ipv6_acl_egress: Optional[RefIdVariableItem] = Field(
         serialization_alias="ipv6AclEgress", validation_alias="ipv6AclEgress", default=None
     )
-    ipv6_acl_ingress: Optional[RefIdItem] = Field(
+    ipv6_acl_ingress: Optional[RefIdVariableItem] = Field(
         serialization_alias="ipv6AclIngress", validation_alias="ipv6AclIngress", default=None
     )
 

{catalystwan-0.41.5.dev2 → catalystwan-0.41.5.dev4}/catalystwan/models/configuration/feature_profile/sdwan/service/lan/vpn.py

@@ -12,7 +12,7 @@ from catalystwan.models.configuration.feature_profile.common import (
     DNSIPv4,
     DNSIPv6,
     HostMapping,
-    RefIdItem,
+    RefIdVariableItem,
 )
 
 ProtocolIPv4 = Literal[
@@ -139,7 +139,7 @@ class OmpAdvertiseIPv4(BaseModel):
     omp_protocol: Union[Variable, Global[ProtocolIPv4]] = Field(
         serialization_alias="ompProtocol", validation_alias="ompProtocol"
     )
-    route_policy: Optional[Union[Default[None], RefIdItem]] = Field(
+    route_policy: Optional[Union[Default[None], RefIdVariableItem]] = Field(
         serialization_alias="routePolicy", validation_alias="routePolicy", default=None
     )
     prefix_list: Optional[List[IPv4Prefix]] = Field(
@@ -153,7 +153,7 @@ class OmpAdvertiseIPv6(BaseModel):
     omp_protocol: Union[Variable, Global[ProtocolIPv6]] = Field(
         serialization_alias="ompProtocol", validation_alias="ompProtocol"
     )
-    route_policy: Optional[Union[Default[None], RefIdItem]] = Field(
+    route_policy: Optional[Union[Default[None], RefIdVariableItem]] = Field(
         serialization_alias="routePolicy", validation_alias="routePolicy", default=None
     )
     protocol_sub_type: Optional[Union[Variable, Default[None], Global[Literal["External"]]]] = Field(
@@ -486,7 +486,7 @@ class RedistributeToService(BaseModel):
     model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True)
 
     protocol: Union[Variable, Global[RedistributeToServiceProtocol]]
-    policy: Union[Default[None], RefIdItem] = Default[None](value=None)
+    policy: Union[Default[None], RefIdVariableItem] = Default[None](value=None)
 
 
 class RedistributeToGlobal(BaseModel):
@@ -502,7 +502,7 @@ class RouteLeakFromGlobal(BaseModel):
     route_protocol: Union[Variable, Global[RouteLeakFromGlobalProtocol]] = Field(
         serialization_alias="routeProtocol", validation_alias="routeProtocol"
     )
-    route_policy: Optional[Union[Default[None], RefIdItem]] = Field(
+    route_policy: Optional[Union[Default[None], RefIdVariableItem]] = Field(
         serialization_alias="routePolicy", validation_alias="routePolicy", default=None
     )
     redistribute_to_protocol: Optional[List[RedistributeToService]] = Field(
@@ -516,7 +516,7 @@ class RouteLeakFromService(BaseModel):
     route_protocol: Union[Variable, Global[RouteLeakFromServiceProtocol]] = Field(
         serialization_alias="routeProtocol", validation_alias="routeProtocol"
     )
-    route_policy: Optional[Union[Default[None], RefIdItem]] = Field(
+    route_policy: Optional[Union[Default[None], RefIdVariableItem]] = Field(
         serialization_alias="routePolicy", validation_alias="routePolicy", default=None
     )
     redistribute_to_protocol: Optional[List[RedistributeToService]] = Field(
@@ -531,7 +531,7 @@ class RouteLeakBetweenServices(BaseModel):
     route_protocol: Union[Variable, Global[RouteLeakFromServiceProtocol]] = Field(
         serialization_alias="routeProtocol", validation_alias="routeProtocol"
     )
-    route_policy: Optional[Union[Default[None], RefIdItem]] = Field(
+    route_policy: Optional[Union[Default[None], RefIdVariableItem]] = Field(
         serialization_alias="routePolicy", validation_alias="routePolicy", default=None
     )
     redistribute_to_protocol: Optional[List[RedistributeToService]] = Field(

{catalystwan-0.41.5.dev2 → catalystwan-0.41.5.dev4}/catalystwan/models/configuration/feature_profile/sdwan/transport/wan/interface/multilink.py

@@ -13,7 +13,7 @@ from catalystwan.models.configuration.feature_profile.common import (
     MultilinkMethod,
     MultilinkNimList,
     MultiRegionFabric,
-    RefIdItem,
+    RefIdVariableItem,
 )
 
 
@@ -128,10 +128,18 @@ class InterfaceMultilinkParcel(_ParcelBase):
     ipsec_weight: Optional[Union[Variable, Default[int], Global[int]]] = Field(
         default=None, validation_alias=AliasPath("data", "ipsecWeight")
     )
-    ipv4_acl_egress: Optional[RefIdItem] = Field(default=None, validation_alias=AliasPath("data", "ipv4AclEgress"))
-    ipv4_acl_ingress: Optional[RefIdItem] = Field(default=None, validation_alias=AliasPath("data", "ipv4AclIngress"))
-    ipv6_acl_egress: Optional[RefIdItem] = Field(default=None, validation_alias=AliasPath("data", "ipv6AclEgress"))
-    ipv6_acl_ingress: Optional[RefIdItem] = Field(default=None, validation_alias=AliasPath("data", "ipv6AclIngress"))
+    ipv4_acl_egress: Optional[RefIdVariableItem] = Field(
+        default=None, validation_alias=AliasPath("data", "ipv4AclEgress")
+    )
+    ipv4_acl_ingress: Optional[RefIdVariableItem] = Field(
+        default=None, validation_alias=AliasPath("data", "ipv4AclIngress")
+    )
+    ipv6_acl_egress: Optional[RefIdVariableItem] = Field(
+        default=None, validation_alias=AliasPath("data", "ipv6AclEgress")
+    )
+    ipv6_acl_ingress: Optional[RefIdVariableItem] = Field(
+        default=None, validation_alias=AliasPath("data", "ipv6AclIngress")
+    )
     last_resort_circuit: Optional[Union[Variable, Global[bool], Default[bool]]] = Field(
         default=None, validation_alias=AliasPath("data", "lastResortCircuit")
     )

{catalystwan-0.41.5.dev2 → catalystwan-0.41.5.dev4}/catalystwan/models/configuration/feature_profile/sdwan/transport/wan/interface/t1e1serial.py

@@ -13,7 +13,7 @@ from catalystwan.models.configuration.feature_profile.common import (
     AllowService,
     Encapsulation,
     MultiRegionFabric,
-    RefIdItem,
+    RefIdVariableItem,
 )
 
 EncapsulationSerial = Literal[
@@ -93,16 +93,16 @@ class AclQos(BaseModel):
         extra="forbid",
         populate_by_name=True,
     )
-    ipv4_acl_egress: Optional[RefIdItem] = Field(
+    ipv4_acl_egress: Optional[RefIdVariableItem] = Field(
         default=None, validation_alias="ipv4AclEgress", serialization_alias="ipv4AclEgress"
     )
-    ipv4_acl_ingress: Optional[RefIdItem] = Field(
+    ipv4_acl_ingress: Optional[RefIdVariableItem] = Field(
         default=None, validation_alias="ipv4AclIngress", serialization_alias="ipv4AclIngress"
     )
-    ipv6_acl_egress: Optional[RefIdItem] = Field(
+    ipv6_acl_egress: Optional[RefIdVariableItem] = Field(
         default=None, validation_alias="ipv6AclEgress", serialization_alias="ipv6AclEgress"
     )
-    ipv6_acl_ingress: Optional[RefIdItem] = Field(
+    ipv6_acl_ingress: Optional[RefIdVariableItem] = Field(
         default=None, validation_alias="ipv6AclIngress", serialization_alias="ipv6AclIngress"
     )
     shaping_rate: Optional[Union[Global[int], Variable, Default[None]]] = Field(

{catalystwan-0.41.5.dev2 → catalystwan-0.41.5.dev4}/catalystwan/models/configuration/network_hierarchy/cflowd.py

@@ -38,6 +38,9 @@ class Collectors(BaseModel):
         default=Global[int](value=4739), validation_alias="udpPort", serialization_alias="udpPort"
     )
     vpn_id: Optional[Global[int]] = Field(default=None, validation_alias="vpnId", serialization_alias="vpnId")
+    source_interface: Optional[Global[str]] = Field(
+        default=None, validation_alias="sourceInterface", serialization_alias="sourceInterface"
+    )
 
 
 class CflowdParcel(_ParcelBase):
@@ -85,6 +88,7 @@ class CflowdParcel(_ParcelBase):
         export_spread: Optional[bool] = False,
         udp_port: Optional[int] = 4739,
         vpn_id: Optional[int] = None,
+        source_interface: Optional[str] = None,
     ):
         if self.collectors is None:
             self.collectors = []
@@ -106,6 +110,7 @@ class CflowdParcel(_ParcelBase):
                 export_spread=as_optional_global(export_spread),
                 bfd_metrics_export=as_optional_global(bfd_metrics_export),
                 export_interval=as_optional_global(export_interval),
+                source_interface=as_optional_global(source_interface),
             )
         )