catalystwan 0.41.2.dev4__py3-none-any.whl → 0.41.2.dev6__py3-none-any.whl

catalystwan/exceptions.py

@@ -216,3 +216,10 @@ class CatalystwanDeprecationWarning(DeprecationWarning):
             f" The public API SHOULD NOT be considered stable."
         )
         return message
+
+
+class ParcelModelNotFound(CatalystwanException):
+    """Raised when there is no model matching parcelType field"""
+
+    def __init__(self, type_):
+        self.message = f"Cannot determine model class for parcel type: {type_}"

catalystwan/integration_tests/feature_profile/test_parcel.py

@@ -0,0 +1,54 @@
+# Copyright 2025 Cisco Systems, Inc. and its affiliates
+from typing import Literal, Union
+
+import pytest
+from pydantic import Field
+from typing_extensions import Annotated
+
+from catalystwan.api.configuration_groups.parcel import _ParcelBase
+from catalystwan.exceptions import ParcelModelNotFound
+from catalystwan.models.configuration.feature_profile.parcel import find_type, list_types
+from catalystwan.models.configuration.feature_profile.sdwan.topology import (
+    AnyTopologyParcel,
+    CustomControlParcel,
+    HubSpokeParcel,
+    MeshParcel,
+)
+
+
+def test_list_types():
+    observed_types = list_types(AnyTopologyParcel)
+    assert set(observed_types) == {MeshParcel, HubSpokeParcel, CustomControlParcel}
+
+
+def test_find_type():
+    observed_type = find_type("mesh", AnyTopologyParcel)
+    assert observed_type == MeshParcel
+
+
+def test_find_type_raises_when_no_match():
+    with pytest.raises(ParcelModelNotFound):
+        find_type("unknown", AnyTopologyParcel)
+
+
+def test_find_type_raises_for_bogus_param():
+    with pytest.raises(ParcelModelNotFound):
+        find_type("unknown", None)
+
+
+def test_find_type_custom():
+    # Arrange
+    class CustomParcel(_ParcelBase):
+        type_: Literal["custom"] = Field(default="custom", exclude=True)
+
+    CustomUnion = Annotated[
+        Union[
+            MeshParcel,
+            CustomParcel,
+        ],
+        Field(discriminator="type_"),
+    ]
+    # Act
+    observed_type = find_type("custom", CustomUnion)
+    # Assert
+    assert observed_type == CustomParcel

catalystwan/models/configuration/feature_profile/parcel.py

@@ -1,11 +1,13 @@
 # Copyright 2024 Cisco Systems, Inc. and its affiliates
 from functools import lru_cache
-from typing import Generic, List, Literal, Optional, Sequence, TypeVar, Union, cast
+from typing import Generic, List, Literal, Optional, Sequence, Type, TypeVar, Union, cast
 from uuid import UUID
 
 from pydantic import AliasChoices, BaseModel, ConfigDict, Field, model_validator
 from typing_extensions import Annotated
 
+from catalystwan.api.configuration_groups.parcel import _ParcelBase
+from catalystwan.exceptions import ParcelModelNotFound
 from catalystwan.models.configuration.feature_profile.sdwan.application_priority import AnyApplicationPriorityParcel
 from catalystwan.models.configuration.feature_profile.sdwan.cli import AnyCliParcel
 from catalystwan.models.configuration.feature_profile.sdwan.dns_security import AnyDnsSecurityParcel
@@ -160,6 +162,7 @@ AnyParcel = Annotated[
 ]
 
 T = TypeVar("T", bound=AnyParcel)
+UT = TypeVar("UT", bound=_ParcelBase)
 
 
 class Parcel(BaseModel, Generic[T]):
@@ -227,12 +230,15 @@ class ParcelId(BaseModel):
 
 
 @lru_cache
