catalystwan 0.41.2.dev9__py3-none-any.whl → 0.41.3__py3-none-any.whl

catalystwan/models/configuration/feature_profile/sdwan/management/vpn.py

@@ -0,0 +1,26 @@
+# Copyright 2024 Cisco Systems, Inc. and its affiliates
+
+from typing import Any, List, Optional
+
+from pydantic import BaseModel, Field
+
+from catalystwan.api.configuration_groups.parcel import Default
+from catalystwan.models.configuration.feature_profile.common import (
+    DNSIPv4,
+    DNSIPv6,
+    HostMapping,
+    WANIPv4StaticRoute,
+    WANIPv6StaticRoute,
+)
+
+
+class ManagementVPN(BaseModel):
+    # TODO (mlembke): vpn_id can't have other value, it needs to be constant. How to do that?
+    vpn_id: Default[int] = Field(default=Default(value=512), frozen=True, alias="vpnId")
+    ipv4_routes: Optional[List[WANIPv4StaticRoute]] = Field(default=None, alias="ipv4Route")
+    ipv6_routes: Optional[List[WANIPv6StaticRoute]] = Field(default=None, alias="ipv6Route")
+    dns_ipv4: Optional[DNSIPv4] = Field(default=None, alias="dnsIpv4")
+    dns_ipv6: Optional[DNSIPv6] = Field(default=None, alias="dnsIpv6")
+    new_host_mapping: Optional[List[HostMapping]] = Field(default=None, alias="newHostMapping")
+    # TODO (mlembke): add interfaces
+    interface: Optional[Any] = Field(default=None)

catalystwan/models/configuration/feature_profile/sdwan/policy_object/__init__.py

@@ -1,30 +1,24 @@
 # Copyright 2024 Cisco Systems, Inc. and its affiliates
 
-from typing import List, Union
+from typing import List, Mapping, Union
 
 from pydantic import Field
 from typing_extensions import Annotated
 
-from .policy.app_probe import AppProbeEntry, AppProbeMapItem, AppProbeParcel
+from .policy.app_probe import AppProbeMapItem, AppProbeParcel
 from .policy.application_list import ApplicationFamilyListEntry, ApplicationListEntry, ApplicationListParcel
-from .policy.as_path import AsPathParcel
 from .policy.color_list import ColorEntry, ColorParcel
 from .policy.data_prefix import DataPrefixEntry, DataPrefixParcel
 from .policy.expanded_community_list import ExpandedCommunityParcel
-from .policy.extended_community import ExtendedCommunityParcel
 from .policy.fowarding_class import FowardingClassParcel, FowardingClassQueueEntry
 from .policy.ipv6_data_prefix import IPv6DataPrefixEntry, IPv6DataPrefixParcel
 from .policy.ipv6_prefix_list import IPv6PrefixListEntry, IPv6PrefixListParcel
-from .policy.mirror import MirrorParcel
-from .policy.policer import PolicerEntry, PolicerParcel
+from .policy.policier import PolicierEntry, PolicierParcel
 from .policy.prefered_group_color import Preference, PreferredColorGroupEntry, PreferredColorGroupParcel
 from .policy.prefix_list import PrefixListEntry, PrefixListParcel
-from .policy.service_object_group import ServiceObjectGroupParcel
-from .policy.sla_class import FallbackBestTunnel, SLAClassCriteria, SLAClassListEntry, SLAClassParcel
+from .policy.sla_class import FallbackBestTunnel, SLAAppProbeClass, SLAClassCriteria, SLAClassListEntry, SLAClassParcel
 from .policy.standard_community import StandardCommunityEntry, StandardCommunityParcel
 from .policy.tloc_list import TlocEntry, TlocParcel
