catalystwan 0.41.2.dev4__tar.gz → 0.41.2.dev6__tar.gz

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

@@ -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 → catalystwan-0.41.2.dev6}/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-0.41.2.dev6/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-0.41.2.dev4 → catalystwan-0.41.2.dev6}/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-0.41.2.dev4 → catalystwan-0.41.2.dev6}/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-0.41.2.dev4 → catalystwan-0.41.2.dev6}/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 → catalystwan-0.41.2.dev6}/pyproject.toml

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