catalystwan 0.40.0.dev5__tar.gz → 0.40.0.dev7__tar.gz

{catalystwan-0.40.0.dev5 → catalystwan-0.40.0.dev7}/PKG-INFO

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

{catalystwan-0.40.0.dev5 → catalystwan-0.40.0.dev7}/catalystwan/api/builders/feature_profiles/builder_factory.py

@@ -23,6 +23,7 @@ FeatureProfileBuilder = Union[
     TransportAndManagementProfileBuilder,
     CliFeatureProfileBuilder,
     ApplicationPriorityFeatureProfileBuilder,
+    UcVoiceFeatureProfileBuilder
 ]
 
 BUILDER_MAPPING: Mapping[ProfileType, Callable] = {

catalystwan-0.40.0.dev7/catalystwan/api/builders/feature_profiles/uc_voice.py

@@ -0,0 +1,249 @@
+# Copyright 2024 Cisco Systems, Inc. and its affiliates
+from __future__ import annotations
+
+import logging
+from dataclasses import dataclass
+from typing import TYPE_CHECKING, Dict, List, Optional, Union
+from uuid import UUID
+
+from catalystwan.api.builders.feature_profiles.report import FeatureProfileBuildReport, handle_build_report
+from catalystwan.api.configuration_groups.parcel import as_default
+from catalystwan.api.feature_profile_api import UcVoiceFeatureProfileAPI
+from catalystwan.endpoints.configuration.feature_profile.sdwan.uc_voice import UcVoiceFeatureProfile
+from catalystwan.models.configuration.feature_profile.common import FeatureProfileCreationPayload, RefIdItem
+from catalystwan.models.configuration.feature_profile.sdwan.uc_voice import (
+    AnalogInterfaceParcel,
+    AnyUcVoiceParcel,
+    CallRoutingParcel,
+    DigitalInterfaceParcel,
+    MediaProfileParcel,
+    ServerGroupParcel,
+    SrstParcel,
+    TranslationProfileParcel,
+    TranslationRuleParcel,
+    TrunkGroupParcel,
+    VoiceGlobalParcel,
+    VoiceTenantParcel,
+)
+from catalystwan.models.configuration.feature_profile.sdwan.uc_voice.analog_interface import (
+    Association as AnalogInterfaceAssociation,
+)
+from catalystwan.models.configuration.feature_profile.sdwan.uc_voice.call_routing import (
+    Association as CallRoutingAssociation,
+)
+from catalystwan.models.configuration.feature_profile.sdwan.uc_voice.digital_interface import (
+    Association as DigitalInterfaceAssociation,
+)
+
+logger = logging.getLogger(__name__)
+
+if TYPE_CHECKING:
+    from catalystwan.session import ManagerSession
+
+
+ParcelWithAssociations = Union[CallRoutingParcel, DigitalInterfaceParcel, AnalogInterfaceParcel]
+Association = Union[List[DigitalInterfaceAssociation], List[AnalogInterfaceAssociation], List[CallRoutingAssociation]]
+
+
+@dataclass
+class TranslationProfile:
+    tpp: TranslationProfileParcel
+    calling: Optional[TranslationRuleParcel] = None
+    called: Optional[TranslationRuleParcel] = None
+
+
+def is_uuid(uuid: Optional[Union[str, UUID]]) -> bool:
+    if isinstance(uuid, UUID) or uuid is None:
+        return True
+    try:
+        UUID(uuid)
+        return True
+    except ValueError:
+        return False
+
+
+class UcVoiceFeatureProfileBuilder:
+    """
+    A class for building UC Voice feature profiles with a modular approach.
+
+    This class provides methods to construct, associate, and manage various parcels and
+    configurations required for UC Voice feature profiles.
+    """
+
+    ASSOCIABLE_PARCELS = (
+        MediaProfileParcel,
+        ServerGroupParcel,
+        SrstParcel,
+        TranslationProfileParcel,
+        TranslationRuleParcel,
+        TrunkGroupParcel,
+        VoiceGlobalParcel,
+        VoiceTenantParcel,
+    )
+
+    ASSOCIATON_FIELDS = {
+        "media_profile",
+        "server_group",
+        "translation_profile",
+        "trunk_group",
+        "voice_tenant",
+        "supervisory_disconnect",
+    }
+
+    def __init__(self, session: ManagerSession) -> None:
+        """
+        Initializes a new instance of the UC Voice Feature Profile Builder.
+
+        Args:
+            session (ManagerSession): The session object used for API communication.
+        """
+        self._profile: FeatureProfileCreationPayload
+        self._api = UcVoiceFeatureProfileAPI(session)
+        self._endpoints = UcVoiceFeatureProfile(session)
+        self._independent_parcels: List[AnyUcVoiceParcel] = []
+        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] = []
+
+    def add_profile_name_and_description(self, feature_profile: FeatureProfileCreationPayload) -> None:
+        """
+        Adds a name and description to the feature profile being built.
+
+        Args:
+            feature_profile (FeatureProfileCreationPayload): The feature profile payload containing
+                the name and description.
+        """
+        self._profile = feature_profile
+
+    def add_independent_parcel(self, parcel: AnyUcVoiceParcel) -> None:
+        """
+        Adds an independent parcel to the feature profile.
+
+        Args:
+            parcel (AnyUcVoiceParcel): The parcel to be added. Parcels are independent configurations
+                that do not require associations with other parcels.
+        """
+        self._independent_parcels.append(parcel)
+
+    def add_translation_profile(
+        self,
+        tpp: TranslationProfileParcel,
+        calling: Optional[TranslationRuleParcel] = None,
+        called: Optional[TranslationRuleParcel] = None,
+    ) -> None:
+        """
+        Adds a translation profile to the feature profile.
+
+        Args:
+            tpp (TranslationProfileParcel): The main translation profile parcel.
+            calling (Optional[TranslationRuleParcel]): The calling rule parcel. Optional.
+            called (Optional[TranslationRuleParcel]): The called rule parcel. Optional.
+
+        Raises:
+            ValueError: If neither a calling nor a called rule is provided.
+        """
+        if not calling and not called:
+            raise ValueError("There must be at least one translation rule to create a translation profile.")
+        self._translation_profiles.append(TranslationProfile(tpp=tpp, called=called, calling=calling))
+
+    def add_parcel_with_associations(self, parcel: ParcelWithAssociations) -> None:
+        """
+        Adds a parcel with associations to the feature profile.
+
+        Args:
+            parcel (ParcelWithAssociations): A parcel that includes associations with other entities.
+                Associations are relationships between parcels and other resources.
+        """
+        self._parcels_with_associations.append(parcel)
+
+    def build(self) -> FeatureProfileBuildReport:
+        """
+        Builds the complete UC Voice feature profile.
+
+        This method creates the feature profile on the system and processes all added parcels
+        and translation profiles, resolving associations as needed.
+
+        Returns:
+            FeatureProfileBuildReport: A report containing the details of the created feature profile.
+        """
+        profile_uuid = self._endpoints.create_uc_voice_feature_profile(self._profile).id
+        self.build_report = FeatureProfileBuildReport(profile_uuid=profile_uuid, profile_name=self._profile.name)
+
+        # 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
+
+        # 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
+
+        # Create parcels with associations
+        for pwa in self._parcels_with_associations:
+            if pwa.association:
+                self._populate_association(pwa.association)
+            self._create_parcel(profile_uuid, pwa)
+
+        return self.build_report
+
+    @handle_build_report
+    def _create_parcel(self, profile_uuid: UUID, parcel: AnyUcVoiceParcel) -> UUID:
+        """
+        Internal method to create a parcel.
+
+        Args:
+            profile_uuid (UUID): The UUID of the feature profile being built.
+            parcel (AnyUcVoiceParcel): The parcel to create.
+
+        Returns:
+            UUID: The UUID of the created parcel.
+        """
+        return self._api.create_parcel(profile_uuid, parcel).id
+
+    def _create_translation_profile(self, profile_uuid: UUID, tp: TranslationProfile) -> UUID:
+        """
+        Internal method to create a translation profile.
+
+        Args:
+            profile_uuid (UUID): The UUID of the feature profile being built.
+            tp (TranslationProfile): The translation profile to create.
+
+        Returns:
+            UUID: The UUID of the created translation profile parcel.
+        """
+        if tp.called:
+            if called_uuid := self._create_parcel(profile_uuid, tp.called):
+                tp.tpp.set_ref_by_call_type(called_uuid, "called")
+        if tp.calling:
+            if calling_uuid := self._create_parcel(profile_uuid, tp.calling):
+                tp.tpp.set_ref_by_call_type(calling_uuid, "calling")
+        return self._create_parcel(profile_uuid, tp.tpp)
+
+    def _populate_association(self, association: Association) -> None:
+        """
+        Resolves associations for a parcel.
+
+        Updates references in the parcel's associations to use the actual UUIDs of previously
+        created parcels.
+
+        Args:
+            association (Association): A list of associations to resolve.
+        """
+        for model in association:
+            for field_name in self.ASSOCIATON_FIELDS.intersection(model.model_fields_set):
+                attr = getattr(model, field_name)
+                if isinstance(attr, RefIdItem):
+                    if is_uuid(attr.ref_id.value) or attr.ref_id.value is None:
+                        continue
+                    resolved_uuid = self._pushed_associable_parcels.get(attr.ref_id.value)
+                    if resolved_uuid:
+                        attr.ref_id.value = str(resolved_uuid)
+                    else:
+                        logger.warning(
+                            f"Unresolved reference in field '{field_name}' with value '{attr.ref_id.value}' "
+                            f"for model '{model.__class__.__name__}'. Setting to Default[None]."
+                        )
+                        attr.ref_id = as_default(None)