-def list_types(any_union: T) -> Sequence[T]:
-    return cast(Sequence[T], resolve_nested_base_model_unions(any_union))
+def list_types(any_union: Type[UT]) -> Sequence[UT]:
+    return cast(Sequence[UT], resolve_nested_base_model_unions(any_union))
 
 
 @lru_cache
-def find_type(name: str, any_union: T) -> T:
+def find_type(name: str, any_union: Type[UT]) -> UT:
     parcel_types = list_types(any_union)
-    parcel_type = next(t for t in parcel_types if t._get_parcel_type() == name)
-    return cast(T, parcel_type)
+    try:
+        parcel_type = next(t for t in parcel_types if t._get_parcel_type() == name)
+    except StopIteration:
+        raise ParcelModelNotFound(name)
+    return cast(UT, parcel_type)

catalystwan/models/configuration/feature_profile/sdwan/service/appqoe.py

@@ -259,7 +259,7 @@ class AppqoeParcel(_ParcelBase):
     virtual_application: Optional[List[VirtualApplication]] = Field(
         default=None, validation_alias=AliasPath("data", "virtualApplication")
     )
-    appqoe_device_role: Global[str] = Field(
+    appqoe_device_role: Global[AppqoeDeviceRole] = Field(
         default=as_global("forwarder"), validation_alias=AliasPath("data", "appqoeDeviceRole")
     )
 

catalystwan/models/configuration/feature_profile/sdwan/service/lan/vpn.py

@@ -168,7 +168,7 @@ class IPv4RouteGatewayNextHop(BaseModel):
 class IPv4RouteGatewayNextHopWithTracker(BaseModel):
     model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True)
 
-    address: Union[Variable, Global[str]]
+    address: Union[Variable, Global[str], Global[IPv4Address]]
     distance: Union[Variable, Global[int], Default[int]] = Default[int](value=1)
     tracker: Union[Global[UUID], Default[None]] = as_default(None)
 

{catalystwan-0.41.2.dev4.dist-info → catalystwan-0.41.2.dev6.dist-info}/METADATA

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

{catalystwan-0.41.2.dev4.dist-info → catalystwan-0.41.2.dev6.dist-info}/RECORD

@@ -212,7 +212,7 @@ catalystwan/endpoints/tenant_management.py,sha256=c-kIRoS60aVklVPPrmbnW5kaiNgU23
 catalystwan/endpoints/tenant_migration.py,sha256=e6eIzRvlrnzUWqamKbWsYjX8drtB-GQKvhrJtX2VDKY,3649
 catalystwan/endpoints/troubleshooting_tools/device_connectivity.py,sha256=JkTZfebTwcambJsgjcJ8qxxBDE5XbUFyYpNqr9681DQ,3661
 catalystwan/endpoints/url_monitoring.py,sha256=ZySOjuCpIAZ4SIsah56yJ-uybYw0W9s6OjQp2FujN0g,802
-catalystwan/exceptions.py,sha256=vbUfR5qp1A0_Mr7WKyEzU5A6V8rJpaee128rjEp48UQ,6391
+catalystwan/exceptions.py,sha256=MAtoZ9xrXmUgG-zMbdtChF7B2sHAgVlzv-euHOY1kKo,6620
 catalystwan/integration_tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 catalystwan/integration_tests/base.py,sha256=0BcKgDZcGjdPH2316C-1Se4FUeAtdrNXdkUVp_aXEZc,2367
 catalystwan/integration_tests/feature_profile/sdwan/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -231,6 +231,7 @@ catalystwan/integration_tests/feature_profile/sdwan/test_system.py,sha256=ab6fG7
 catalystwan/integration_tests/feature_profile/sdwan/test_tracker.py,sha256=GnIEHmUoIZObtBK-YvjYYtDsFnGSDpAVwi4rk9-r7XE,5117
 catalystwan/integration_tests/feature_profile/sdwan/test_transport.py,sha256=xRS880JCUD06xL_EaHKNylvaXB9wRHqUYsORhU2MYus,78923
 catalystwan/integration_tests/feature_profile/sdwan/topology/test_topology.py,sha256=2vsAd0pk3wcfo8wFTRttnw4gjSPJi1KFfFCu5lGAiJQ,4340
