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

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

@@ -1,30 +1,23 @@
 # Copyright 2024 Cisco Systems, Inc. and its affiliates
 
-from typing import List, Literal, Optional
+from typing import List, Optional
 
-from pydantic import AliasPath, BaseModel, ConfigDict, Field, field_validator, model_validator
+from pydantic import AliasPath, BaseModel, ConfigDict, Field, model_validator
 
-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
-
-PathPreference = Literal[
-    "direct-path",
-    "multi-hop-path",
-    "all-paths",
-]
+from catalystwan.models.policy.lists_entries import PathPreference
 
 
 class Preference(BaseModel):
     model_config = ConfigDict(populate_by_name=True)
-    color_preference: Global[List[TLOCColor]] = Field(
-        serialization_alias="colorPreference", validation_alias="colorPreference"
-    )
+    color_preference: Global[list] = Field(serialization_alias="colorPreference", validation_alias="colorPreference")
     path_preference: Global[PathPreference] = Field(
         serialization_alias="pathPreference", validation_alias="pathPreference"
     )
 
 
-class PreferredColorGroupEntry(_ParcelEntry):
+class PreferredColorGroupEntry(BaseModel):
     model_config = ConfigDict(populate_by_name=True)
     primary_preference: Preference = Field(
         serialization_alias="primaryPreference", validation_alias="primaryPreference"
@@ -42,25 +35,15 @@ class PreferredColorGroupEntry(_ParcelEntry):
             raise ValueError("Preference Entry has to have a secondary prefrence when assigning tertiary preference.")
         return self
 
-    @field_validator("secondary_preference", "tertiary_preference", mode="before")
-    @classmethod
-    def remove_empty_preferences(cls, value):
-        """handle a situation when server returns empty json object: '{}'"""
-        if not value:
-            return None
-        return value
-
 
 class PreferredColorGroupParcel(_ParcelBase):
-    model_config = ConfigDict(populate_by_name=True)
-    type_: Literal["preferred-color-group"] = Field(default="preferred-color-group", exclude=True)
-    entries: List[PreferredColorGroupEntry] = Field(default_factory=list, validation_alias=AliasPath("data", "entries"))
+    entries: List[PreferredColorGroupEntry] = Field(default=[], validation_alias=AliasPath("data", "entries"))
 
     def add_primary(self, color_preference: List[TLOCColor], path_preference: PathPreference):
         self.entries.append(
             PreferredColorGroupEntry(
                 primary_preference=Preference(
-                    color_preference=Global[List[TLOCColor]](value=color_preference),
+                    color_preference=as_global(color_preference),
                     path_preference=as_global(path_preference, PathPreference),
                 ),
                 secondary_preference=None,
@@ -71,13 +54,11 @@ class PreferredColorGroupParcel(_ParcelBase):
     def add_secondary(self, color_preference: List[TLOCColor], path_preference: PathPreference):
         preferred_color = self.entries[0]
         preferred_color.secondary_preference = Preference(
-            color_preference=Global[List[TLOCColor]](value=color_preference),
-            path_preference=as_global(path_preference, PathPreference),
+            color_preference=as_global(color_preference), path_preference=as_global(path_preference, PathPreference)
         )
 
     def add_tertiary(self, color_preference: List[TLOCColor], path_preference: PathPreference):
         preferred_color = self.entries[0]
         preferred_color.tertiary_preference = Preference(
-            color_preference=Global[List[TLOCColor]](value=color_preference),
-            path_preference=as_global(path_preference, PathPreference),
+            color_preference=as_global(color_preference), path_preference=as_global(path_preference, PathPreference)
         )

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

@@ -1,41 +1,26 @@
 # Copyright 2024 Cisco Systems, Inc. and its affiliates
 
 from ipaddress import IPv4Address, IPv4Network
-from typing import List, Literal, Optional
+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 Ipv4GePrefixRangeLen, Ipv4LePrefixRangeLen, Ipv4PrefixLen
+from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, as_global
 
 
-class PrefixListEntry(_ParcelEntry):
+class PrefixListEntry(BaseModel):
     model_config = ConfigDict(populate_by_name=True)
     ipv4_address: Global[IPv4Address] = Field(serialization_alias="ipv4Address", validation_alias="ipv4Address")
-    ipv4_prefix_length: Global[Ipv4PrefixLen] = Field(
-        serialization_alias="ipv4PrefixLength", validation_alias="ipv4PrefixLength"
-    )
-    le_range_prefix_length: Optional[Global[Ipv4LePrefixRangeLen]] = Field(
-        default=None, serialization_alias="leRangePrefixLength", validation_alias="leRangePrefixLength"
-    )
-    ge_range_prefix_length: Optional[Global[Ipv4GePrefixRangeLen]] = Field(
-        default=None, serialization_alias="geRangePrefixLength", validation_alias="geRangePrefixLength"
-    )
+    ipv4_prefix_length: Global[int] = Field(serialization_alias="ipv4PrefixLength", validation_alias="ipv4PrefixLength")
 
 
 class PrefixListParcel(_ParcelBase):
-    model_config = ConfigDict(populate_by_name=True)
-    type_: Literal["prefix"] = Field(default="prefix", exclude=True)
     entries: List[PrefixListEntry] = Field(default_factory=list, validation_alias=AliasPath("data", "entries"))
 
-    def add_prefix(self, ipv4_network: IPv4Network, le: Optional[int] = None, ge: Optional[int] = None):
-        le_ = Global[Ipv4LePrefixRangeLen](value=le) if le is not None else None
-        ge_ = Global[Ipv4GePrefixRangeLen](value=ge) if ge is not None else None
+    def add_prefix(self, ipv4_network: IPv4Network):
         self.entries.append(
             PrefixListEntry(
-                ipv4_address=Global[IPv4Address](value=ipv4_network.network_address),
-                ipv4_prefix_length=Global[int](value=ipv4_network.prefixlen),
-                le_range_prefix_length=le_,
-                ge_range_prefix_length=ge_,
+                ipv4_address=as_global(ipv4_network.network_address),
+                ipv4_prefix_length=as_global(ipv4_network.prefixlen),
             )
         )

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

@@ -5,9 +5,25 @@ from uuid import UUID
 
 from pydantic import AliasPath, BaseModel, ConfigDict, Field, field_validator
 
-from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, _ParcelEntry, as_global
-from catalystwan.models.common import SLAClassCriteria
-from catalystwan.models.configuration.feature_profile.common import RefIdItem
+from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, as_global
+
+SLAClassCriteria = Literal[
+    "loss",
+    "latency",
+    "jitter",
+    "loss-latency",
+    "loss-jitter",
+    "latency-loss",
+    "latency-jitter",
+    "jitter-latency",
+    "jitter-loss",
+    "loss-latency-jitter",
+    "loss-jitter-latency",
+    "latency-loss-jitter",
+    "latency-jitter-loss",
+    "jitter-latency-loss",
+    "jitter-loss-latency",
+]
 
 
 def check_latency_ms(cls, latency: Optional[Global]):
@@ -28,6 +44,12 @@ def check_jitter_ms(cls, jitter: Optional[Global]):
     return jitter
 
 
+class SLAAppProbeClass(BaseModel):
+    model_config = ConfigDict(populate_by_name=True)
+
+    ref_id: Global[UUID] = Field(serialization_alias="refId", validation_alias="refId")
+
+
 class FallbackBestTunnel(BaseModel):
     model_config = ConfigDict(populate_by_name=True)
 
@@ -73,14 +95,14 @@ class FallbackBestTunnel(BaseModel):
                 raise ValueError(f"Criteria {e} is not in configured criteria {self.criteria.value}")
 
 
-class SLAClassListEntry(_ParcelEntry):
+class SLAClassListEntry(BaseModel):
     model_config = ConfigDict(populate_by_name=True)
 
     latency: Optional[Global[int]] = None
     loss: Optional[Global[int]] = None
     jitter: Optional[Global[int]] = None
-    app_probe_class: Optional[RefIdItem] = Field(
-        default=None, validation_alias="appProbeClass", serialization_alias="appProbeClass"
+    app_probe_class: Optional[SLAAppProbeClass] = Field(
+        validation_alias="appProbeClass", serialization_alias="appProbeClass"
     )
     fallback_best_tunnel: Optional[FallbackBestTunnel] = Field(
         default=None, validation_alias="fallbackBestTunnel", serialization_alias="fallbackBestTunnel"
@@ -93,21 +115,18 @@ class SLAClassListEntry(_ParcelEntry):
 
 
 class SLAClassParcel(_ParcelBase):
-    model_config = ConfigDict(populate_by_name=True)
-    type_: Literal["sla-class"] = Field(default="sla-class", exclude=True)
-    entries: List[SLAClassListEntry] = Field(default_factory=list, validation_alias=AliasPath("data", "entries"))
+    entries: List[SLAClassListEntry] = Field(default=[], validation_alias=AliasPath("data", "entries"))
 
     def add_entry(
         self,
-        app_probe_class_id: Optional[UUID] = None,
+        app_probe_class_id: UUID,
         loss: Optional[int] = None,
         jitter: Optional[int] = None,
         latency: Optional[int] = None,
     ):
-        ref = RefIdItem(ref_id=as_global(str(app_probe_class_id))) if app_probe_class_id is not None else None
         self.entries.append(
             SLAClassListEntry(
-                app_probe_class=ref,
+                app_probe_class=SLAAppProbeClass(ref_id=as_global(app_probe_class_id)),
                 loss=as_global(loss) if loss is not None else None,
                 jitter=as_global(jitter) if jitter is not None else None,
                 latency=as_global(latency) if latency is not None else None,

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

@@ -1,30 +1,24 @@
 # 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, 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
 from catalystwan.models.common import WellKnownBGPCommunities
 
 
-class StandardCommunityEntry(_ParcelEntry):
+class StandardCommunityEntry(BaseModel):
     model_config = ConfigDict(populate_by_name=True)
-    standard_community: Global[str] = Field(
+    standard_community: Global[WellKnownBGPCommunities] = Field(
         serialization_alias="standardCommunity", validation_alias="standardCommunity"
     )
 
 
 class StandardCommunityParcel(_ParcelBase):
-    model_config = ConfigDict(populate_by_name=True)
-    type_: Literal["standard-community"] = Field(default="standard-community", exclude=True)
-    entries: List[StandardCommunityEntry] = Field(default_factory=list, validation_alias=AliasPath("data", "entries"))
-
-    def _add_community(self, standard_community: str):
-        self.entries.append(StandardCommunityEntry(standard_community=as_global(standard_community)))
-
-    def add_well_known_community(self, standard_community: WellKnownBGPCommunities):
-        self._add_community(standard_community)
+    entries: List[StandardCommunityEntry] = Field(default=[], validation_alias=AliasPath("data", "entries"))
 
-    def add_community(self, as_number: int, community_number: int) -> None:
-        self._add_community(f"{as_number}:{community_number}")
+    def add_community(self, standard_community: WellKnownBGPCommunities):
+        self.entries.append(
+            StandardCommunityEntry(standard_community=as_global(standard_community, WellKnownBGPCommunities))
+        )

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

@@ -1,15 +1,16 @@
 # Copyright 2024 Cisco Systems, Inc. and its affiliates
 
 from ipaddress import IPv4Address
-from typing import List, Literal, Optional
+from typing import List, Optional
 
-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.common import EncapType, TLOCColor
+from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, as_global
+from catalystwan.models.common import TLOCColor
+from catalystwan.models.policy.lists_entries import EncapType
 
 
-class TlocEntry(_ParcelEntry):
+class TlocEntry(BaseModel):
     model_config = ConfigDict(populate_by_name=True)
     tloc: Global[IPv4Address]
     color: Global[TLOCColor]
@@ -27,9 +28,7 @@ class TlocEntry(_ParcelEntry):
 
 
 class TlocParcel(_ParcelBase):
-    model_config = ConfigDict(populate_by_name=True)
-    type_: Literal["tloc"] = Field(default="tloc", exclude=True)
-    entries: List[TlocEntry] = Field(default_factory=list, validation_alias=AliasPath("data", "entries"))
+    entries: List[TlocEntry] = Field(default=[], validation_alias=AliasPath("data", "entries"))
 
     def add_entry(
         self, tloc: IPv4Address, color: TLOCColor, encapsulation: EncapType, preference: Optional[str] = None

catalystwan/models/configuration/feature_profile/sdwan/policy_object/security/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 SecurityApplicationListEntry(_ParcelEntry):
+class SecurityApplicationListEntry(BaseModel):
     model_config = ConfigDict(populate_by_name=True)
     app_list: Global[str] = Field(serialization_alias="app", validation_alias="app")
 
 
-class SecurityApplicationFamilyListEntry(_ParcelEntry):
+class SecurityApplicationFamilyListEntry(BaseModel):
     model_config = ConfigDict(populate_by_name=True)
     app_list_family: Global[str] = Field(serialization_alias="appFamily", validation_alias="appFamily")
 
 
 class SecurityApplicationListParcel(_ParcelBase):
-    model_config = ConfigDict(populate_by_name=True)
-    type_: Literal["security-localapp"] = Field(default="security-localapp", exclude=True)
     entries: List[Union[SecurityApplicationFamilyListEntry, SecurityApplicationListEntry]] = 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/security/data_prefix.py

@@ -1,22 +1,20 @@
 # Copyright 2024 Cisco Systems, Inc. and its affiliates
 
 from ipaddress import 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 SecurityDataPrefixEntry(_ParcelEntry):
+class SecurityDataPrefixEntry(BaseModel):
     model_config = ConfigDict(populate_by_name=True)
     ip_prefix: Global[IPv4Network] = Field(serialization_alias="ipPrefix", validation_alias="ipPrefix")
 
 
 class SecurityDataPrefixParcel(_ParcelBase):
-    model_config = ConfigDict(populate_by_name=True)
-    type_: Literal["security-data-ip-prefix"] = Field(default="security-data-ip-prefix", exclude=True)
-    entries: List[SecurityDataPrefixEntry] = Field(default_factory=list, validation_alias=AliasPath("data", "entries"))
+    entries: List[SecurityDataPrefixEntry] = Field(default=[], validation_alias=AliasPath("data", "entries"))
 
     def add_prefix(self, ip_prefix: IPv4Network):
         self.entries.append(SecurityDataPrefixEntry(ip_prefix=as_global(ip_prefix)))

catalystwan/models/configuration/feature_profile/sdwan/policy_object/security/fqdn.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
+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 FQDNListEntry(_ParcelEntry):
+class FQDNListEntry(BaseModel):
     model_config = ConfigDict(populate_by_name=True)
     pattern: Global[str] = Field(
         description="Ex: cisco.com, .*cisco.com, .*.cisco.com. Should not start with '*' or '+'"
@@ -15,9 +15,7 @@ class FQDNListEntry(_ParcelEntry):
 
 
 class FQDNDomainParcel(_ParcelBase):
-    model_config = ConfigDict(populate_by_name=True)
-    type_: Literal["security-fqdn"] = Field(default="security-fqdn", exclude=True)
-    entries: List[FQDNListEntry] = Field(default_factory=list, validation_alias=AliasPath("data", "entries"))
+    entries: List[FQDNListEntry] = Field(default=[], validation_alias=AliasPath("data", "entries"))
 
     def from_fqdns(self, fqdns: List[str]):
         for fqdn in fqdns:

catalystwan/models/configuration/feature_profile/sdwan/policy_object/security/geolocation_list.py

@@ -1,14 +1,14 @@
 # Copyright 2024 Cisco Systems, Inc. and its affiliates
 
-from typing import List, Literal, Optional
+from typing import List, Optional
 
-from pydantic import AliasPath, ConfigDict, Field, model_validator
+from pydantic import AliasPath, BaseModel, Field, model_validator
 
-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 check_fields_exclusive
 
 
-class GeoLocationListEntry(_ParcelEntry):
+class GeoLocationListEntry(BaseModel):
     country: Optional[Global[str]] = Field(default=None, description="ISO-3166 alpha-3 country code eg: FRA")
     continent: Optional[Global[str]] = Field(
         default=None, description="One of 2-letter continent codes: AF, NA, OC, AN, AS, EU, SA"
@@ -21,9 +21,7 @@ class GeoLocationListEntry(_ParcelEntry):
 
 
 class GeoLocationListParcel(_ParcelBase):
-    model_config = ConfigDict(populate_by_name=True)
-    type_: Literal["security-geolocation"] = Field(default="security-geolocation", exclude=True)
-    entries: List[GeoLocationListEntry] = Field(default_factory=list, validation_alias=AliasPath("data", "entries"))
+    entries: List[GeoLocationListEntry] = Field(default=[], validation_alias=AliasPath("data", "entries"))
 
     def add_country(self, country: str):
         self.entries.append(GeoLocationListEntry(country=as_global(country)))

catalystwan/models/configuration/feature_profile/sdwan/policy_object/security/ips_signature.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, ConfigDict, 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 IPSSignatureListEntry(_ParcelEntry):
+class IPSSignatureListEntry(BaseModel):
     model_config = ConfigDict(populate_by_name=True)
     generator_id: Global[str] = Field(
         serialization_alias="generatorId", validation_alias="generatorId", description="Range 0 to 4294967295"
@@ -30,9 +30,7 @@ class IPSSignatureListEntry(_ParcelEntry):
 
 
 class IPSSignatureParcel(_ParcelBase):
-    model_config = ConfigDict(populate_by_name=True)
-    type_: Literal["security-ipssignature"] = Field(default="security-ipssignature", exclude=True)
-    entries: List[IPSSignatureListEntry] = Field(default_factory=list, validation_alias=AliasPath("data", "entries"))
+    entries: List[IPSSignatureListEntry] = Field(default=[], validation_alias=AliasPath("data", "entries"))
 
     def add_signature(self, signature: str):
         generator_id, signature_id = signature.split(":")

catalystwan/models/configuration/feature_profile/sdwan/policy_object/security/local_domain.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
+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 LocalDomainListEntry(_ParcelEntry):
+class LocalDomainListEntry(BaseModel):
     model_config = ConfigDict(populate_by_name=True)
     name_server: Global[str] = Field(
         serialization_alias="nameServer", validation_alias="nameServer", description="Ex: cisco.com, *.cisco.com"
@@ -15,9 +15,7 @@ class LocalDomainListEntry(_ParcelEntry):
 
 
 class LocalDomainParcel(_ParcelBase):
-    model_config = ConfigDict(populate_by_name=True)
-    type_: Literal["security-localdomain"] = Field(default="security-localdomain", exclude=True)
-    entries: List[LocalDomainListEntry] = Field(default_factory=list, validation_alias=AliasPath("data", "entries"))
+    entries: List[LocalDomainListEntry] = Field(default=[], validation_alias=AliasPath("data", "entries"))
 
     def from_local_domains(self, domains: List[str]):
         for domain in domains:

catalystwan/models/configuration/feature_profile/sdwan/policy_object/security/protocol_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, 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 ProtocolListEntry(_ParcelEntry):
+class ProtocolListEntry(BaseModel):
     model_config = ConfigDict(populate_by_name=True)
     protocol: Global[str] = Field(serialization_alias="protocolName", validation_alias="protocolName")
 
 
 class ProtocolListParcel(_ParcelBase):
-    model_config = ConfigDict(populate_by_name=True)
-    type_: Literal["security-protocolname"] = Field(default="security-protocolname", exclude=True)
-    entries: List[ProtocolListEntry] = Field(default_factory=list, validation_alias=AliasPath("data", "entries"))
+    entries: List[ProtocolListEntry] = Field(default=[], validation_alias=AliasPath("data", "entries"))
 
     def add_protocol(self, protocol: str):
         self.entries.append(ProtocolListEntry(protocol=as_global(protocol)))

catalystwan/models/configuration/feature_profile/sdwan/policy_object/security/security_port.py

@@ -1,45 +1,35 @@
 # 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
+from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, as_global
 
 
-class SecurityPortListEntry(_ParcelEntry):
+class SecurityPortListEntry(BaseModel):
     model_config = ConfigDict(populate_by_name=True)
-    port: Global[str] = Field(
-        description="Ex: 1 or 1-10 by range. Range 0 to 65535"
-    )  # Not clear why UI validation accepts max 65530
+    port: Global[str] = Field(description="Ex: 1 or 1-10 by range. Range 0 to 65530")
 
     @field_validator("port")
     @classmethod
     def check_port(cls, port: Global[str]):
         value = port.value
         if value.count("-") == 0:
-            assert 0 <= int(value) <= 65535
+            assert 0 <= int(value) <= 65530
             return port
 
         start_port, end_port = value.split("-")
         start = int(start_port)
         end = int(end_port)
-        assert 0 <= start <= 65535
-        assert 0 <= end <= 65535
+        assert 0 <= start <= 65530
+        assert 0 <= end <= 65530
         assert start < end
         return port
 
 
 class SecurityPortParcel(_ParcelBase):
-    model_config = ConfigDict(populate_by_name=True)
-    type_: Literal["security-port"] = Field(default="security-port", exclude=True)
-    entries: List[SecurityPortListEntry] = Field(default_factory=list, validation_alias=AliasPath("data", "entries"))
-
-    def _add_port(self, port: str):
-        self.entries.append(SecurityPortListEntry(port=Global[str](value=port)))
-
-    def add_port(self, port: int):
-        self._add_port(str(port))
+    entries: List[SecurityPortListEntry] = Field(default=[], validation_alias=AliasPath("data", "entries"))
 
-    def add_port_range(self, start_port: int, end_port: int):
-        self._add_port(f"{start_port}-{end_port}")
+    def add_port(self, port: str):
+        self.entries.append(SecurityPortListEntry(port=as_global(port)))

catalystwan/models/configuration/feature_profile/sdwan/policy_object/security/url.py

@@ -1,48 +1,27 @@
 # Copyright 2024 Cisco Systems, Inc. and its affiliates
 
-from typing import List, Literal, Optional
+from typing import List
 
-from pydantic import AliasPath, ConfigDict, Field, model_serializer
+from pydantic import AliasPath, BaseModel, ConfigDict, Field
 
-from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, _ParcelEntry
+from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, as_global
 
-URLListSubtype = Literal["urlallowed", "urlblocked"]
 
-
-class BaseURLListEntry(_ParcelEntry):
+class BaseURLListEntry(BaseModel):
     model_config = ConfigDict(populate_by_name=True)
     pattern: Global[str]
 
 
-class URLParcel(_ParcelBase):
-    model_config = ConfigDict(populate_by_name=True)
-    subtype: Optional[URLListSubtype] = Field(  # field name must not clash with any of aliases
-        default=None,
-        validation_alias=AliasPath("data", "type"),
-        # serialization alias handled by _BaseParcel model serializer
-        description="must be used only for versions > 20.15.2",
-    )
-    legacy_subtype: Optional[URLListSubtype] = Field(  # field name must not clash with any of aliases
-        exclude=True,
-        default=None,
-        validation_alias="type",
-        serialization_alias="type",
-        description="must be used only for versions <= 20.15.2",
-    )
-    type_: Literal["security-urllist"] = Field(default="security-urllist", exclude=True)
-    entries: List[BaseURLListEntry] = Field(default_factory=list, validation_alias=AliasPath("data", "entries"))
+class BaseURLParcel(_ParcelBase):
+    entries: List[BaseURLListEntry] = Field(default=[], validation_alias=AliasPath("data", "entries"))
 
     def add_url(self, pattern: str):
-        self.entries.append(BaseURLListEntry(pattern=Global[str](value=pattern)))
-
-    def use_legacy_subtype(self):
-        if self.subtype is not None:
-            self.legacy_subtype = self.subtype
-            self.subtype = None
-
-    @model_serializer(mode="wrap")
-    def serialize_model(self, handler, info):
-        serialized = _ParcelBase.envelope_parcel_data(self, handler, info)
-        if self.legacy_subtype:
-            serialized["type"] = self.legacy_subtype
-        return serialized
+        self.entries.append(BaseURLListEntry(pattern=as_global(pattern)))
+
+
+class URLAllowParcel(BaseURLParcel):
+    parcel_type: str = Field(default="urlallowed", validation_alias="type", serialization_alias="type")
+
+
+class URLBlockParcel(BaseURLParcel):
+    parcel_type: str = Field(default="urlblocked", validation_alias="type", serialization_alias="type")