{catalystwan-0.40.0.dev5 → catalystwan-0.40.0.dev7}/catalystwan/api/configuration_groups/parcel.py

@@ -197,3 +197,10 @@ def as_default(value: Any, generic_alias: Any = None):
     raise TypeError(
         f"Inappropriate type origin: {generic_alias} {get_origin(generic_alias)} for argument generic_alias"
     )
+
+
+def as_optional_global_or_variable(value: Any, generic_alias: Any = None):
+    if isinstance(value, str) and value.startswith("{{") and value.endswith("}}"):
+        return as_variable(value)
+    else:
+        return as_optional_global(value, generic_alias)

{catalystwan-0.40.0.dev5 → catalystwan-0.40.0.dev7}/catalystwan/api/feature_profile_api.py

@@ -2259,10 +2259,24 @@ class UcVoiceFeatureProfileAPI:
     SDWAN Feature Profile UC Voice APIs
     """
 
+    ENDPOINT_PARCEL_TYPE_MAP = {"analog-interface": "tdm-sip/analog-interface"}
+
     def __init__(self, session: ManagerSession):
         self.session = session
         self.endpoint = UcVoiceFeatureProfile(session)
 
+    def _get_endpoint_parcel_type(self, parcel_type: str) -> str:
+        """
+        Returns the mapped endpoint parcel type if it exists, otherwise returns the input key.
+
+        Args:
+            parcel_type (str): The parcel type to look up.
+
+        Returns:
+            str: The mapped parcel type or the input key if not found.
+        """
+        return self.ENDPOINT_PARCEL_TYPE_MAP.get(parcel_type, parcel_type)
+
     def get_profiles(
         self, limit: Optional[int] = None, offset: Optional[int] = None
     ) -> DataSequence[FeatureProfileInfo]:
@@ -2360,14 +2374,15 @@ class UcVoiceFeatureProfileAPI:
         """
         Get one UC Voice Parcel given profile id, parcel type and parcel id
         """
-        return self.endpoint.get_by_id(profile_id, parcel_type._get_parcel_type(), parcel_id)
+        return self.endpoint.get_by_id(
+            profile_id, self._get_endpoint_parcel_type(parcel_type._get_parcel_type()), parcel_id
+        )
 
     def create_parcel(self, profile_id: UUID, payload: AnyUcVoiceParcel) -> ParcelCreationResponse:
         """
         Create UC Voice Parcel for selected profile_id based on payload type
         """
-
-        return self.endpoint.create(profile_id, payload._get_parcel_type(), payload)
+        return self.endpoint.create(profile_id, self._get_endpoint_parcel_type(payload._get_parcel_type()), payload)
 
     def update_parcel(self, profile_id: UUID, payload: AnyUcVoiceParcel, parcel_id: UUID) -> ParcelCreationResponse:
         """