-from .security.aip import AdvancedInspectionProfileParcel
-from .security.amp import AdvancedMalwareProtectionParcel
 from .security.application_list import (
     SecurityApplicationFamilyListEntry,
     SecurityApplicationListEntry,
@@ -33,85 +27,91 @@ from .security.application_list import (
 from .security.data_prefix import SecurityDataPrefixEntry, SecurityDataPrefixParcel
 from .security.fqdn import FQDNDomainParcel, FQDNListEntry
 from .security.geolocation_list import GeoLocationListEntry, GeoLocationListParcel
-from .security.identity import IdentityEntry, IdentityParcel
-from .security.intrusion_prevention import IntrusionPreventionParcel
 from .security.ips_signature import IPSSignatureListEntry, IPSSignatureParcel
 from .security.local_domain import LocalDomainListEntry, LocalDomainParcel
-from .security.object_group import SecurityObjectGroupEntries, SecurityObjectGroupParcel
 from .security.protocol_list import ProtocolListEntry, ProtocolListParcel
-from .security.scalable_group_tag import ScalableGroupTagEntry, ScalableGroupTagParcel
 from .security.security_port import SecurityPortListEntry, SecurityPortParcel
-from .security.ssl_decryption import SslDecryptionParcel
-from .security.ssl_decryption_profile import SslDecryptionProfileParcel
-from .security.url import BaseURLListEntry, URLParcel
-from .security.url_filtering import UrlFilteringParcel
+from .security.url import BaseURLListEntry, URLAllowParcel, URLBlockParcel
 from .security.zone import SecurityZoneListEntry, SecurityZoneListParcel
 
 AnyPolicyObjectParcel = Annotated[
     Union[
-        AdvancedInspectionProfileParcel,
-        AdvancedMalwareProtectionParcel,
         AppProbeParcel,
         ApplicationListParcel,
-        AsPathParcel,
         ColorParcel,
         DataPrefixParcel,
         ExpandedCommunityParcel,
-        ExtendedCommunityParcel,
-        FQDNDomainParcel,
         FowardingClassParcel,
-        GeoLocationListParcel,
-        IPSSignatureParcel,
         IPv6DataPrefixParcel,
         IPv6PrefixListParcel,
-        IdentityParcel,
-        IntrusionPreventionParcel,
-        LocalDomainParcel,
-        MirrorParcel,
-        PolicerParcel,
-        PreferredColorGroupParcel,
         PrefixListParcel,
-        ProtocolListParcel,
+        PolicierParcel,
+        PreferredColorGroupParcel,
         SLAClassParcel,
-        ScalableGroupTagParcel,
-        SecurityApplicationListParcel,
-        SecurityDataPrefixParcel,
+        TlocParcel,
+        StandardCommunityParcel,
+        LocalDomainParcel,
+        FQDNDomainParcel,
+        IPSSignatureParcel,
+        URLAllowParcel,
+        URLBlockParcel,
         SecurityPortParcel,
+        ProtocolListParcel,
+        GeoLocationListParcel,
         SecurityZoneListParcel,
-        ServiceObjectGroupParcel,
-        SslDecryptionParcel,
-        SslDecryptionProfileParcel,
-        StandardCommunityParcel,
-        TlocParcel,
-        URLParcel,
-        UrlFilteringParcel,
+        SecurityApplicationListParcel,
+        SecurityDataPrefixParcel,
     ],
-    Field(discriminator="type_"),
+    Field(discriminator="type"),
 ]
 
+POLICY_OBJECT_PAYLOAD_ENDPOINT_MAPPING: Mapping[type, str] = {
+    AppProbeParcel: "app-probe",
+    ApplicationListParcel: "app-list",
+    ColorParcel: "color",
+    DataPrefixParcel: "data-prefix",
+    ExpandedCommunityParcel: "expanded-community",
+    FowardingClassParcel: "class",
+    IPv6DataPrefixParcel: "data-ipv6-prefix",
+    IPv6PrefixListParcel: "ipv6-prefix",
+    PrefixListParcel: "prefix",
+    PolicierParcel: "policer",
+    PreferredColorGroupParcel: "preferred-color-group",
+    SLAClassParcel: "sla-class",
+    TlocParcel: "tloc",
+    StandardCommunityParcel: "standard-community",
+    LocalDomainParcel: "security-localdomain",
+    FQDNDomainParcel: "security-fqdn",
+    IPSSignatureParcel: "security-ipssignature",
+    URLAllowParcel: "security-urllist",
+    URLBlockParcel: "security-urllist",
+    SecurityPortParcel: "security-port",
+    ProtocolListParcel: "security-protocolname",
+    GeoLocationListParcel: "security-geolocation",
+    SecurityZoneListParcel: "security-zone",
+    SecurityApplicationListParcel: "security-localapp",
+    SecurityDataPrefixParcel: "security-data-ip-prefix",
+}
+
 __all__ = (
-    "AdvancedInspectionProfileParcel",
-    "AdvancedMalwareProtectionParcel",
     "AnyPolicyObjectParcel",
-    "AppProbeEntry",
-    "AppProbeMapItem",
-    "AppProbeParcel",
     "ApplicationFamilyListEntry",
     "ApplicationListEntry",
     "ApplicationListParcel",
-    "AsPathParcel",
+    "AppProbeEntry",
+    "AppProbeMapItem",
+    "AppProbeParcel",
     "BaseURLListEntry",
     "ColorEntry",
     "ColorParcel",
     "DataPrefixEntry",
     "DataPrefixParcel",
     "ExpandedCommunityParcel",
-    "ExtendedCommunityParcel",
-    "FQDNDomainParcel",
-    "FQDNListEntry",
     "FallbackBestTunnel",
     "FowardingClassParcel",
     "FowardingClassQueueEntry",
+    "FQDNDomainParcel",
+    "FQDNListEntry",
     "GeoLocationListEntry",
     "GeoLocationListParcel",
     "IPSSignatureListEntry",
@@ -120,14 +120,10 @@ __all__ = (
     "IPv6DataPrefixParcel",
     "IPv6PrefixListEntry",
     "IPv6PrefixListParcel",
-    "IdentityEntry",
-    "IdentityParcel",
-    "IntrusionPreventionParcel",
     "LocalDomainListEntry",
     "LocalDomainParcel",
-    "MirrorParcel",
-    "PolicerEntry",
-    "PolicerParcel",
+    "PolicierEntry",
+    "PolicierParcel",
     "Preference",
     "PreferredColorGroupEntry",
     "PreferredColorGroupParcel",
@@ -135,30 +131,25 @@ __all__ = (
     "PrefixListParcel",
     "ProtocolListEntry",
     "ProtocolListParcel",
-    "SLAClassCriteria",
-    "SLAClassListEntry",
-    "SLAClassParcel",
-    "ScalableGroupTagEntry",
-    "ScalableGroupTagParcel",
     "SecurityApplicationFamilyListEntry",
     "SecurityApplicationListEntry",
     "SecurityApplicationListParcel",
     "SecurityDataPrefixEntry",
     "SecurityDataPrefixParcel",
-    "SecurityObjectGroupEntries",
-    "SecurityObjectGroupParcel",
     "SecurityPortListEntry",
     "SecurityPortParcel",
     "SecurityZoneListEntry",
     "SecurityZoneListParcel",
-    "ServiceObjectGroupParcel",
-    "SslDecryptionParcel",
-    "SslDecryptionProfileParcel",
+    "SLAAppProbeClass",
+    "SLAClassCriteria",
+    "SLAClassListEntry",
+    "SLAClassParcel",
     "StandardCommunityEntry",
     "StandardCommunityParcel",
     "TlocEntry",
     "TlocParcel",
-    "URLParcel",
+    "URLAllowParcel",
+    "URLBlockParcel",
 )
 
 

catalystwan/models/configuration/feature_profile/sdwan/policy_object/policy/app_probe.py

@@ -1,56 +1,42 @@
 # Copyright 2024 Cisco Systems, Inc. and its affiliates
 
-from typing import List, Literal, Optional, Union
-from uuid import UUID
+from typing import List
 
-from pydantic import AliasPath, BaseModel, ConfigDict, Field
+from pydantic import AliasPath, BaseModel, ConfigDict, Field, field_validator
 
-from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, _ParcelEntry, as_global, as_optional_global
+from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, as_global
 from catalystwan.models.common import TLOCColor
-from catalystwan.models.configuration.feature_profile.common import RefIdItem
 
 
 class AppProbeMapItem(BaseModel):
     color: Global[TLOCColor]
-    dscp: Optional[Global[int]] = Field(default=None)
+    dscp: Global[int]
 
+    @field_validator("dscp")
+    @classmethod
+    def check_rate(cls, dscp: Global):
+        assert 0 <= int(dscp.value) <= 63
+        return dscp
 
-class AppProbeEntry(_ParcelEntry):
+
+class AppProbeEntry(BaseModel):
     model_config = ConfigDict(populate_by_name=True)
-    map: List[AppProbeMapItem] = Field(default_factory=list)
-    forwarding_class: Union[Global[str], RefIdItem] = Field(
-        validation_alias="forwardingClass",
-        serialization_alias="forwardingClass",
-        description="RefId option introduced in 20.14",
+    map: List[AppProbeMapItem] = Field(default=[])
+    forwarding_class_name: Global[str] = Field(
+        serialization_alias="forwardingClass", validation_alias="forwardingClass"
     )
 
 
 class AppProbeParcel(_ParcelBase):
-    model_config = ConfigDict(populate_by_name=True)
-    type_: Literal["app-probe"] = Field(default="app-probe", exclude=True)
-    entries: List[AppProbeEntry] = Field(default_factory=list, validation_alias=AliasPath("data", "entries"))
-
-    def _insert_entry(self, entry: AppProbeEntry) -> None:
-        if self.entries:
-            self.entries[0] = entry
-        else:
-            self.entries.append(entry)
-
-    def set_fowarding_class_name(self, name: str):
-        self._insert_entry(
-            AppProbeEntry(
-                forwarding_class=as_global(name),
-            )
-        )
+    entries: List[AppProbeEntry] = Field(default=[], validation_alias=AliasPath("data", "entries"))
 
-    def set_fowarding_class_id(self, id: UUID):
-        # use only for version >= 20.14
-        self._insert_entry(
+    def add_fowarding_class(self, forwarding_class_name: str):
+        self.entries.append(
             AppProbeEntry(
-                forwarding_class=RefIdItem.from_uuid(id),
+                forwarding_class_name=as_global(forwarding_class_name),
             )
         )
 
-    def add_map(self, color: TLOCColor, dscp: Optional[int] = None):
+    def add_map(self, color: TLOCColor, dscp: int):
         entry = self.entries[0]
-        entry.map.append(AppProbeMapItem(color=as_global(color, TLOCColor), dscp=as_optional_global(dscp)))
+        entry.map.append(AppProbeMapItem(color=as_global(color, TLOCColor), dscp=as_global(dscp)))

catalystwan/models/configuration/feature_profile/sdwan/policy_object/policy/application_list.py

@@ -1,27 +1,25 @@
 # Copyright 2024 Cisco Systems, Inc. and its affiliates
 
-from typing import List, Literal, Union
+from typing import List, Union
 
-from pydantic import AliasPath, ConfigDict, Field
+from pydantic import AliasPath, BaseModel, ConfigDict, Field
 
-from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, _ParcelEntry, as_global
+from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, as_global
 
 
-class ApplicationListEntry(_ParcelEntry):
+class ApplicationListEntry(BaseModel):
     model_config = ConfigDict(populate_by_name=True)
     app_list: Global[str] = Field(serialization_alias="app", validation_alias="app")
 
 
-class ApplicationFamilyListEntry(_ParcelEntry):
+class ApplicationFamilyListEntry(BaseModel):
     model_config = ConfigDict(populate_by_name=True)
     app_list_family: Global[str] = Field(serialization_alias="appFamily", validation_alias="appFamily")
 
 
 class ApplicationListParcel(_ParcelBase):
-    model_config = ConfigDict(populate_by_name=True)
-    type_: Literal["app-list"] = Field(default="app-list", exclude=True)
     entries: List[Union[ApplicationListEntry, ApplicationFamilyListEntry]] = Field(
-        default_factory=list, validation_alias=AliasPath("data", "entries")
+        default=[], validation_alias=AliasPath("data", "entries")
     )
 
     def add_application(self, application: str):

catalystwan/models/configuration/feature_profile/sdwan/policy_object/policy/color_list.py

@@ -1,21 +1,19 @@
 # Copyright 2024 Cisco Systems, Inc. and its affiliates
 
-from typing import List, Literal
+from typing import List
 
-from pydantic import AliasPath, ConfigDict, Field
+from pydantic import AliasPath, BaseModel, Field
 
-from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, _ParcelEntry, as_global
+from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, as_global
 from catalystwan.models.common import TLOCColor
 
 
-class ColorEntry(_ParcelEntry):
+class ColorEntry(BaseModel):
     color: Global[TLOCColor]
 
 
 class ColorParcel(_ParcelBase):
-    model_config = ConfigDict(populate_by_name=True)
-    type_: Literal["color"] = Field(default="color", exclude=True)
-    entries: List[ColorEntry] = Field(default_factory=list, validation_alias=AliasPath("data", "entries"))
+    entries: List[ColorEntry] = Field(default=[], validation_alias=AliasPath("data", "entries"))
 
     def add_color(self, color: TLOCColor):
         self.entries.append(ColorEntry(color=as_global(color, TLOCColor)))

catalystwan/models/configuration/feature_profile/sdwan/policy_object/policy/data_prefix.py

@@ -1,29 +1,20 @@
 # Copyright 2024 Cisco Systems, Inc. and its affiliates
 
 from ipaddress import IPv4Address, IPv4Network
-from typing import List, Literal
+from typing import List
 
-from pydantic import AliasPath, ConfigDict, Field
+from pydantic import AliasPath, BaseModel, ConfigDict, Field
 
-from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, _ParcelEntry, as_global
+from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, as_global
 
 
-class DataPrefixEntry(_ParcelEntry):
+class DataPrefixEntry(BaseModel):
     model_config = ConfigDict(populate_by_name=True)
     ipv4_address: Global[IPv4Address] = Field(serialization_alias="ipv4Address", validation_alias="ipv4Address")
     ipv4_prefix_length: Global[int] = Field(serialization_alias="ipv4PrefixLength", validation_alias="ipv4PrefixLength")
 
-    @staticmethod
-    def from_ipv4_network(ipv4_network: IPv4Network) -> "DataPrefixEntry":
-        return DataPrefixEntry(
-            ipv4_address=as_global(ipv4_network.network_address),
-            ipv4_prefix_length=as_global(ipv4_network.prefixlen),
-        )
-
 
 class DataPrefixParcel(_ParcelBase):
-    model_config = ConfigDict(populate_by_name=True)
-    type_: Literal["data-prefix"] = Field(default="data-prefix", exclude=True)
     entries: List[DataPrefixEntry] = Field(default_factory=list, validation_alias=AliasPath("data", "entries"))
 
     def add_data_prefix(self, ipv4_network: IPv4Network):

catalystwan/models/configuration/feature_profile/sdwan/policy_object/policy/expanded_community_list.py

@@ -1,25 +1,23 @@
 # Copyright 2024 Cisco Systems, Inc. and its affiliates
 
-from typing import List, Literal
-
 from pydantic import AliasPath, ConfigDict, Field, field_validator
 
-from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase
+from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, as_global
 
 
 class ExpandedCommunityParcel(_ParcelBase):
     model_config = ConfigDict(populate_by_name=True)
-    type_: Literal["expanded-community"] = Field(default="expanded-community", exclude=True)
-    expanded_community_list: Global[List[str]] = Field(
-        default=Global[List[str]](value=list()),
+    expandedCommunityList: Global[list] = Field(
+        default=as_global([]),
+        serialization_alias="expandedCommunityList",
         validation_alias=AliasPath("data", "expandedCommunityList"),
     )
 
     def add_community(self, expanded_community: str):
-        self.expanded_community_list.value.append(expanded_community)
+        self.expandedCommunityList.value.append(expanded_community)
 
-    @field_validator("expanded_community_list")
+    @field_validator("expandedCommunityList")
     @classmethod
-    def check_list_str(cls, expanded_community_list: Global):
+    def check_rate(cls, expanded_community_list: Global):
         assert all([isinstance(ec, str) for ec in expanded_community_list.value])
         return expanded_community_list

catalystwan/models/configuration/feature_profile/sdwan/policy_object/policy/fowarding_class.py

@@ -1,13 +1,13 @@
 # Copyright 2024 Cisco Systems, Inc. and its affiliates
 
-from typing import List, Literal
+from typing import List
 
-from pydantic import AliasPath, ConfigDict, Field, field_validator
+from pydantic import AliasPath, BaseModel, Field, field_validator
 
-from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, _ParcelEntry, as_global
+from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, as_global
 
 
-class FowardingClassQueueEntry(_ParcelEntry):
+class FowardingClassQueueEntry(BaseModel):
     queue: Global[str]
 
     @field_validator("queue")
@@ -18,9 +18,7 @@ class FowardingClassQueueEntry(_ParcelEntry):
 
 
 class FowardingClassParcel(_ParcelBase):
-    model_config = ConfigDict(populate_by_name=True)
-    type_: Literal["class"] = Field(default="class", exclude=True)
-    entries: List[FowardingClassQueueEntry] = Field(default_factory=list, validation_alias=AliasPath("data", "entries"))
+    entries: List[FowardingClassQueueEntry] = Field(default=[], validation_alias=AliasPath("data", "entries"))
 
     def add_queue(self, queue: int):
         self.entries.append(FowardingClassQueueEntry(queue=as_global(str(queue))))

catalystwan/models/configuration/feature_profile/sdwan/policy_object/policy/ipv6_data_prefix.py

@@ -1,28 +1,26 @@
 # Copyright 2024 Cisco Systems, Inc. and its affiliates
 
-from ipaddress import IPv6Address, IPv6Interface
-from typing import List, Literal
+from ipaddress import IPv6Address, IPv6Network
+from typing import List
 
-from pydantic import AliasPath, ConfigDict, Field
+from pydantic import AliasPath, BaseModel, ConfigDict, Field
 
-from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, _ParcelEntry, as_global
+from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, as_global
 
 
-class IPv6DataPrefixEntry(_ParcelEntry):
+class IPv6DataPrefixEntry(BaseModel):
     model_config = ConfigDict(populate_by_name=True)
     ipv6_address: Global[IPv6Address] = Field(serialization_alias="ipv6Address", validation_alias="ipv6Address")
     ipv6_prefix_length: Global[int] = Field(serialization_alias="ipv6PrefixLength", validation_alias="ipv6PrefixLength")
 
 
 class IPv6DataPrefixParcel(_ParcelBase):
-    model_config = ConfigDict(populate_by_name=True)
-    type_: Literal["data-ipv6-prefix"] = Field(default="data-ipv6-prefix", exclude=True)
-    entries: List[IPv6DataPrefixEntry] = Field(default_factory=list, validation_alias=AliasPath("data", "entries"))
+    entries: List[IPv6DataPrefixEntry] = Field(default=[], validation_alias=AliasPath("data", "entries"))
 
-    def add_prefix(self, ipv6_network: IPv6Interface):
+    def add_prefix(self, ipv6_network: IPv6Network):
         self.entries.append(
             IPv6DataPrefixEntry(
-                ipv6_address=as_global(ipv6_network.network.network_address),
-                ipv6_prefix_length=as_global(ipv6_network.network.prefixlen),
+                ipv6_address=as_global(ipv6_network.network_address),
+                ipv6_prefix_length=as_global(ipv6_network.prefixlen),
             )
         )

catalystwan/models/configuration/feature_profile/sdwan/policy_object/policy/ipv6_prefix_list.py

@@ -1,41 +1,26 @@
 # Copyright 2024 Cisco Systems, Inc. and its affiliates
 
-from ipaddress import IPv6Address, IPv6Interface
-from typing import List, Literal, Optional
+from ipaddress import IPv6Address, IPv6Network
+from typing import List
 
-from pydantic import AliasPath, ConfigDict, Field
+from pydantic import AliasPath, BaseModel, ConfigDict, Field
 
-from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, _ParcelEntry
-from catalystwan.models.common import Ipv6GePrefixRangeLen, Ipv6LePrefixRangeLen, Ipv6PrefixLen
+from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, as_global
 
 
-class IPv6PrefixListEntry(_ParcelEntry):
+class IPv6PrefixListEntry(BaseModel):
     model_config = ConfigDict(populate_by_name=True)
     ipv6_address: Global[IPv6Address] = Field(serialization_alias="ipv6Address", validation_alias="ipv6Address")
-    ipv6_prefix_length: Global[Ipv6PrefixLen] = Field(
-        serialization_alias="ipv6PrefixLength", validation_alias="ipv6PrefixLength", ge=0, le=128
-    )
-    le_range_prefix_length: Optional[Global[Ipv6LePrefixRangeLen]] = Field(
-        default=None, serialization_alias="leRangePrefixLength", validation_alias="leRangePrefixLength"
-    )
-    ge_range_prefix_length: Optional[Global[Ipv6GePrefixRangeLen]] = Field(
-        default=None, serialization_alias="geRangePrefixLength", validation_alias="geRangePrefixLength"
-    )
+    ipv6_prefix_length: Global[int] = Field(serialization_alias="ipv6PrefixLength", validation_alias="ipv6PrefixLength")
 
 
 class IPv6PrefixListParcel(_ParcelBase):
-    model_config = ConfigDict(populate_by_name=True)
-    type_: Literal["ipv6-prefix"] = Field(default="ipv6-prefix", exclude=True)
-    entries: List[IPv6PrefixListEntry] = Field(default_factory=list, validation_alias=AliasPath("data", "entries"))
+    entries: List[IPv6PrefixListEntry] = Field(default=[], validation_alias=AliasPath("data", "entries"))
 
-    def add_prefix(self, ipv6_network: IPv6Interface, ge: Optional[int] = None, le: Optional[int] = None):
-        le_ = Global[Ipv6LePrefixRangeLen](value=le) if le is not None else None
-        ge_ = Global[Ipv6GePrefixRangeLen](value=ge) if ge is not None else None
+    def add_prefix(self, ipv6_network: IPv6Network):
         self.entries.append(
             IPv6PrefixListEntry(
-                ipv6_address=Global[IPv6Address](value=ipv6_network.network.network_address),
-                ipv6_prefix_length=Global[Ipv6PrefixLen](value=ipv6_network.network.prefixlen),
-                le_range_prefix_length=le_,
-                ge_range_prefix_length=ge_,
+                ipv6_address=as_global(ipv6_network.network_address),
+                ipv6_prefix_length=as_global(ipv6_network.prefixlen),
             )
         )

catalystwan/models/configuration/feature_profile/sdwan/policy_object/policy/{policer.py → policier.py}

@@ -1,14 +1,14 @@
 # Copyright 2024 Cisco Systems, Inc. and its affiliates
 
-from typing import List, Literal
+from typing import List
 
-from pydantic import AliasPath, ConfigDict, Field, field_validator
+from pydantic import AliasPath, BaseModel, ConfigDict, Field, field_validator
 
-from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, _ParcelEntry, as_global
-from catalystwan.models.policy.list.policer import PolicerExceedAction
+from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, as_global
+from catalystwan.models.policy.lists_entries import PolicerExceedAction
 
 
-class PolicerEntry(_ParcelEntry):
+class PolicierEntry(BaseModel):
     model_config = ConfigDict(populate_by_name=True)
     burst: Global[int]
     exceed: Global[PolicerExceedAction]
@@ -16,25 +16,23 @@ class PolicerEntry(_ParcelEntry):
 
     @field_validator("burst")
     @classmethod
-    def check_burst(cls, burst_str: Global[int]):
+    def check_burst(cls, burst_str: Global):
         assert 15000 <= burst_str.value <= 10_000_000
         return burst_str
 
     @field_validator("rate")
     @classmethod
-    def check_rate(cls, rate_str: Global[int]):
+    def check_rate(cls, rate_str: Global):
         assert 8 <= rate_str.value <= 100_000_000_000
         return rate_str
 
 
-class PolicerParcel(_ParcelBase):
-    model_config = ConfigDict(populate_by_name=True)
-    type_: Literal["policer"] = Field(default="policer", exclude=True)
-    entries: List[PolicerEntry] = Field(default_factory=list, validation_alias=AliasPath("data", "entries"))
+class PolicierParcel(_ParcelBase):
+    entries: List[PolicierEntry] = Field(default=[], validation_alias=AliasPath("data", "entries"))
 
     def add_entry(self, burst: int, exceed: PolicerExceedAction, rate: int):
         self.entries.append(
-            PolicerEntry(
+            PolicierEntry(
                 burst=as_global(burst),
                 exceed=as_global(exceed, PolicerExceedAction),
                 rate=as_global(rate),