catalystwan 0.36.0.dev4__tar.gz → 0.36.0.dev6__tar.gz

{catalystwan-0.36.0.dev4 → catalystwan-0.36.0.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: catalystwan
-Version: 0.36.0.dev4
+Version: 0.36.0.dev6
 Summary: Cisco Catalyst WAN SDK for Python
 Home-page: https://github.com/cisco-open/cisco-catalyst-wan-sdk
 Author: kagorski

{catalystwan-0.36.0.dev4 → catalystwan-0.36.0.dev6}/catalystwan/api/configuration_groups/parcel.py

@@ -1,6 +1,6 @@
 # Copyright 2024 Cisco Systems, Inc. and its affiliates
 
-from typing import Any, Dict, Generic, List, Literal, Optional, Tuple, TypeVar
+from typing import Any, Dict, Generic, List, Literal, Optional, Sequence, Tuple, TypeVar
 
 from pydantic import (
     AliasPath,
@@ -21,6 +21,11 @@ from catalystwan.models.common import VersionedField
 T = TypeVar("T")
 
 
+class _ParcelEntry(BaseModel):
+    def __hash__(self) -> int:
+        return hash(self.model_dump_json())
+
+
 class _ParcelBase(BaseModel):
     model_config = ConfigDict(
         extra="allow", arbitrary_types_allowed=True, populate_by_name=True, json_schema_mode_override="validation"
@@ -39,6 +44,7 @@ class _ParcelBase(BaseModel):
         description="Set the parcel description",
     )
     data: Optional[Any] = None
+    entries: Optional[Sequence[_ParcelEntry]] = Field(default=None, validation_alias=AliasPath("data", "entries"))
     _parcel_data_key: str = PrivateAttr(default="data")
 
     @model_serializer(mode="wrap")
@@ -80,6 +86,10 @@ class _ParcelBase(BaseModel):
             return str(field_info.default)
         raise CatalystwanException(f"{cls.__name__} field parcel type is not set.")
 
+    def remove_duplicated_entries(self) -> None:
+        if self.entries:
+            self.entries = list(set(self.entries))
+
 
 # https://github.com/pydantic/pydantic/discussions/6090
 # Usage: Global[str](value="test")

{catalystwan-0.36.0.dev4 → catalystwan-0.36.0.dev6}/catalystwan/models/configuration/feature_profile/sdwan/policy_object/policy/app_probe.py

@@ -5,7 +5,7 @@ from uuid import UUID
 
 from pydantic import AliasPath, BaseModel, ConfigDict, Field
 
-from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, as_global, as_optional_global
+from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, _ParcelEntry, as_global, as_optional_global
 from catalystwan.models.common import TLOCColor
 from catalystwan.models.configuration.feature_profile.common import RefIdItem
 
@@ -15,7 +15,7 @@ class AppProbeMapItem(BaseModel):
     dscp: Optional[Global[int]] = Field(default=None)
 
 
-class AppProbeEntry(BaseModel):
+class AppProbeEntry(_ParcelEntry):
     model_config = ConfigDict(populate_by_name=True)
     map: List[AppProbeMapItem] = Field(default_factory=list)
     forwarding_class: Union[Global[str], RefIdItem] = Field(

{catalystwan-0.36.0.dev4 → catalystwan-0.36.0.dev6}/catalystwan/models/configuration/feature_profile/sdwan/policy_object/policy/application_list.py

@@ -2,17 +2,17 @@
 
 from typing import List, Literal, Union
 
-from pydantic import AliasPath, BaseModel, ConfigDict, Field
+from pydantic import AliasPath, ConfigDict, Field
 
-from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, as_global
+from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, _ParcelEntry, as_global
 
 
-class ApplicationListEntry(BaseModel):
+class ApplicationListEntry(_ParcelEntry):
     model_config = ConfigDict(populate_by_name=True)
     app_list: Global[str] = Field(serialization_alias="app", validation_alias="app")
 
 
-class ApplicationFamilyListEntry(BaseModel):
+class ApplicationFamilyListEntry(_ParcelEntry):
     model_config = ConfigDict(populate_by_name=True)
     app_list_family: Global[str] = Field(serialization_alias="appFamily", validation_alias="appFamily")
 

{catalystwan-0.36.0.dev4 → catalystwan-0.36.0.dev6}/catalystwan/models/configuration/feature_profile/sdwan/policy_object/policy/as_path.py

@@ -2,12 +2,12 @@
 
 from typing import List, Literal
 
-from pydantic import AliasPath, BaseModel, ConfigDict, Field
+from pydantic import AliasPath, ConfigDict, Field
 
-from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, as_global
+from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, _ParcelEntry, as_global
 
 
-class AsPathEntry(BaseModel):
+class AsPathEntry(_ParcelEntry):
     model_config = ConfigDict(populate_by_name=True)
     as_path: Global[str] = Field(validation_alias="asPath", serialization_alias="asPath")
 

{catalystwan-0.36.0.dev4 → catalystwan-0.36.0.dev6}/catalystwan/models/configuration/feature_profile/sdwan/policy_object/policy/color_list.py

@@ -2,13 +2,13 @@
 
 from typing import List, Literal
 
-from pydantic import AliasPath, BaseModel, ConfigDict, Field
+from pydantic import AliasPath, ConfigDict, Field
 
-from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, as_global
+from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, _ParcelEntry, as_global
 from catalystwan.models.common import TLOCColor
 
 
-class ColorEntry(BaseModel):
+class ColorEntry(_ParcelEntry):
     color: Global[TLOCColor]
 
 

{catalystwan-0.36.0.dev4 → catalystwan-0.36.0.dev6}/catalystwan/models/configuration/feature_profile/sdwan/policy_object/policy/data_prefix.py

@@ -3,12 +3,12 @@
 from ipaddress import IPv4Address, IPv4Network
 from typing import List, Literal
 
-from pydantic import AliasPath, BaseModel, ConfigDict, Field
+from pydantic import AliasPath, ConfigDict, Field
 
-from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, as_global
+from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, _ParcelEntry, as_global
 
 
-class DataPrefixEntry(BaseModel):
+class DataPrefixEntry(_ParcelEntry):
     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")

{catalystwan-0.36.0.dev4 → catalystwan-0.36.0.dev6}/catalystwan/models/configuration/feature_profile/sdwan/policy_object/policy/extended_community.py

@@ -3,12 +3,12 @@
 from ipaddress import IPv4Address
 from typing import List, Literal
 
-from pydantic import AliasPath, BaseModel, ConfigDict, Field
+from pydantic import AliasPath, ConfigDict, Field
 
-from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, as_global
+from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, _ParcelEntry, as_global
 
 
-class ExtendedCommunityEntry(BaseModel):
+class ExtendedCommunityEntry(_ParcelEntry):
     model_config = ConfigDict(populate_by_name=True)
     extended_community: Global[str] = Field(serialization_alias="extCommunity", validation_alias="extCommunity")
 

{catalystwan-0.36.0.dev4 → catalystwan-0.36.0.dev6}/catalystwan/models/configuration/feature_profile/sdwan/policy_object/policy/fowarding_class.py

@@ -2,12 +2,12 @@
 
 from typing import List, Literal
 
-from pydantic import AliasPath, BaseModel, ConfigDict, Field, field_validator
+from pydantic import AliasPath, ConfigDict, Field, field_validator
 
-from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, as_global
+from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, _ParcelEntry, as_global
 
 
-class FowardingClassQueueEntry(BaseModel):
+class FowardingClassQueueEntry(_ParcelEntry):
     queue: Global[str]
 
     @field_validator("queue")

{catalystwan-0.36.0.dev4 → catalystwan-0.36.0.dev6}/catalystwan/models/configuration/feature_profile/sdwan/policy_object/policy/ipv6_data_prefix.py

@@ -3,12 +3,12 @@
 from ipaddress import IPv6Address, IPv6Interface
 from typing import List, Literal
 
-from pydantic import AliasPath, BaseModel, ConfigDict, Field
+from pydantic import AliasPath, ConfigDict, Field
 
-from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, as_global
+from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, _ParcelEntry, as_global
 
 
-class IPv6DataPrefixEntry(BaseModel):
+class IPv6DataPrefixEntry(_ParcelEntry):
     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")

{catalystwan-0.36.0.dev4 → catalystwan-0.36.0.dev6}/catalystwan/models/configuration/feature_profile/sdwan/policy_object/policy/ipv6_prefix_list.py

@@ -3,12 +3,12 @@
 from ipaddress import IPv6Address, IPv6Interface
 from typing import List, Literal, Optional
 
-from pydantic import AliasPath, BaseModel, ConfigDict, Field
+from pydantic import AliasPath, ConfigDict, Field
 
-from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, as_global
+from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, _ParcelEntry, as_global
 
 
-class IPv6PrefixListEntry(BaseModel):
+class IPv6PrefixListEntry(_ParcelEntry):
     model_config = ConfigDict(populate_by_name=True)
     ipv6_address: Global[IPv6Address] = Field(serialization_alias="ipv6Address", validation_alias="ipv6Address")
     ipv6_prefix_length: Global[int] = Field(

{catalystwan-0.36.0.dev4 → catalystwan-0.36.0.dev6}/catalystwan/models/configuration/feature_profile/sdwan/policy_object/policy/mirror.py

@@ -2,13 +2,13 @@
 
 from typing import List, Literal
 
-from pydantic import AliasPath, BaseModel, ConfigDict, Field
+from pydantic import AliasPath, ConfigDict, Field
 from pydantic.networks import IPvAnyAddress
 
-from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, as_global
+from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, _ParcelEntry, as_global
 
 
-class MirrorEntry(BaseModel):
+class MirrorEntry(_ParcelEntry):
     model_config = ConfigDict(populate_by_name=True)
     remote_dest_ip: Global[str] = Field(validation_alias="remoteDestIp", serialization_alias="remoteDestIp")
     source_ip: Global[str] = Field(validation_alias="sourceIp", serialization_alias="sourceIp")

{catalystwan-0.36.0.dev4 → catalystwan-0.36.0.dev6}/catalystwan/models/configuration/feature_profile/sdwan/policy_object/policy/policer.py

@@ -2,13 +2,13 @@
 
 from typing import List, Literal
 
-from pydantic import AliasPath, BaseModel, ConfigDict, Field, field_validator
+from pydantic import AliasPath, ConfigDict, Field, field_validator
 
-from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, as_global
+from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, _ParcelEntry, as_global
 from catalystwan.models.policy.list.policer import PolicerExceedAction
 
 
-class PolicerEntry(BaseModel):
+class PolicerEntry(_ParcelEntry):
     model_config = ConfigDict(populate_by_name=True)
     burst: Global[int]
     exceed: Global[PolicerExceedAction]
@@ -16,13 +16,13 @@ class PolicerEntry(BaseModel):
 
     @field_validator("burst")
     @classmethod
-    def check_burst(cls, burst_str: Global):
+    def check_burst(cls, burst_str: Global[int]):
         assert 15000 <= burst_str.value <= 10_000_000
         return burst_str
 
     @field_validator("rate")
     @classmethod
-    def check_rate(cls, rate_str: Global):
+    def check_rate(cls, rate_str: Global[int]):
         assert 8 <= rate_str.value <= 100_000_000_000
         return rate_str
 

{catalystwan-0.36.0.dev4 → catalystwan-0.36.0.dev6}/catalystwan/models/configuration/feature_profile/sdwan/policy_object/policy/prefered_group_color.py

@@ -4,7 +4,7 @@ from typing import List, Literal, Optional
 
 from pydantic import AliasPath, BaseModel, ConfigDict, Field, field_validator, model_validator
 
-from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, as_global
+from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, _ParcelEntry, as_global
 from catalystwan.models.common import TLOCColor
 
 PathPreference = Literal[
@@ -24,7 +24,7 @@ class Preference(BaseModel):
     )
 
 
-class PreferredColorGroupEntry(BaseModel):
+class PreferredColorGroupEntry(_ParcelEntry):
     model_config = ConfigDict(populate_by_name=True)
     primary_preference: Preference = Field(
         serialization_alias="primaryPreference", validation_alias="primaryPreference"

{catalystwan-0.36.0.dev4 → catalystwan-0.36.0.dev6}/catalystwan/models/configuration/feature_profile/sdwan/policy_object/policy/prefix_list.py

@@ -3,12 +3,12 @@
 from ipaddress import IPv4Address, IPv4Network
 from typing import List, Literal
 
-from pydantic import AliasPath, BaseModel, ConfigDict, Field
+from pydantic import AliasPath, ConfigDict, Field
 
-from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, as_global
+from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, _ParcelEntry, as_global
 
 
-class PrefixListEntry(BaseModel):
+class PrefixListEntry(_ParcelEntry):
     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")

{catalystwan-0.36.0.dev4 → catalystwan-0.36.0.dev6}/catalystwan/models/configuration/feature_profile/sdwan/policy_object/policy/sla_class.py

@@ -5,7 +5,7 @@ from uuid import UUID
 
 from pydantic import AliasPath, BaseModel, ConfigDict, Field, field_validator
 
-from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, as_global
+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
 
@@ -73,7 +73,7 @@ class FallbackBestTunnel(BaseModel):
                 raise ValueError(f"Criteria {e} is not in configured criteria {self.criteria.value}")
 
 
-class SLAClassListEntry(BaseModel):
+class SLAClassListEntry(_ParcelEntry):
     model_config = ConfigDict(populate_by_name=True)
 
     latency: Optional[Global[int]] = None

{catalystwan-0.36.0.dev4 → catalystwan-0.36.0.dev6}/catalystwan/models/configuration/feature_profile/sdwan/policy_object/policy/standard_community.py

@@ -2,13 +2,13 @@
 
 from typing import List, Literal
 
-from pydantic import AliasPath, BaseModel, ConfigDict, Field
+from pydantic import AliasPath, ConfigDict, Field
 
-from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, as_global
+from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, _ParcelEntry, as_global
 from catalystwan.models.common import WellKnownBGPCommunities
 
 
-class StandardCommunityEntry(BaseModel):
+class StandardCommunityEntry(_ParcelEntry):
     model_config = ConfigDict(populate_by_name=True)
     standard_community: Global[str] = Field(
         serialization_alias="standardCommunity", validation_alias="standardCommunity"

{catalystwan-0.36.0.dev4 → catalystwan-0.36.0.dev6}/catalystwan/models/configuration/feature_profile/sdwan/policy_object/policy/tloc_list.py

@@ -3,13 +3,13 @@
 from ipaddress import IPv4Address
 from typing import List, Literal, Optional
 
-from pydantic import AliasPath, BaseModel, ConfigDict, Field, field_validator
+from pydantic import AliasPath, ConfigDict, Field, field_validator
 
-from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, as_global
+from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, _ParcelEntry, as_global
 from catalystwan.models.common import EncapType, TLOCColor
 
 
-class TlocEntry(BaseModel):
+class TlocEntry(_ParcelEntry):
     model_config = ConfigDict(populate_by_name=True)
     tloc: Global[IPv4Address]
     color: Global[TLOCColor]

{catalystwan-0.36.0.dev4 → catalystwan-0.36.0.dev6}/catalystwan/models/configuration/feature_profile/sdwan/policy_object/security/application_list.py

@@ -2,17 +2,17 @@
 
 from typing import List, Literal, Union
 
-from pydantic import AliasPath, BaseModel, ConfigDict, Field
+from pydantic import AliasPath, ConfigDict, Field
 
-from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, as_global
+from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, _ParcelEntry, as_global
 
 
-class SecurityApplicationListEntry(BaseModel):
+class SecurityApplicationListEntry(_ParcelEntry):
     model_config = ConfigDict(populate_by_name=True)
     app_list: Global[str] = Field(serialization_alias="app", validation_alias="app")
 
 
-class SecurityApplicationFamilyListEntry(BaseModel):
+class SecurityApplicationFamilyListEntry(_ParcelEntry):
     model_config = ConfigDict(populate_by_name=True)
     app_list_family: Global[str] = Field(serialization_alias="appFamily", validation_alias="appFamily")
 

{catalystwan-0.36.0.dev4 → catalystwan-0.36.0.dev6}/catalystwan/models/configuration/feature_profile/sdwan/policy_object/security/data_prefix.py

@@ -3,12 +3,12 @@
 from ipaddress import IPv4Network
 from typing import List, Literal
 
-from pydantic import AliasPath, BaseModel, ConfigDict, Field
+from pydantic import AliasPath, ConfigDict, Field
 
-from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, as_global
+from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, _ParcelEntry, as_global
 
 
-class SecurityDataPrefixEntry(BaseModel):
+class SecurityDataPrefixEntry(_ParcelEntry):
     model_config = ConfigDict(populate_by_name=True)
     ip_prefix: Global[IPv4Network] = Field(serialization_alias="ipPrefix", validation_alias="ipPrefix")
 

{catalystwan-0.36.0.dev4 → catalystwan-0.36.0.dev6}/catalystwan/models/configuration/feature_profile/sdwan/policy_object/security/fqdn.py

@@ -2,12 +2,12 @@
 
 from typing import List, Literal
 
-from pydantic import AliasPath, BaseModel, ConfigDict, Field
+from pydantic import AliasPath, ConfigDict, Field
 
-from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, as_global
+from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, _ParcelEntry, as_global
 
 
-class FQDNListEntry(BaseModel):
+class FQDNListEntry(_ParcelEntry):
     model_config = ConfigDict(populate_by_name=True)
     pattern: Global[str] = Field(
         description="Ex: cisco.com, .*cisco.com, .*.cisco.com. Should not start with '*' or '+'"

{catalystwan-0.36.0.dev4 → catalystwan-0.36.0.dev6}/catalystwan/models/configuration/feature_profile/sdwan/policy_object/security/geolocation_list.py

@@ -2,13 +2,13 @@
 
 from typing import List, Literal, Optional
 
-from pydantic import AliasPath, BaseModel, ConfigDict, Field, model_validator
+from pydantic import AliasPath, ConfigDict, Field, model_validator
 
-from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, as_global
+from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, _ParcelEntry, as_global
 from catalystwan.models.common import check_fields_exclusive
 
 
-class GeoLocationListEntry(BaseModel):
+class GeoLocationListEntry(_ParcelEntry):
     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"

{catalystwan-0.36.0.dev4 → catalystwan-0.36.0.dev6}/catalystwan/models/configuration/feature_profile/sdwan/policy_object/security/identity.py

@@ -1,11 +1,11 @@
 from typing import List, Literal, Optional
 
-from pydantic import AliasPath, BaseModel, Field
+from pydantic import AliasPath, Field
 
-from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, as_optional_global
+from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, _ParcelEntry, as_optional_global
 
 
-class IdentityEntry(BaseModel):
+class IdentityEntry(_ParcelEntry):
     user: Optional[Global[str]] = Field(default=None)
     user_group: Optional[Global[str]] = Field(
         default=None, validation_alias="userGroup", serialization_alias="userGroup"

{catalystwan-0.36.0.dev4 → catalystwan-0.36.0.dev6}/catalystwan/models/configuration/feature_profile/sdwan/policy_object/security/ips_signature.py

@@ -2,12 +2,12 @@
 
 from typing import List, Literal
 
-from pydantic import AliasPath, BaseModel, ConfigDict, Field, field_validator
+from pydantic import AliasPath, ConfigDict, Field, field_validator
 
-from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, as_global
+from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, _ParcelEntry, as_global
 
 
-class IPSSignatureListEntry(BaseModel):
+class IPSSignatureListEntry(_ParcelEntry):
     model_config = ConfigDict(populate_by_name=True)
     generator_id: Global[str] = Field(
         serialization_alias="generatorId", validation_alias="generatorId", description="Range 0 to 4294967295"

{catalystwan-0.36.0.dev4 → catalystwan-0.36.0.dev6}/catalystwan/models/configuration/feature_profile/sdwan/policy_object/security/local_domain.py

@@ -2,12 +2,12 @@
 
 from typing import List, Literal
 
-from pydantic import AliasPath, BaseModel, ConfigDict, Field
+from pydantic import AliasPath, ConfigDict, Field
 
-from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, as_global
+from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, _ParcelEntry, as_global
 
 
-class LocalDomainListEntry(BaseModel):
+class LocalDomainListEntry(_ParcelEntry):
     model_config = ConfigDict(populate_by_name=True)
     name_server: Global[str] = Field(
         serialization_alias="nameServer", validation_alias="nameServer", description="Ex: cisco.com, *.cisco.com"

{catalystwan-0.36.0.dev4 → catalystwan-0.36.0.dev6}/catalystwan/models/configuration/feature_profile/sdwan/policy_object/security/protocol_list.py

@@ -2,12 +2,12 @@
 
 from typing import List, Literal
 
-from pydantic import AliasPath, BaseModel, ConfigDict, Field
+from pydantic import AliasPath, ConfigDict, Field
 
-from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, as_global
+from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, _ParcelEntry, as_global
 
 
-class ProtocolListEntry(BaseModel):
+class ProtocolListEntry(_ParcelEntry):
     model_config = ConfigDict(populate_by_name=True)
     protocol: Global[str] = Field(serialization_alias="protocolName", validation_alias="protocolName")
 

{catalystwan-0.36.0.dev4 → catalystwan-0.36.0.dev6}/catalystwan/models/configuration/feature_profile/sdwan/policy_object/security/scalable_group_tag.py

@@ -1,11 +1,11 @@
 from typing import List, Literal, Optional
 
-from pydantic import AliasPath, BaseModel, Field
+from pydantic import AliasPath, Field
 
-from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, as_optional_global
+from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, _ParcelEntry, as_optional_global
 
 
-class ScalableGroupTagEntry(BaseModel):
+class ScalableGroupTagEntry(_ParcelEntry):
     sgt_name: Optional[Global[str]] = Field(default=None, validation_alias="sgtName", serialization_alias="sgtName")
     tag: Optional[Global[str]] = Field(default=None)
 

{catalystwan-0.36.0.dev4 → catalystwan-0.36.0.dev6}/catalystwan/models/configuration/feature_profile/sdwan/policy_object/security/security_port.py

@@ -2,12 +2,12 @@
 
 from typing import List, Literal
 
-from pydantic import AliasPath, BaseModel, ConfigDict, Field, field_validator
+from pydantic import AliasPath, ConfigDict, Field, field_validator
 
-from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, as_global
+from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, _ParcelEntry, as_global
 
 
-class SecurityPortListEntry(BaseModel):
+class SecurityPortListEntry(_ParcelEntry):
     model_config = ConfigDict(populate_by_name=True)
     port: Global[str] = Field(description="Ex: 1 or 1-10 by range. Range 0 to 65530")
 

{catalystwan-0.36.0.dev4 → catalystwan-0.36.0.dev6}/catalystwan/models/configuration/feature_profile/sdwan/policy_object/security/url.py

@@ -2,12 +2,12 @@
 
 from typing import List, Literal
 
-from pydantic import AliasPath, BaseModel, ConfigDict, Field
+from pydantic import AliasPath, ConfigDict, Field
 
-from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, as_global
+from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, _ParcelEntry, as_global
 
 
-class BaseURLListEntry(BaseModel):
+class BaseURLListEntry(_ParcelEntry):
     model_config = ConfigDict(populate_by_name=True)
     pattern: Global[str]
 

{catalystwan-0.36.0.dev4 → catalystwan-0.36.0.dev6}/catalystwan/models/configuration/feature_profile/sdwan/policy_object/security/zone.py

@@ -2,13 +2,13 @@
 
 from typing import List, Literal, Optional
 
-from pydantic import AliasPath, BaseModel, ConfigDict, Field, field_validator, model_validator
+from pydantic import AliasPath, ConfigDict, Field, field_validator, model_validator
 
-from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, as_global
+from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase, _ParcelEntry, as_global
 from catalystwan.models.common import InterfaceStr, check_fields_exclusive
 
 
-class SecurityZoneListEntry(BaseModel):
+class SecurityZoneListEntry(_ParcelEntry):
     vpn: Optional[Global[str]] = Field(default=None, description="0-65530 single number")
     interface: Optional[Global[InterfaceStr]] = None
 

{catalystwan-0.36.0.dev4 → catalystwan-0.36.0.dev6}/catalystwan/models/configuration/feature_profile/sdwan/service/route_policy.py

@@ -146,7 +146,7 @@ class SetCommunity(BaseModel):
         populate_by_name=True,
     )
     additive: Union[Global[bool], Default[bool]] = as_default(False)
-    community: Optional[Union[Global[str], Global[Community], Variable]] = None
+    community: Optional[Union[Global[List[str]], Variable]] = None
 
 
 class Accept(BaseModel):
@@ -333,8 +333,8 @@ class RoutePolicySequence(BaseModel):
     def associate_as_path_action(self, prepend: List[int]) -> None:
         self._accept_action.as_path = SetAsPath.from_list(prepend)
 
-    def associate_community_action(self, additive: bool, community: str) -> None:
-        set_community = SetCommunity(additive=as_global(additive), community=as_global(community))
+    def associate_communities_action(self, additive: bool, communities: List[str]) -> None:
+        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:

{catalystwan-0.36.0.dev4 → catalystwan-0.36.0.dev6}/catalystwan/models/configuration/feature_profile/sdwan/system/logging_parcel.py

@@ -4,7 +4,7 @@ from pydantic import AliasPath, BaseModel, ConfigDict, Field
 
 from catalystwan.api.configuration_groups.parcel import Default, Global, Variable, _ParcelBase, as_default, as_global
 
-Priority = Literal["information", "debugging", "notice", "warn", "error", "critical", "alert", "emergency"]
+Priority = Literal["informational", "debugging", "notice", "warn", "error", "critical", "alert", "emergency"]
 TlsVersion = Literal["TLSv1.1", "TLSv1.2"]
 AuthType = Literal["Server", "Mutual"]
 CypherSuite = Literal[
@@ -40,7 +40,9 @@ class Server(BaseModel):
     source_interface: Union[Global[str], Default[None], Variable] = Field(
         default=Default[None](value=None), serialization_alias="sourceInterface", validation_alias="sourceInterface"
     )
-    priority: Union[Global[Priority], Default[Priority], Variable] = Field(default=as_default("information", Priority))
+    priority: Union[Global[Priority], Default[Priority], Variable] = Field(
+        default=as_default("informational", Priority)
+    )
     enable_tls: Union[Global[bool], Default[bool], Variable] = Field(
         default=as_default(False), serialization_alias="tlsEnable", validation_alias="tlsEnable"
     )
@@ -109,7 +111,7 @@ class LoggingParcel(_ParcelBase):
         name: str,
         vpn: int = 0,
         source_interface: Optional[str] = None,
-        priority: Priority = "information",
+        priority: Priority = "informational",
         enable_tls: bool = False,
         custom_profile: bool = False,
         profile_properties: Optional[str] = None,
@@ -127,7 +129,7 @@ class LoggingParcel(_ParcelBase):
         name: str,
         vpn: int = 0,
         source_interface: Optional[str] = None,
-        priority: Priority = "information",
+        priority: Priority = "informational",
         enable_tls: bool = False,
         custom_profile: bool = False,
         profile_properties: Optional[str] = None,
@@ -145,7 +147,7 @@ class LoggingParcel(_ParcelBase):
         name: str,
         vpn: int,
         source_interface: Optional[str] = None,
-        priority: Priority = "information",
+        priority: Priority = "informational",
         enable_tls: bool = False,
         custom_profile: bool = False,
         profile_properties: Optional[str] = None,

{catalystwan-0.36.0.dev4 → catalystwan-0.36.0.dev6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "catalystwan"
-version = "0.36.0dev4"
+version = "0.36.0dev6"
 description = "Cisco Catalyst WAN SDK for Python"
 authors = ["kagorski <kagorski@cisco.com>"]
 readme = "README.md"