{catalystwan-0.40.0.dev5 → catalystwan-0.40.0.dev7}/catalystwan/endpoints/endpoints_container.py

@@ -12,6 +12,7 @@ from catalystwan.endpoints.cluster_management import ClusterManagement
 from catalystwan.endpoints.configuration.device.software_update import ConfigurationDeviceSoftwareUpdate
 from catalystwan.endpoints.configuration.disaster_recovery import ConfigurationDisasterRecovery
 from catalystwan.endpoints.configuration.feature_profile.sdwan.cli import CliFeatureProfile
+from catalystwan.endpoints.configuration.feature_profile.sdwan.embedded_security import EmbeddedSecurityFeatureProfile
 from catalystwan.endpoints.configuration.feature_profile.sdwan.policy_object import PolicyObjectFeatureProfile
 from catalystwan.endpoints.configuration.feature_profile.sdwan.sig_security import SIGSecurity
 from catalystwan.endpoints.configuration.feature_profile.sdwan.system import SystemFeatureProfile
@@ -217,6 +218,7 @@ class ConfigurationSDWANFeatureProfileContainer:
         self.cli = CliFeatureProfile(client=session)
         self.topology = TopologyFeatureProfile(client=session)
         self.policy = PolicyObjectFeatureProfile(client=session)