+catalystwan/integration_tests/feature_profile/test_parcel.py,sha256=4dqt5IP39lJ6vTsx3X7OdAHpYdbsIlDdpASFAM6d87Y,1517
 catalystwan/integration_tests/profile_builder/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 catalystwan/integration_tests/profile_builder/test_pb_service.py,sha256=WO6VVA7kNXesyGtk67e0lMDZBd4Z8wB7espBh0TzUTA,9420
 catalystwan/integration_tests/profile_builder/test_pb_transport.py,sha256=QQ5f1q6OV9dIyRQy1lb3Wp9beIKaWDaDLnNoGm4XY6A,10376
@@ -245,7 +246,7 @@ catalystwan/models/configuration/common.py,sha256=2X9gj5awWPKtLPFgWfxhkRrMoX22t1
 catalystwan/models/configuration/feature_profile/README.md,sha256=IQMhbnEAbLtotT80aL2emekH-ou8CqR0WSYXhZXilJw,10050
 catalystwan/models/configuration/feature_profile/builder.py,sha256=GDqK7ZxnWHTKWHRw13xvD1aDl60xe6gFsP_B9z5T8a8,663
 catalystwan/models/configuration/feature_profile/common.py,sha256=a5xohaoXzAewtqYYdk2GJy7B-rxxlxYatlP2WZ1eZqY,30423
-catalystwan/models/configuration/feature_profile/parcel.py,sha256=c2pSHjEVA_PeqBlrqYVdB4I4L5KOVFqR4UrSXTX1uoM,7319
+catalystwan/models/configuration/feature_profile/parcel.py,sha256=k3IyNVzjtDrTjUEBYvzQeQWeqNhRNk2tXDYqbQXWX2o,7583
 catalystwan/models/configuration/feature_profile/sdwan/acl/__init__.py,sha256=-AXvVMLyaAYWUnwzTT_mvar37ZpO2vNRy_ZsUIA5dGo,324
 catalystwan/models/configuration/feature_profile/sdwan/acl/ipv4acl.py,sha256=HpiY0DCZWE9EHCbMbyIJ-iRharSRO3IGcSV3kWbMXjY,12167
 catalystwan/models/configuration/feature_profile/sdwan/acl/ipv6acl.py,sha256=MRtDNb2v1TNNf3yijLFlzL3H1KxHOquPmww1V9ZCacI,12969
@@ -314,7 +315,7 @@ catalystwan/models/configuration/feature_profile/sdwan/routing/bgp.py,sha256=4vX
 catalystwan/models/configuration/feature_profile/sdwan/routing/ospf.py,sha256=hfsfL9Fy4q7eUybhSzPDGTFgdlK1VO3zPUy1aNOOCIc,7647
 catalystwan/models/configuration/feature_profile/sdwan/routing/ospfv3.py,sha256=KW0UgMPt08OxLbX4JoShNby83HCMhlHICRLLW8pYinQ,13268
 catalystwan/models/configuration/feature_profile/sdwan/service/__init__.py,sha256=AzPWWFozmwg5nzwEj-bYhg2HTeJJ8FFPQHmvyxDvSnQ,2378
-catalystwan/models/configuration/feature_profile/sdwan/service/appqoe.py,sha256=4V5BWUYDBJEQJ7OWZRXe9Qasw4VzD52_XqmMIUv6cK8,10210
+catalystwan/models/configuration/feature_profile/sdwan/service/appqoe.py,sha256=6_diZuOtJnq0x6QFuwHQ3IgSmV5a6S-Yql7uN-JlF8c,10223
 catalystwan/models/configuration/feature_profile/sdwan/service/dhcp_server.py,sha256=XCYUektYRLZaIzJAiAuSeuKg2DdAYio38t0niN8CkhA,5289
 catalystwan/models/configuration/feature_profile/sdwan/service/dual_router_ha.py,sha256=MMwnBKBth3E91EYCPLtGJqwQYilZPWelGF6KLJmtOPw,1134
 catalystwan/models/configuration/feature_profile/sdwan/service/eigrp.py,sha256=d02hMwUFq5ycoknQci0SAgRlxuiYh0kSKDBxOzn-ves,4075
