catalystwan 0.40.1.dev2__tar.gz → 0.40.1.dev4__tar.gz

{catalystwan-0.40.1.dev2 → catalystwan-0.40.1.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: catalystwan
-Version: 0.40.1.dev2
+Version: 0.40.1.dev4
 Summary: Cisco Catalyst WAN SDK for Python
 Home-page: https://github.com/cisco-en-programmability/catalystwan-sdk
 Author: kagorski

{catalystwan-0.40.1.dev2 → catalystwan-0.40.1.dev4}/catalystwan/api/builders/feature_profiles/report.py

@@ -4,7 +4,7 @@ from typing import Any, List, Optional, Tuple, Union
 from uuid import UUID
 
 from pydantic import BaseModel, ConfigDict, Field
-from requests import Response
+from requests import PreparedRequest, Request, Response
 
 from catalystwan.exceptions import ManagerErrorInfo, ManagerHTTPError
 from catalystwan.models.configuration.feature_profile.parcel import AnyParcel
@@ -23,8 +23,7 @@ def handle_build_report(func):
             self.build_report.add_failed_parcel(
                 parcel_name=parcel.parcel_name,
                 parcel_type=parcel._get_parcel_type(),
-                error_info=e.info,
-                request=e.request,
+                error=e,
             )
             return None
 
@@ -36,10 +35,34 @@ class FailedRequestDetails(BaseModel):
     url: str
     body: str
 
-    @staticmethod
-    def from_response(response: Response):
-        request = response.request
-        FailedRequestDetails(method=str(request.method), url=str(request.url), body=str(request.body))
+    @classmethod
+    def from_request(cls, request: Union[Request, PreparedRequest, Any]) -> "FailedRequestDetails":
+        if isinstance(request, (Request, PreparedRequest)):
+            return cls(
+                method=str(request.method),
+                url=str(request.url),
+                body=str(request.body if hasattr(request, "body") else ""),
+            )
+        return cls.as_empty()
+
+    @classmethod
+    def as_empty(cls) -> "FailedRequestDetails":
+        return cls(method="", url="", body="")
+
+
+class ResponseDetails(BaseModel):
+    status_code: int
+    reason: str
+
+    @classmethod
+    def from_response(cls, response: Union[Response, Any]) -> "ResponseDetails":
+        if isinstance(response, Response):
+            return cls(status_code=response.status_code, reason=response.reason)
+        return cls.as_empty()
+
+    @classmethod
+    def as_empty(cls) -> "ResponseDetails":
+        return cls(status_code=-1, reason="")
 
 
 class FailedParcel(BaseModel):
@@ -50,6 +73,24 @@ class FailedParcel(BaseModel):
     request_details: Optional[FailedRequestDetails] = Field(
         default=None, serialization_alias="failedRequest", validation_alias="failedRequest"
     )
+    response_details: Optional[ResponseDetails] = Field(
+        default=None, serialization_alias="reponseStausCode", validation_alias="reponseStausCode"
+    )
+
+    @classmethod
+    def from_error(
+        cls,
+        parcel_name: str,
+        parcel_type: str,
+        error: ManagerHTTPError,
+    ):
+        return cls(
+            parcel_name=parcel_name,
+            parcel_type=parcel_type,
+            error_info=error.info,
+            request_details=FailedRequestDetails.from_request(error.request),
+            response_details=ResponseDetails.from_response(error.response),
+        )
 
 
 class FeatureProfileBuildReport(BaseModel):
@@ -70,19 +111,13 @@ class FeatureProfileBuildReport(BaseModel):
         self,
         parcel_name: str,
         parcel_type: str,
-        error_info: Union[ManagerErrorInfo, str],
-        request: Optional[Any] = None,
+        error: ManagerHTTPError,
     ) -> None:
-        if request is not None:
-            request = FailedRequestDetails(
-                method=str(request.method),
-                url=str(request.url),
-                body=str(request.body),
-            )
-
         self.failed_parcels.append(
-            FailedParcel(
-                parcel_name=parcel_name, parcel_type=parcel_type, error_info=error_info, request_details=request
+            FailedParcel.from_error(
+                parcel_name=parcel_name,
+                parcel_type=parcel_type,
+                error=error,
             )
         )
 
@@ -93,8 +128,10 @@ def handle_build_report_for_failed_subparcel(
     parent_failed_to_create_message = (
         f"Parent parcel: {parent.parcel_name} failed to create. This subparcel is dependent on it."
     )
-    build_report.add_failed_parcel(
-        parcel_name=subparcel.parcel_name,
-        parcel_type=subparcel._get_parcel_type(),
-        error_info=parent_failed_to_create_message,
+    build_report.failed_parcels.append(
+        FailedParcel(
+            parcel_name=subparcel.parcel_name,
+            parcel_type=subparcel._get_parcel_type(),
+            error_info=parent_failed_to_create_message,
+        ),
     )

{catalystwan-0.40.1.dev2 → catalystwan-0.40.1.dev4}/catalystwan/api/builders/feature_profiles/uc_voice.py

@@ -34,6 +34,7 @@ from catalystwan.models.configuration.feature_profile.sdwan.uc_voice.call_routin
 from catalystwan.models.configuration.feature_profile.sdwan.uc_voice.digital_interface import (
     Association as DigitalInterfaceAssociation,
 )
+from catalystwan.models.configuration.feature_profile.sdwan.uc_voice.srst import Association as SrstAssociation
 
 logger = logging.getLogger(__name__)
 
@@ -41,8 +42,23 @@ if TYPE_CHECKING:
     from catalystwan.session import ManagerSession
 
 
-ParcelWithAssociations = Union[CallRoutingParcel, DigitalInterfaceParcel, AnalogInterfaceParcel]
-Association = Union[List[DigitalInterfaceAssociation], List[AnalogInterfaceAssociation], List[CallRoutingAssociation]]
+ParcelWithAssociations = Union[CallRoutingParcel, DigitalInterfaceParcel, AnalogInterfaceParcel, SrstParcel]
+Association = Union[
+    List[DigitalInterfaceAssociation],
+    List[AnalogInterfaceAssociation],
+    List[CallRoutingAssociation],
+    List[SrstAssociation],
+]
+AssociableParcel = Union[
+    MediaProfileParcel,
+    ServerGroupParcel,
+    SrstParcel,
+    TranslationProfileParcel,
+    TranslationRuleParcel,
+    TrunkGroupParcel,
+    VoiceGlobalParcel,
+    VoiceTenantParcel,
+]
 
 
 @dataclass
@@ -101,6 +117,7 @@ class UcVoiceFeatureProfileBuilder:
         self._api = UcVoiceFeatureProfileAPI(session)
         self._endpoints = UcVoiceFeatureProfile(session)
         self._independent_parcels: List[AnyUcVoiceParcel] = []
+        self._associable_parcles: List[AssociableParcel] = []
         self._translation_profiles: List[TranslationProfile] = []
         self._pushed_associable_parcels: Dict[str, UUID] = {}  # Maps parcel names to their created UUIDs.
         self._parcels_with_associations: List[ParcelWithAssociations] = []
@@ -125,6 +142,9 @@ class UcVoiceFeatureProfileBuilder:
         """
         self._independent_parcels.append(parcel)
 
+    def add_associable_parcel(self, parcel: AssociableParcel) -> None:
+        self._associable_parcles.append(parcel)
+
     def add_translation_profile(
         self,
         tpp: TranslationProfileParcel,
@@ -171,15 +191,18 @@ class UcVoiceFeatureProfileBuilder:
 
         # Create independent parcels
         for ip in self._independent_parcels:
-            parcel_uuid = self._create_parcel(profile_uuid, ip)
-            if parcel_uuid and isinstance(ip, self.ASSOCIABLE_PARCELS):
-                self._pushed_associable_parcels[ip.parcel_name] = parcel_uuid
+            self._create_parcel(profile_uuid, ip)
 
         # Create translation profiles
         for tp in self._translation_profiles:
-            parcel_uuid = self._create_translation_profile(profile_uuid, tp)
-            if parcel_uuid:
-                self._pushed_associable_parcels[tp.tpp.parcel_name] = parcel_uuid
+            tp_parcel_uuid = self._create_translation_profile(profile_uuid, tp)
+            if tp_parcel_uuid:
+                self._pushed_associable_parcels[tp.tpp.parcel_name] = tp_parcel_uuid
+
+        for ap in self._associable_parcles:
+            ap_parcel_uuid = self._create_parcel(profile_uuid, ap)
+            if ap_parcel_uuid:
+                self._pushed_associable_parcels[ap.parcel_name] = ap_parcel_uuid
 
         # Create parcels with associations
         for pwa in self._parcels_with_associations:

{catalystwan-0.40.1.dev2 → catalystwan-0.40.1.dev4}/catalystwan/api/feature_profile_api.py

@@ -2259,7 +2259,10 @@ class UcVoiceFeatureProfileAPI:
     SDWAN Feature Profile UC Voice APIs
     """
 
-    ENDPOINT_PARCEL_TYPE_MAP = {"analog-interface": "tdm-sip/analog-interface"}
+    ENDPOINT_PARCEL_TYPE_MAP = {
+        "analog-interface": "tdm-sip/analog-interface",
+        "digital-interface": "tdm-sip/digital-interface",
+    }
 
     def __init__(self, session: ManagerSession):
         self.session = session

{catalystwan-0.40.1.dev2 → catalystwan-0.40.1.dev4}/catalystwan/integration_tests/base.py

@@ -7,6 +7,7 @@ from uuid import UUID, uuid4
 
 from packaging.version import Version  # type: ignore
 
+from catalystwan.api.builders.feature_profiles.uc_voice import UcVoiceFeatureProfileAPI
 from catalystwan.api.feature_profile_api import (
     ApplicationPriorityFeatureProfileAPI,
     CliFeatureProfileAPI,
@@ -64,14 +65,15 @@ class TestCaseBase(unittest.TestCase):
     profile_uuid: UUID
 
     api: Union[
-        SystemFeatureProfileAPI,
-        ServiceFeatureProfileAPI,
-        OtherFeatureProfileAPI,
-        TransportFeatureProfileAPI,
+        ApplicationPriorityFeatureProfileAPI,
         CliFeatureProfileAPI,
         DnsSecurityFeatureProfileAPI,
+        OtherFeatureProfileAPI,
+        ServiceFeatureProfileAPI,
         SIGSecurityAPI,
-        ApplicationPriorityFeatureProfileAPI,
+        SystemFeatureProfileAPI,
+        TransportFeatureProfileAPI,
+        UcVoiceFeatureProfileAPI,
     ]
 
     @classmethod

catalystwan-0.40.1.dev4/catalystwan/integration_tests/profile_builder/test_pb_uc_voice.py

@@ -0,0 +1,258 @@
+# Copyright 2025 Cisco Systems, Inc. and its affiliates
+from uuid import uuid4
+
+from catalystwan.api.configuration_groups.parcel import Default, Global, Variable, as_global, as_variable
+from catalystwan.integration_tests.base import TestCaseBase
+from catalystwan.models.configuration.feature_profile.common import FeatureProfileCreationPayload, RefIdItem
+from catalystwan.models.configuration.feature_profile.sdwan.uc_voice import (
+    AnalogInterfaceParcel,
+    MediaProfileParcel,
+    SrstParcel,
+    TranslationProfileParcel,
+    TranslationRuleParcel,
+)
+from catalystwan.models.configuration.feature_profile.sdwan.uc_voice.analog_interface import (
+    Association as AnalogAssociation,
+)
+from catalystwan.models.configuration.feature_profile.sdwan.uc_voice.analog_interface import ModuleType, SlotId
+from catalystwan.models.configuration.feature_profile.sdwan.uc_voice.call_routing import (
+    Association as CallRoutingAssociation,
+)
+from catalystwan.models.configuration.feature_profile.sdwan.uc_voice.call_routing import CallRoutingParcel
+from catalystwan.models.configuration.feature_profile.sdwan.uc_voice.digital_interface import (
+    Association as DigitalInterfaceAssociation,
+)
+from catalystwan.models.configuration.feature_profile.sdwan.uc_voice.digital_interface import (
+    BasicSettings,
+    CableLengthType,
+    CableLengthValue,
+    DigitalInterfaceParcel,
+    Framing,
+    LineCode,
+    ModuleLocation,
+    SwitchType,
+    VoiceInterfaceTemplates,
+)
+from catalystwan.models.configuration.feature_profile.sdwan.uc_voice.srst import Association as SrstAssociation
+from catalystwan.models.configuration.feature_profile.sdwan.uc_voice.srst import Pool
+from catalystwan.models.configuration.feature_profile.sdwan.uc_voice.translation_rule import Action, RuleSettings
+from catalystwan.models.configuration.feature_profile.sdwan.uc_voice.trunk_group import TrunkGroupParcel
+from catalystwan.tests.builders.uc_voice import as_default
+
+
+class TestUcVoiceFeatureProfileBuilder(TestCaseBase):
+    def setUp(self) -> None:
+        self.feature_profile_name = f"FeatureProfileBuilderUcVoice_{str(uuid4())[:5]}"
+        self.feature_profile_description = "UC Voice feature profile"
+
+        self.builder = self.session.api.builders.feature_profiles.create_builder("uc-voice")
+        self.builder.add_profile_name_and_description(
+            feature_profile=FeatureProfileCreationPayload(
+                name=self.feature_profile_name, description=self.feature_profile_description
+            )
+        )
+
+        self.api = self.session.api.sdwan_feature_profiles.uc_voice
+
+        self.translation_profile = TranslationProfileParcel(
+            parcel_name="TranslationProfile",
+            parcel_description="TranslationProfileDescription",
+            translation_profile_settings=[],
+        )
+
+        self.translation_rule_calling = TranslationRuleParcel(
+            parcel_name="TranslationRuleCalling",
+            parcel_description="Description",
+            rule_name=Global[int](value=2),
+            rule_settings=[
+                RuleSettings(
+                    action=Global[Action](value="replace"),
+                    match=Global[str](value="/123/"),
+                    replacement_pattern=Global[str](value="/444/"),
+                    rule_num=Global[int](value=2),
+                )
+            ],
+        )
+
+        self.translation_rule_called = TranslationRuleParcel(
+            parcel_name="TranslationRuleCalled",
+            parcel_description="Description",
+            rule_name=Global[int](value=4),
+            rule_settings=[
+                RuleSettings(
+                    action=Global[Action](value="replace"),
+                    match=Global[str](value="/321/"),
+                    replacement_pattern=Global[str](value="/4445/"),
+                    rule_num=Global[int](value=4),
+                )
+            ],
+        )
+
+        self.media_profile = MediaProfileParcel(
+            parcel_name="MediaProfile",
+            parcel_description="MediaProfileDescription",
+            codec=as_global(["g711ulaw"]),
+            dtmf=Variable(value="{{test_1}}"),
+            media_profile_number=Variable(value="{{test_2}}"),
+        )
+
+        self.trunk_group = TrunkGroupParcel(
+            parcel_name="TrunkGroup",
+            parcel_description="TrunkGroupDescription",
+            hunt_scheme_method=as_default(None),
+            max_calls_in=as_default(None),
+            max_calls_out=as_default(None),
+            max_retries=as_default(None),
+            hunt_scheme_channel=as_default(None),
+            hunt_scheme_direction=as_default(None),
+        )
+
+    def test_build_profile_with_translation_profile_and_rules(self):
+        self.builder.add_translation_profile(
+            self.translation_profile, self.translation_rule_calling, self.translation_rule_called
+        )
+
+        report = self.builder.build()
+
+        assert len(report.failed_parcels) == 0, "Failed to build feature profile with translation profile and rules."
+
+    def test_build_profile_with_trunk_group(self):
+        self.builder.add_associable_parcel(self.trunk_group)
+
+        report = self.builder.build()
+
+        assert len(report.failed_parcels) == 0, "Failed to build feature profile with trunk group parcel."
+
+    def test_build_profile_with_digital_interface_translation_profile_and_trunk_group(self):
+        digital_interface = DigitalInterfaceParcel(
+            parcel_name="DigitalInterfaceParcel",
+            parcel_description="DigitalInterfaceParcel",
+            shutdown=[],
+            isdn_timer=[],
+            interface=[],
+            line_params=[],
+            outgoing_ie=[],
+            dsp_hairpin=as_default(False),
+            module_location=as_global("0/1", ModuleLocation),
+            voice_interface_templates=as_global("1 Port T1", VoiceInterfaceTemplates),
+            basic_settings=[
+                BasicSettings(
+                    delay_connect_timer=as_default(20),
+                    framing=as_default("esf", Framing),
+                    line_code=as_default("b8zs", LineCode),
+                    network_side=as_default(False),
+                    port_range=as_global("0-0"),
+                    switch_type=as_default("primary-ni", SwitchType),
+                    cable_length=as_default("0", CableLengthValue),
+                    cable_length_type=as_default("long", CableLengthType),
+                    timeslots=as_global("1-24"),
+                )
+            ],
+            association=[
+                DigitalInterfaceAssociation(
+                    port_range=as_global("0-0"),
+                    translation_profile=RefIdItem(ref_id=as_global(self.translation_profile.parcel_name)),
+                    trunk_group=RefIdItem(ref_id=as_global(self.trunk_group.parcel_name)),
+                    translation_profile_direction=as_default(None),
+                    trunk_group_priority=as_default(None),
+                )
+            ],
+        )
+
+        self.builder.add_associable_parcel(self.trunk_group)
+        self.builder.add_translation_profile(
+            self.translation_profile, self.translation_rule_calling, self.translation_rule_called
+        )
+        self.builder.add_parcel_with_associations(digital_interface)
+
+        report = self.builder.build()
+
+        assert (
+            len(report.failed_parcels) == 0
+        ), "Failed to build feature profile with digital interface, trunk group, and translation profile associations."
+
+    def test_build_profile_with_analog_interface_and_translation_profile_and_rules_associations(self):
+        analog_interface = AnalogInterfaceParcel(
+            parcel_name="AnalogInterface",
+            parcel_description="",
+            enable=as_default(True),
+            slot_id=as_global("0/1", SlotId),
+            module_type=as_global("72 Port FXS", ModuleType),
+            association=[
+                AnalogAssociation(
+                    port_range=as_variable("{{test}}"),
+                    translation_profile=RefIdItem(ref_id=as_global("TranslationProfile")),
+                    trunk_group=RefIdItem(ref_id=as_default(None)),
+                    trunk_group_priority=as_default(None),
+                    translation_rule_direction=as_default(None),
+                )
+            ],
+        )
+
+        self.builder.add_translation_profile(
+            self.translation_profile, self.translation_rule_calling, self.translation_rule_called
+        )
+        self.builder.add_parcel_with_associations(analog_interface)
+
+        report = self.builder.build()
+
+        assert (
+            len(report.failed_parcels) == 0
+        ), "Failed to build feature profile with analog interface and translation profile associations."
+
+    def test_build_profile_with_srts_and_media_profile_associations(self):
+        srst = SrstParcel(
+            parcel_name="Srst",
+            parcel_description="SrstDescription",
+            max_dn=Global[int](value=3),
+            max_phones=Global[int](value=3),
+            pool=[
+                Pool(
+                    ipv4_oripv6prefix=Variable(value="{{test_4}}"),
+                    pool_tag=as_global(1),
+                )
+            ],
+            association=[
+                SrstAssociation(
+                    media_profile=RefIdItem(ref_id=as_global(self.media_profile.parcel_name)),
+                )
+            ],
+        )
+
+        self.builder.add_associable_parcel(self.media_profile)
+        self.builder.add_parcel_with_associations(srst)
+
+        report = self.builder.build()
+
+        assert (
+            len(report.failed_parcels) == 0
+        ), "Failed to build feature profile with SRST and media profile associations."
+
+    def test_build_profile_with_call_routing(self):
+        call_routing = CallRoutingParcel(
+            parcel_name="CallRoutingParcel",
+            parcel_description="CallRoutingDescription",
+            dial_peer_tag_prefix=Default[None](value=None),
+            port_module_location=RefIdItem(ref_id=Default[None](value=None)),
+            voice=[],
+            modem_pass_through=[],
+            fax_protocol=[],
+            association=[
+                CallRoutingAssociation(
+                    dial_peer_range=as_global("1"),
+                    media_profile=RefIdItem(ref_id=as_global(self.media_profile.parcel_name)),
+                    translation_profile=RefIdItem(ref_id=as_global(self.translation_profile.parcel_name)),
+                    trunk_group=RefIdItem(ref_id=as_global(self.trunk_group.parcel_name)),
+                )
+            ],
+        )
+        self.builder.add_parcel_with_associations(call_routing)
+
+        report = self.builder.build()
+
+        assert len(report.failed_parcels) == 0, "Failed to build feature profile with Call Routing parcel."
+
+    def tearDown(self) -> None:
+        profile = self.api.get_profiles().filter(profile_name=self.feature_profile_name).single_or_default()
+        if profile:
+            self.api.delete_profile(profile.profile_id)

{catalystwan-0.40.1.dev2 → catalystwan-0.40.1.dev4}/catalystwan/models/common.py

@@ -353,6 +353,10 @@ MpVoiceCodec = Literal[
     "G722",
     "G729r8",
     "ilbc",
+    "g711ulaw",
+    "g711alaw",
+    "g772",
+    "g729r8",
 ]
 
 FaxProtocols = Literal[

{catalystwan-0.40.1.dev2 → catalystwan-0.40.1.dev4}/catalystwan/models/configuration/feature_profile/parcel.py

@@ -3,7 +3,7 @@ from functools import lru_cache
 from typing import Generic, List, Literal, Optional, Sequence, TypeVar, Union, cast
 from uuid import UUID
 
-from pydantic import BaseModel, ConfigDict, Field, model_validator
+from pydantic import AliasChoices, BaseModel, ConfigDict, Field, model_validator
 from typing_extensions import Annotated
 
 from catalystwan.models.configuration.feature_profile.sdwan.application_priority import AnyApplicationPriorityParcel
@@ -207,7 +207,7 @@ class ParcelSequence(BaseModel, Generic[T]):
 class ParcelCreationResponse(BaseModel):
     model_config = ConfigDict(populate_by_name=True)
 
-    id: UUID = Field(serialization_alias="parcelId", validation_alias="parcelId")
+    id: UUID = Field(validation_alias=AliasChoices("parcelId", "featureId"))  # Accept both keys
 
 
 class ParcelAssociationPayload(BaseModel):

{catalystwan-0.40.1.dev2 → catalystwan-0.40.1.dev4}/catalystwan/models/configuration/feature_profile/sdwan/embedded_security/policy.py

@@ -135,7 +135,9 @@ class SslDecryption(BaseModel):
 
 class AdvancedInspectionProfile(BaseModel):
     model_config = ConfigDict(populate_by_name=True, extra="forbid")
-    advanced_inspection_profile: RefIdItem = Field(validation_alias="advancedInspectionProfile")
+    advanced_inspection_profile: RefIdItem = Field(
+        validation_alias="advancedInspectionProfile", serialization_alias="advancedInspectionProfile"
+    )
 
     @classmethod
     def from_uuid(cls, uuid: UUID) -> Self:

{catalystwan-0.40.1.dev2 → catalystwan-0.40.1.dev4}/catalystwan/models/configuration/feature_profile/sdwan/uc_voice/__init__.py

@@ -12,6 +12,9 @@ from catalystwan.models.configuration.feature_profile.sdwan.uc_voice.dsp_farm im
 from catalystwan.models.configuration.feature_profile.sdwan.uc_voice.media_profile import MediaProfileParcel
 from catalystwan.models.configuration.feature_profile.sdwan.uc_voice.server_group import ServerGroupParcel
 from catalystwan.models.configuration.feature_profile.sdwan.uc_voice.srst import SrstParcel
+from catalystwan.models.configuration.feature_profile.sdwan.uc_voice.supervisory_disconnect import (
+    SupervisoryDiconnectParcel,
+)
 from catalystwan.models.configuration.feature_profile.sdwan.uc_voice.translation_profile import TranslationProfileParcel
 from catalystwan.models.configuration.feature_profile.sdwan.uc_voice.translation_rule import TranslationRuleParcel
 from catalystwan.models.configuration.feature_profile.sdwan.uc_voice.trunk_group import TrunkGroupParcel
@@ -27,6 +30,7 @@ AnyUcVoiceParcel = Annotated[
         MediaProfileParcel,
         ServerGroupParcel,
         SrstParcel,
+        SupervisoryDiconnectParcel,
         TranslationProfileParcel,
         TranslationRuleParcel,
         TrunkGroupParcel,
@@ -44,6 +48,7 @@ __all__ = (
     "DspFarmParcel",
     "MediaProfileParcel",
     "ServerGroupParcel",
+    "SupervisoryDiconnectParcel",
     "SrstParcel",
     "TranslationProfileParcel",
     "TranslationRuleParcel",

{catalystwan-0.40.1.dev2 → catalystwan-0.40.1.dev4}/catalystwan/models/configuration/feature_profile/sdwan/uc_voice/digital_interface.py

@@ -72,6 +72,7 @@ Value = Literal[
 ]
 
 CableLengthValue = Literal[
+    "0",
     "110",
     "220",
     "330",
@@ -274,13 +275,17 @@ class Association(BaseModel):
     translation_profile_direction: Optional[
         Union[Variable, Default[None], Global[TranslationProfileDirection]]
     ] = Field(
-        default=None, validation_alias="translationProfileDirection", serialization_alias="translationProfileDirection"
+        default=Default[None](value=None),
+        validation_alias="translationProfileDirection",
+        serialization_alias="translationProfileDirection"
     )
     trunk_group: Optional[RefIdItem] = Field(
         default=None, validation_alias="trunkGroup", serialization_alias="trunkGroup"
     )
     trunk_group_priority: Optional[Union[Variable, Global[int], Default[None]]] = Field(
-        default=None, validation_alias="trunkGroupPriority", serialization_alias="trunkGroupPriority"
+        default=Default[None](value=None),
+        validation_alias="trunkGroupPriority",
+        serialization_alias="trunkGroupPriority"
     )
 
 
@@ -320,5 +325,5 @@ class DigitalInterfaceParcel(_ParcelBase):
         default=None, validation_alias=AliasPath("data", "outgoingIe"), description="list of outgoing IEs and messages"
     )
     voice_interface_templates: Optional[Global[VoiceInterfaceTemplates]] = Field(
-        default=None, validation_alias="voiceInterfaceTemplates"
+        default=None, validation_alias=AliasPath("data", "voiceInterfaceTemplates")
     )

{catalystwan-0.40.1.dev2 → catalystwan-0.40.1.dev4}/catalystwan/models/configuration/feature_profile/sdwan/uc_voice/media_profile.py

@@ -9,7 +9,7 @@ from catalystwan.models.common import MpDtmf, MpVoiceCodec
 
 class Codec(BaseModel):
     model_config = ConfigDict(populate_by_name=True)
-    value: Union[Variable, Global[MpVoiceCodec]] = Field()
+    value: Union[Variable, List[MpVoiceCodec]] = Field()
     pref_num: Optional[str] = Field(
         default=None, validation_alias="prefNum", serialization_alias="prefNum", description="Preference number"
     )
@@ -18,6 +18,6 @@ class Codec(BaseModel):
 class MediaProfileParcel(_ParcelBase):
     model_config = ConfigDict(populate_by_name=True)
     type_: Literal["media-profile"] = Field(default="media-profile", exclude=True)
-    codec: List[Codec] = Field(validation_alias=AliasPath("data", "codec"))
+    codec: Global[List[MpVoiceCodec]] = Field(validation_alias=AliasPath("data", "codec"))
     dtmf: Union[Variable, Global[MpDtmf]] = Field(validation_alias=AliasPath("data", "dtmf"))
     media_profile_number: Union[Variable, Global[int]] = Field(validation_alias=AliasPath("data", "mediaProfileNumber"))

{catalystwan-0.40.1.dev2 → catalystwan-0.40.1.dev4}/catalystwan/models/configuration/feature_profile/sdwan/uc_voice/srst.py

@@ -33,17 +33,13 @@ class CallForward(BaseModel):
     timeout: Optional[Union[Variable, Default[int], Global[int]]] = Field(default=None)
 
 
-class TranslationProfile(BaseModel):
-    ref_id: Union[Default[None], Global[str]] = Field(validation_alias="refId", serialization_alias="refId")
-
-
 TranslationProfileDirection = Literal[
     "incoming",
     "outgoing",
 ]
 
 
-class TranslationAndMediaProfile(BaseModel):
+class Association(BaseModel):
     model_config = ConfigDict(populate_by_name=True)
     media_profile: Optional[RefIdItem] = Field(
         default=None, validation_alias="mediaProfile", serialization_alias="mediaProfile"
@@ -51,7 +47,7 @@ class TranslationAndMediaProfile(BaseModel):
     phone_profile: Optional[Union[Variable, Global[int]]] = Field(
         default=None, validation_alias="phoneProfile", serialization_alias="phoneProfile"
     )
-    translation_profile: Optional[TranslationProfile] = Field(
+    translation_profile: Optional[RefIdItem] = Field(
         default=None, validation_alias="translationProfile", serialization_alias="translationProfile"
     )
     translation_profile_direction: Optional[
@@ -83,7 +79,7 @@ class SrstParcel(_ParcelBase):
         default=None,
         validation_alias=AliasPath("data", "systemMessage"),
     )
-    translation_and_media_profile: Optional[List[TranslationAndMediaProfile]] = Field(
+    association: Optional[List[Association]] = Field(
         default=None,
         validation_alias=AliasPath("data", "translationAndMediaProfile"),
         description="translationProfile ID Refs and mediaProfile ID Refs",