+        self.embedded_security = EmbeddedSecurityFeatureProfile(client=session)
 
 
 class ConfigurationFeatureProfileContainer:

{catalystwan-0.40.0.dev5 → catalystwan-0.40.0.dev7}/catalystwan/integration_tests/profile_builder/test_pb_uc_voice.py

@@ -1,12 +1,19 @@
 # Copyright 2024 Cisco Systems, Inc. and its affiliates
-from catalystwan.api.configuration_groups.parcel import Global
+from catalystwan.api.configuration_groups.parcel import Global, as_global, as_variable
 from catalystwan.integration_tests.base import TestCaseBase, create_name_with_run_id
-from catalystwan.models.configuration.feature_profile.common import FeatureProfileCreationPayload
+from catalystwan.models.configuration.feature_profile.common import FeatureProfileCreationPayload, RefIdItem
 from catalystwan.models.configuration.feature_profile.sdwan.uc_voice import (
+    AnalogInterfaceParcel,
     TranslationProfileParcel,
     TranslationRuleParcel,
 )
+from catalystwan.models.configuration.feature_profile.sdwan.uc_voice.analog_interface import (
+    Association,
+    ModuleType,
+    SlotId,
+)
 from catalystwan.models.configuration.feature_profile.sdwan.uc_voice.translation_rule import Action, RuleSettings
+from catalystwan.tests.builders.uc_voice import as_default
 
 
 class TestUcVoiceFeatureProfileBuilder(TestCaseBase):
@@ -18,10 +25,10 @@ class TestUcVoiceFeatureProfileBuilder(TestCaseBase):
             feature_profile=FeatureProfileCreationPayload(name=self.fp_name, description=self.fp_description)
         )
         self.api = self.session.api.sdwan_feature_profiles.transport
-
-    def test_when_build_profile_with_translation_profile_and_rules_expect_success(self):
-        tp = TranslationProfileParcel(parcel_name="TPP", parcel_description="TTP_Desc", translation_profile_settings=[])
-        tr_calling = TranslationRuleParcel(
+        self.tp = TranslationProfileParcel(
+            parcel_name="TPP", parcel_description="TTP_Desc", translation_profile_settings=[]
+        )
+        self.tr_calling = TranslationRuleParcel(
             parcel_name="2",
             parcel_description="desc",
             rule_name=Global[int](value=2),
@@ -34,7 +41,7 @@ class TestUcVoiceFeatureProfileBuilder(TestCaseBase):
                 )
             ],
         )
-        tr_called = TranslationRuleParcel(
+        self.tr_called = TranslationRuleParcel(
             parcel_name="4",
             parcel_description="desc",
             rule_name=Global[int](value=4),
@@ -47,7 +54,37 @@ class TestUcVoiceFeatureProfileBuilder(TestCaseBase):
                 )
             ],
         )