@@ -324,7 +325,7 @@ catalystwan/models/configuration/feature_profile/sdwan/service/lan/gre.py,sha256
 catalystwan/models/configuration/feature_profile/sdwan/service/lan/ipsec.py,sha256=jFwQK-xLl_l9aahCX326wRIcEobElfdFxeZY0ofXD5w,7043
 catalystwan/models/configuration/feature_profile/sdwan/service/lan/multilink.py,sha256=EKUIQDq40P01irYFWZ1fACFK6R8AusT6s96bH4qHWUg,5403
 catalystwan/models/configuration/feature_profile/sdwan/service/lan/svi.py,sha256=B9LmnmTNHUQUVYI7071Z2j4s5pJN9SUfWQEuNb1czV8,9114
-catalystwan/models/configuration/feature_profile/sdwan/service/lan/vpn.py,sha256=hM07iABYdTokFPNlwOz37ZBpta3BfX4cOdEpY9s-BBQ,24210
+catalystwan/models/configuration/feature_profile/sdwan/service/lan/vpn.py,sha256=3CfGxWQ9R9YHRJpLHzdtpjGVoNqz2VwrioCXdzi5A7k,24231
 catalystwan/models/configuration/feature_profile/sdwan/service/multicast.py,sha256=DXvUUsPVNCmkN-YLqQArP9NKjL444UPfoZavC87i2fw,10821
 catalystwan/models/configuration/feature_profile/sdwan/service/object_tracker.py,sha256=WeKWXT54cyf5r9S-PZLe_M8b2iXgRNwujJVLxxeNnsw,3291
 catalystwan/models/configuration/feature_profile/sdwan/service/route_policy.py,sha256=JSThUK1D3PsCrJCwDL4vEkiPn01cAkBc9XX6IwzJuAY,15765
@@ -630,7 +631,7 @@ catalystwan/version.py,sha256=X5yIMPIrWPbdoF9eJfwxfjcvWr7JMfWQF98hQhlGB5I,3032
 catalystwan/vmanage_auth.py,sha256=UZ57lTihsLsXw4AdU7Vn8XuY1jo3732Vc9WuFoHSiiQ,10780
 catalystwan/workflows/backup_restore_device_templates.py,sha256=BoR2KlRbpCI6RxIWG7j7tucaLpw5w3ESN20dLhsrZFY,19796
 catalystwan/workflows/tenant_migration.py,sha256=4KLbqUwH4gEegE92PCGfRd226eZd_crCUpaYUWoGXDI,9790
-catalystwan-0.41.2.dev4.dist-info/LICENSE,sha256=97ROi91Vxrj_Jio2v8FI9E8-y6x2uYdQRaFlrEbVjkc,11375
-catalystwan-0.41.2.dev4.dist-info/METADATA,sha256=ZkC0Yt4J1N7cnoV_D_9X0FMsVLZEq2rhO1v7FFtfQ9M,21275
-catalystwan-0.41.2.dev4.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-catalystwan-0.41.2.dev4.dist-info/RECORD,,
+catalystwan-0.41.2.dev6.dist-info/LICENSE,sha256=97ROi91Vxrj_Jio2v8FI9E8-y6x2uYdQRaFlrEbVjkc,11375
+catalystwan-0.41.2.dev6.dist-info/METADATA,sha256=_U2izirHEsCyVz8rO2eGD5-YkcT7hmWw8DCCif5qRqQ,21275
+catalystwan-0.41.2.dev6.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+catalystwan-0.41.2.dev6.dist-info/RECORD,,