improve supervisory disc model (#71)

Author: sbasan

ENDPOINTS.md

@@ -1,6 +1,6 @@
 **THIS FILE WAS AUTO-GENERATED DO NOT EDIT**
 
-Generated for: catalystwan-0.40.2.dev6
+Generated for: catalystwan-0.40.2.dev7
 
 All URIs are relative to */dataservice*
 HTTP request | Supported Versions | Method | Payload Type | Return Type | Tenancy Mode

catalystwan/models/common.py

@@ -183,6 +183,31 @@ def str_as_str_list(val: Union[str, Sequence[str]]) -> Sequence[str]:
 
 IntRange = Tuple[int, Optional[int]]
 
+DualToneCadenceInterval = Annotated[int, Field(ge=50, le=10_000)]
+DualToneCadenceStartStop = Tuple[DualToneCadenceInterval, DualToneCadenceInterval]
+
+
+def str_as_cadence_pairs(val: Union[str, Sequence[DualToneCadenceStartStop]]) -> Sequence[DualToneCadenceStartStop]:
+    if isinstance(val, str):
+        tab = val.split()
+        val = list()
+        assert len(tab) % 2 == 0, "cadence contain on/off interval pairs, odd number of entries detected"
+        for start, stop in zip(tab, tab[1:]):
+            val.append((int(start), int(stop)))
+    return val
+
+
+def tuple_to_str(val: Tuple[Any, ...]) -> str:
+    return " ".join(map(str, val))
+
+
+SpaceSeparatedCustomCadenceRanges = Annotated[
+    List[DualToneCadenceStartStop],
+    PlainSerializer(lambda x: " ".join(map(tuple_to_str, x)), return_type=str, when_used="json-unless-none"),
+    BeforeValidator(str_as_cadence_pairs),
+    Field(min_length=1),
+]
+
 SpaceSeparatedUUIDList = Annotated[
     List[UUID],
     PlainSerializer(lambda x: " ".join(map(str, x)), return_type=str, when_used="json-unless-none"),

catalystwan/models/configuration/feature_profile/sdwan/uc_voice/supervisory_disconnect.py

@@ -4,6 +4,7 @@
 from pydantic import AliasPath, BaseModel, ConfigDict, Field
 
 from catalystwan.api.configuration_groups.parcel import Default, Global, Variable, _ParcelBase
+from catalystwan.models.common import SpaceSeparatedCustomCadenceRanges
 
 DualTone = Literal[
     "Busy",
@@ -17,7 +18,7 @@
 
 class SupervisoryCustomCPTone(BaseModel):
     model_config = ConfigDict(populate_by_name=True)
-    cadence: Union[Variable, Global[str]] = Field()
+    cadence: Union[Variable, Global[SpaceSeparatedCustomCadenceRanges]] = Field()
     dual_tone: Union[Variable, Global[DualTone]] = Field(validation_alias="dualTone", serialization_alias="dualTone")
     dualtone_frequency_in: Union[Variable, Global[int]] = Field(
         validation_alias="dualtoneFrequencyIn", serialization_alias="dualtoneFrequencyIn"

catalystwan/models/policy/list/supervisory_disconnect.py

@@ -5,7 +5,7 @@
 from pydantic import BaseModel, ConfigDict, Field
 from typing_extensions import Annotated
 
-from catalystwan.models.common import IntStr, SpaceSeparatedNonNegativeIntList
+from catalystwan.models.common import IntStr, SpaceSeparatedCustomCadenceRanges
 from catalystwan.models.policy.policy_list import PolicyListBase, PolicyListId, PolicyListInfo
 
 
@@ -36,7 +36,7 @@ class CustomModeEntry(BaseModel):
     model_config = ConfigDict(populate_by_name=True)
     mode: Literal["custom_mode"] = "custom_mode"
     dualtone_type: str = Field(validation_alias="dualtoneType", serialization_alias="dualtoneType")
-    cadence: SpaceSeparatedNonNegativeIntList
+    cadence: SpaceSeparatedCustomCadenceRanges
     dualtone_frequency1: IntStr = Field(
         ge=300, le=3600, validation_alias="dualtoneFrequency1", serialization_alias="dualtoneFrequency1"
     )

pyproject.toml

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