-        self.builder.add_translation_profile(tp, tr_calling, tr_called)
+
+    def test_when_build_profile_with_translation_profile_and_rules_expect_success(self):
+        # Arrange
+        self.builder.add_translation_profile(self.tp, self.tr_calling, self.tr_called)
+        # Act
+        report = self.builder.build()
+        # Assert
+        assert len(report.failed_parcels) == 0
+
+    def test_when_build_profile_with_analog_interface_and_translation_profile_and_rules_assosiations_expect_success(
+        self,
+    ):
+        # Arrange
+        ai = AnalogInterfaceParcel(
+            parcel_name="Ai",
+            parcel_description="",
+            enable=as_default(True),
+            slot_id=as_global("0/1", SlotId),
+            module_type=as_global("72 Port FXS", ModuleType),
+            association=[
+                Association(
+                    port_range=as_variable("{{test}}"),
+                    translation_profile=RefIdItem(ref_id=as_global("TPP")),
+                    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.tp, self.tr_calling, self.tr_called)
+        self.builder.add_parcel_with_associations(ai)
         # Act
         report = self.builder.build()
         # Assert

{catalystwan-0.40.0.dev5 → catalystwan-0.40.0.dev7}/catalystwan/models/configuration/feature_profile/common.py

@@ -8,7 +8,15 @@ from uuid import UUID
 from pydantic import BaseModel, ConfigDict, Field, model_validator
 from typing_extensions import Self
 
-from catalystwan.api.configuration_groups.parcel import Default, Global, Variable, as_default, as_global
+from catalystwan.api.configuration_groups.parcel import (
+    Default,
+    Global,
+    Variable,
+    as_default,
+    as_global,
+    as_optional_global,
+    as_optional_global_or_variable,
+)
 from catalystwan.models.common import (
     CableLengthLongValue,
     CableLengthShortValue,
@@ -295,7 +303,7 @@ class RefIdItem(BaseModel):
         extra="forbid",
         populate_by_name=True,
     )
-    ref_id: Global[str] = Field(..., serialization_alias="refId", validation_alias="refId")
+    ref_id: Union[Global[str], Default[None]] = Field(..., serialization_alias="refId", validation_alias="refId")
 
     @classmethod
     def from_uuid(cls, ref_id: UUID):
@@ -485,6 +493,18 @@ class Encapsulation(BaseModel):
     preference: Optional[Union[Global[int], Variable, Default[None]]] = Field(default=None)
     weight: Optional[Union[Global[int], Variable, Default[int]]] = Field(default=None)
 
+    @staticmethod
+    def from_params(
+        encap: Optional[EncapType] = None,
+        preference: Union[None, int, str] = None,
+        weight: Union[None, int, str] = None,
+    ) -> "Encapsulation":
+        return Encapsulation(
+            encap=as_optional_global(encap, EncapType),
+            preference=as_optional_global_or_variable(preference),
+            weight=as_optional_global_or_variable(weight),
+        )
+
 
 class AllowService(BaseModel):
     model_config = ConfigDict(

{catalystwan-0.40.0.dev5 → catalystwan-0.40.0.dev7}/catalystwan/models/configuration/feature_profile/parcel.py

@@ -24,6 +24,7 @@ from catalystwan.utils.model import resolve_nested_base_model_unions
 
 ParcelType = Literal[
     "aaa",
+    "analog-interface",
     "app-list",
     "app-probe",
     "appqoe",
@@ -32,6 +33,7 @@ ParcelType = Literal[
     "basic",
     "bfd",
     "bgp",
+    "call-routing",
     "cellular-controller",
     "cellular-profile",
     "cflowd",
@@ -42,6 +44,7 @@ ParcelType = Literal[
     "data-ipv6-prefix",
     "data-prefix",
     "dhcp-server",
+    "digital-interface",
     "dns",
     "dsp-farm",
     "expanded-community",
@@ -93,10 +96,13 @@ ParcelType = Literal[
     "security-urllist",
     "security-zone",
     "security",
+    "server-group",
     "sig",
     "sla-class",
     "snmp",
     "standard-community",
+    "strt",
+    "supervisory-disconnect",
     "switchport",
     "t1-e1-controller",
     "tloc",
@@ -111,7 +117,8 @@ ParcelType = Literal[
     "unified/ssl-decryption-profile",
     "unified/ssl-decryption",
     "unified/url-filtering",
-    "wan/vpn",
+    "voice-global",
+    "voice-tenant" "wan/vpn",
     "wan/vpn/interface/cellular",
     "wan/vpn/interface/dsl-ipoe",
     "wan/vpn/interface/dsl-pppoa",

{catalystwan-0.40.0.dev5 → catalystwan-0.40.0.dev7}/catalystwan/models/configuration/feature_profile/sdwan/acl/ipv4acl.py

@@ -6,55 +6,9 @@ from uuid import UUID
 from pydantic import AliasPath, BaseModel, ConfigDict, Field, model_validator
 
 from catalystwan.api.configuration_groups.parcel import Default, Global, Variable, _ParcelBase, as_global, as_variable
-from catalystwan.models.common import AcceptDropActionType, check_fields_exclusive
+from catalystwan.models.common import AcceptDropActionType, IcmpMsgType, check_fields_exclusive
 from catalystwan.models.configuration.feature_profile.common import RefIdItem
 
-IcmpIPv4Messages = Literal[
-    "administratively-prohibited",
-    "dod-host-prohibited",
-    "dod-net-prohibited",
-    "echo",
-    "echo-reply",
-    "echo-reply-no-error",
-    "extended-echo",
-    "extended-echo-reply",
-    "general-parameter-problem",
-    "host-isolated",
-    "host-precedence-unreachable",
-    "host-redirect",
-    "host-tos-redirect",
-    "host-tos-unreachable",
-    "host-unknown",
-    "host-unreachable",
-    "interface-error",
-    "malformed-query",
-    "multiple-interface-match",
-    "net-redirect",
-    "net-tos-redirect",
-    "net-tos-unreachable",
-    "net-unreachable",
-    "network-unknown",
-    "no-room-for-option",
-    "option-missing",
-    "packet-too-big",
-    "parameter-problem",
-    "photuris",
-    "port-unreachable",
-    "precedence-unreachable",
-    "protocol-unreachable",
-    "reassembly-timeout",
-    "redirect",
-    "router-advertisement",
-    "router-solicitation",
-    "source-route-failed",
-    "table-entry-error",
-    "time-exceeded",
-    "timestamp-reply",
-    "timestamp-request",
-    "ttl-exceeded",
-    "unreachable",
-]
-
 
 class SourceDataPrefixList(BaseModel):
     model_config = ConfigDict(populate_by_name=True)
@@ -110,7 +64,7 @@ class MatchEntry(BaseModel):
         description="Destination Port List",
     )
     dscp: Optional[Global[List[int]]] = Field(default=None)
-    icmp_msg: Optional[Global[List[IcmpIPv4Messages]]] = Field(
+    icmp_msg: Optional[Global[List[IcmpMsgType]]] = Field(
         default=None, validation_alias="icmpMsg", serialization_alias="icmpMsg"
     )
     packet_length: Union[Global[str], Global[int], None] = Field(
@@ -249,8 +203,8 @@ class Sequence(BaseModel):
     def match_dscp(self, dscp: List[int]):
         self._entry.dscp = as_global(dscp)
 
-    def match_icmp_msg(self, icmp: List[IcmpIPv4Messages]):
-        self._entry.icmp_msg = Global[List[IcmpIPv4Messages]](value=icmp)
+    def match_icmp_msg(self, icmp: List[IcmpMsgType]):
+        self._entry.icmp_msg = Global[List[IcmpMsgType]](value=icmp)
 
     def match_packet_length(self, len: Union[int, Tuple[int, int]]):
         if isinstance(len, int):

{catalystwan-0.40.0.dev5 → catalystwan-0.40.0.dev7}/catalystwan/models/configuration/feature_profile/sdwan/transport/wan/interface/ethernet.py

@@ -5,7 +5,15 @@ from typing import List, Literal, Optional, Union
 from pydantic import AliasPath, BaseModel, ConfigDict, Field
 
 from catalystwan.api.configuration_groups.parcel import Default, Global, Variable, _ParcelBase, as_default
-from catalystwan.models.common import CarrierType, EthernetDuplexMode, MediaType, Speed, TLOCColor, TunnelMode
+from catalystwan.models.common import (
+    CarrierType,
+    EncapType,
+    EthernetDuplexMode,
+    MediaType,
+    Speed,
+    TLOCColor,
+    TunnelMode,
+)
 from catalystwan.models.configuration.feature_profile.common import (
     AclQos,
     AllowService,
@@ -196,7 +204,7 @@ class InterfaceEthernetParcel(_ParcelBase):
     model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True, extra="forbid")
     type_: Literal["wan/vpn/interface/ethernet"] = Field(default="wan/vpn/interface/ethernet", exclude=True)
     encapsulation: List[Encapsulation] = Field(
-        validation_alias=AliasPath("data", "encapsulation"), description="Encapsulation for TLOC"
+        default_factory=list, validation_alias=AliasPath("data", "encapsulation"), description="Encapsulation for TLOC"
     )
     interface_name: Union[Variable, Global[str]] = Field(validation_alias=AliasPath("data", "interfaceName"))
     interface_ip_address: Union[InterfaceDynamicIPv4Address, InterfaceStaticIPv4Address] = Field(
@@ -263,3 +271,11 @@ class InterfaceEthernetParcel(_ParcelBase):
     tunnel: Optional[Tunnel] = Field(
         default=None, validation_alias=AliasPath("data", "tunnel"), description="Tunnel Interface Attributes"
     )
+
+    def add_encapsulation(
+        self,
+        encap: Optional[EncapType] = None,
+        preference: Union[None, int, str] = None,
+        weight: Union[None, int, str] = None,
+    ) -> None:
+        self.encapsulation.append(Encapsulation.from_params(encap, preference, weight))