catalystwan 0.33.4.dev2__tar.gz → 0.33.4.dev5__tar.gz

{catalystwan-0.33.4.dev2 → catalystwan-0.33.4.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: catalystwan
-Version: 0.33.4.dev2
+Version: 0.33.4.dev5
 Summary: Cisco Catalyst WAN SDK for Python
 Home-page: https://github.com/cisco-open/cisco-catalyst-wan-sdk
 Author: kagorski

{catalystwan-0.33.4.dev2 → catalystwan-0.33.4.dev5}/catalystwan/api/builders/feature_profiles/builder_factory.py

@@ -5,18 +5,25 @@ from typing import TYPE_CHECKING, Callable, Mapping, Union
 from catalystwan.api.builders.feature_profiles.other import OtherFeatureProfileBuilder
 from catalystwan.api.builders.feature_profiles.service import ServiceFeatureProfileBuilder
 from catalystwan.api.builders.feature_profiles.system import SystemFeatureProfileBuilder
+from catalystwan.api.builders.feature_profiles.transport import TransportAndManagementProfileBuilder
 from catalystwan.exceptions import CatalystwanException
 from catalystwan.models.configuration.feature_profile.common import ProfileType
 
 if TYPE_CHECKING:
     from catalystwan.session import ManagerSession
 
-FeatureProfileBuilder = Union[ServiceFeatureProfileBuilder, SystemFeatureProfileBuilder, OtherFeatureProfileBuilder]
+FeatureProfileBuilder = Union[
+    ServiceFeatureProfileBuilder,
+    SystemFeatureProfileBuilder,
+    OtherFeatureProfileBuilder,
+    TransportAndManagementProfileBuilder,
+]
 
 BUILDER_MAPPING: Mapping[ProfileType, Callable] = {
     "service": ServiceFeatureProfileBuilder,
     "system": SystemFeatureProfileBuilder,
     "other": OtherFeatureProfileBuilder,
+    "transport": TransportAndManagementProfileBuilder,
 }
 
 

{catalystwan-0.33.4.dev2 → catalystwan-0.33.4.dev5}/catalystwan/api/builders/feature_profiles/other.py

@@ -1,13 +1,17 @@
 from __future__ import annotations
 
+import logging
 from typing import TYPE_CHECKING, List
 from uuid import UUID
 
 from catalystwan.api.feature_profile_api import OtherFeatureProfileAPI
 from catalystwan.endpoints.configuration.feature_profile.sdwan.other import OtherFeatureProfile
+from catalystwan.exceptions import ManagerHTTPError
 from catalystwan.models.configuration.feature_profile.common import FeatureProfileCreationPayload
 from catalystwan.models.configuration.feature_profile.sdwan.other import AnyOtherParcel
 
+logger = logging.getLogger(__name__)
+
 if TYPE_CHECKING:
     from catalystwan.session import ManagerSession
 
@@ -62,8 +66,10 @@ class OtherFeatureProfileBuilder:
         Returns:
             UUID: The UUID of the created feature profile.
         """
-
-        profile_uuid = self._endpoints.create_sdwan_other_feature_profile(self._profile).id
-        for parcel in self._independent_items:
-            self._api.create_parcel(profile_uuid, parcel)
+        try:
+            profile_uuid = self._endpoints.create_sdwan_other_feature_profile(self._profile).id
+            for parcel in self._independent_items:
+                self._api.create_parcel(profile_uuid, parcel)
+        except ManagerHTTPError as e:
+            logger.error(f"Error occured during building profile: {e.info}")
         return profile_uuid

{catalystwan-0.33.4.dev2 → catalystwan-0.33.4.dev5}/catalystwan/api/builders/feature_profiles/service.py

@@ -10,6 +10,7 @@ from typing_extensions import Annotated
 
 from catalystwan.api.feature_profile_api import ServiceFeatureProfileAPI
 from catalystwan.endpoints.configuration.feature_profile.sdwan.service import ServiceFeatureProfile
+from catalystwan.exceptions import ManagerHTTPError
 from catalystwan.models.configuration.feature_profile.common import FeatureProfileCreationPayload
 from catalystwan.models.configuration.feature_profile.sdwan.service import (
     AppqoeParcel,
@@ -117,15 +118,17 @@ class ServiceFeatureProfileBuilder:
             Service feature profile UUID
         """
         profile_uuid = self._endpoints.create_sdwan_service_feature_profile(self._profile).id
-
-        for parcel in self._independent_items:
-            self._api.create_parcel(profile_uuid, parcel)
-
-        for vpn_tag, vpn_parcel in self._independent_items_vpns.items():
-            vpn_uuid = self._api.create_parcel(profile_uuid, vpn_parcel).id
-
-            for sub_parcel in self._depended_items_on_vpns[vpn_tag]:
-                logger.debug(f"Creating subparcel parcel {sub_parcel.parcel_name} to VPN {vpn_uuid}")
-                self._api.create_parcel(profile_uuid, sub_parcel, vpn_uuid)
+        try:
+            for parcel in self._independent_items:
+                self._api.create_parcel(profile_uuid, parcel)
+
+            for vpn_tag, vpn_parcel in self._independent_items_vpns.items():
+                vpn_uuid = self._api.create_parcel(profile_uuid, vpn_parcel).id
+
+                for sub_parcel in self._depended_items_on_vpns[vpn_tag]:
+                    logger.debug(f"Creating subparcel parcel {sub_parcel.parcel_name} to VPN {vpn_uuid}")
+                    self._api.create_parcel(profile_uuid, sub_parcel, vpn_uuid)
+        except ManagerHTTPError as e:
+            logger.error(f"Error occured during building profile: {e.info}")
 
         return profile_uuid

{catalystwan-0.33.4.dev2 → catalystwan-0.33.4.dev5}/catalystwan/api/builders/feature_profiles/system.py

@@ -1,13 +1,18 @@
+# Copyright 2023 Cisco Systems, Inc. and its affiliates
 from __future__ import annotations
 
+import logging
 from typing import TYPE_CHECKING, List
 from uuid import UUID
 
 from catalystwan.api.feature_profile_api import SystemFeatureProfileAPI
 from catalystwan.endpoints.configuration.feature_profile.sdwan.system import SystemFeatureProfile
+from catalystwan.exceptions import ManagerHTTPError
 from catalystwan.models.configuration.feature_profile.common import FeatureProfileCreationPayload
 from catalystwan.models.configuration.feature_profile.sdwan.system import AnySystemParcel
 
+logger = logging.getLogger(__name__)
+
 if TYPE_CHECKING:
     from catalystwan.session import ManagerSession
 
@@ -64,6 +69,9 @@ class SystemFeatureProfileBuilder:
         """
 
         profile_uuid = self._endpoints.create_sdwan_system_feature_profile(self._profile).id
-        for parcel in self._independent_items:
-            self._api.create_parcel(profile_uuid, parcel)
+        try:
+            for parcel in self._independent_items:
+                self._api.create_parcel(profile_uuid, parcel)
+        except ManagerHTTPError as e:
+            logger.error(f"Error occured during building profile: {e.info}")
         return profile_uuid

catalystwan-0.33.4.dev5/catalystwan/api/builders/feature_profiles/transport.py

@@ -0,0 +1,116 @@
+# Copyright 2023 Cisco Systems, Inc. and its affiliates
+from __future__ import annotations
+
+import logging
+from collections import defaultdict
+from typing import TYPE_CHECKING, Dict, List
+from uuid import UUID, uuid4
+
+from catalystwan.api.feature_profile_api import TransportFeatureProfileAPI
+from catalystwan.endpoints.configuration.feature_profile.sdwan.transport import TransportFeatureProfile
+from catalystwan.exceptions import ManagerHTTPError
+from catalystwan.models.configuration.feature_profile.common import FeatureProfileCreationPayload
+from catalystwan.models.configuration.feature_profile.sdwan.transport import (
+    AnyTransportSuperParcel,
+    AnyTransportVpnParcel,
+    AnyTransportVpnSubParcel,
+)
+
+logger = logging.getLogger(__name__)
+
+if TYPE_CHECKING:
+    from catalystwan.session import ManagerSession
+
+
+class TransportAndManagementProfileBuilder:
+    """
+    A class for building system feature profiles.
+    """
+
+    def __init__(self, session: ManagerSession) -> None:
+        """
+        Initialize a new instance of the Service class.
+
+        Args:
+            session (ManagerSession): The ManagerSession object used for API communication.
+            profile_uuid (UUID): The UUID of the profile.
+        """
+        self._profile: FeatureProfileCreationPayload
+        self._api = TransportFeatureProfileAPI(session)
+        self._endpoints = TransportFeatureProfile(session)
+        self._independent_items: List[AnyTransportSuperParcel] = []
+        self._independent_items_vpns: Dict[UUID, AnyTransportVpnParcel] = {}
+        self._dependent_items_on_vpns: Dict[UUID, List[AnyTransportVpnSubParcel]] = defaultdict(list)
+
+    def add_profile_name_and_description(self, feature_profile: FeatureProfileCreationPayload) -> None:
+        """
+        Adds a name and description to the feature profile.
+
+        Args:
+            name (str): The name of the feature profile.
+            description (str): The description of the feature profile.
+
+        Returns:
+            None
+        """
+        self._profile = feature_profile
+
+    def add_parcel(self, parcel: AnyTransportSuperParcel) -> None:
+        """
+        Adds a parcel to the feature profile.
+
+        Args:
+            parcel (AnyTransportSuperParcel): The parcel to add.
+
+        Returns:
+            None
+        """
+        self._independent_items.append(parcel)
+
+    def add_parcel_vpn(self, parcel: AnyTransportVpnParcel) -> UUID:
+        """
+        Adds a VPN parcel to the builder.
+
+        Args:
+            parcel (LanVpnParcel): The VPN parcel to add.
+
+        Returns:
+            UUID: The UUID tag of the added VPN parcel.
+        """
+        vpn_tag = uuid4()
+        logger.debug(f"Adding VPN parcel {parcel.parcel_name} with tag {vpn_tag}")
+        self._independent_items_vpns[vpn_tag] = parcel
+        return vpn_tag
+
+    def add_vpn_subparcel(self, parcel: AnyTransportVpnSubParcel, vpn_tag: UUID) -> None:
+        """
+        Adds a parcel to the feature profile.
+
+        Args:
+            parcel (AnyTransportVpnSubParcel): The parcel to add.
+
+        Returns:
+            None
+        """
+        self._dependent_items_on_vpns[vpn_tag].append(parcel)
+
+    def build(self) -> UUID:
+        """
+        Builds the feature profile.
+
+        Returns:
+            UUID: The UUID of the created feature profile.
+        """
+
+        profile_uuid = self._endpoints.create_transport_feature_profile(self._profile).id
+        try:
+            for parcel in self._independent_items:
+                self._api.create_parcel(profile_uuid, parcel)
+            for vpn_tag, vpn_parcel in self._independent_items_vpns.items():
+                # TODO: Add subparcels to VPN
+                vpn_uuid = self._api.create_parcel(profile_uuid, vpn_parcel).id
+                for subparcel in self._dependent_items_on_vpns[vpn_tag]:
+                    self._api.create_parcel(profile_uuid, subparcel, vpn_uuid)
+        except ManagerHTTPError as e:
+            logger.error(f"Error occured during building profile: {e.info}")
+        return profile_uuid

{catalystwan-0.33.4.dev2 → catalystwan-0.33.4.dev5}/catalystwan/api/configuration_groups/parcel.py

@@ -1,7 +1,7 @@
 # Copyright 2023 Cisco Systems, Inc. and its affiliates
 
 from enum import Enum
-from typing import Any, Dict, Generic, Literal, Optional, TypeVar, get_origin
+from typing import Any, Dict, Generic, List, Literal, Optional, Tuple, TypeVar, get_origin
 
 from pydantic import (
     AliasPath,
@@ -9,11 +9,13 @@ from pydantic import (
     ConfigDict,
     Field,
     PrivateAttr,
+    SerializationInfo,
     SerializerFunctionWrapHandler,
     model_serializer,
 )
 
 from catalystwan.exceptions import CatalystwanException
+from catalystwan.models.common import VersionedField
 
 T = TypeVar("T")
 
@@ -38,7 +40,7 @@ class _ParcelBase(BaseModel):
     _parcel_data_key: str = PrivateAttr(default="data")
 
     @model_serializer(mode="wrap")
-    def envelope_parcel_data(self, handler: SerializerFunctionWrapHandler) -> Dict[str, Any]:
+    def envelope_parcel_data(self, handler: SerializerFunctionWrapHandler, info: SerializationInfo) -> Dict[str, Any]:
         """
         serializes model fields with respect to field validation_alias,
         sub-classing parcel fields can be defined like following:
@@ -50,16 +52,23 @@ class _ParcelBase(BaseModel):
         model_dict = handler(self)
         model_dict[self._parcel_data_key] = {}
         remove_keys = []
+        replaced_keys: Dict[str, Tuple[str, str]] = {}
 
+        # enveloping
         for key in model_dict.keys():
             field_info = self.model_fields.get(key)
             if field_info and isinstance(field_info.validation_alias, AliasPath):
                 aliases = field_info.validation_alias.convert_to_aliases()
                 if aliases and aliases[0] == self._parcel_data_key and len(aliases) == 2:
                     model_dict[self._parcel_data_key][aliases[1]] = model_dict[key]
+                    replaced_keys[key] = (self._parcel_data_key, str(aliases[1]))
                     remove_keys.append(key)
         for key in remove_keys:
             del model_dict[key]
+
+        # versioned field update
+        model_dict = VersionedField.dump(self.model_fields, model_dict, info, replaced_keys)
+
         return model_dict
 
     @classmethod
@@ -120,7 +129,7 @@ class Default(ParcelAttribute, Generic[T]):
     option_type: OptionType = Field(
         default=OptionType.DEFAULT, serialization_alias="optionType", validation_alias="optionType"
     )
-    value: Optional[Any] = None
+    value: Optional[T] = None
 
 
 def as_global(value: Any, generic_alias: Any = None):
@@ -134,10 +143,14 @@ def as_global(value: Any, generic_alias: Any = None):
         Global[Any]: global option type object
     """
     if generic_alias is None:
+        if isinstance(value, list):
+            if len(value) == 0:
+                return Global[List](value=list())  # type: ignore
+            return Global[List[type(value[0])]](value=value)  # type: ignore
         return Global[type(value)](value=value)  # type: ignore
     elif get_origin(generic_alias) is Literal:
         return Global[generic_alias](value=value)  # type: ignore
-    TypeError("Inappropriate type for argument generic_alias")
+    raise TypeError("Inappropriate type for argument generic_alias")
 
 
 def as_variable(value: str):
@@ -163,7 +176,11 @@ def as_default(value: Any, generic_alias: Any = None):
         Default[Any]: default option type object
     """
     if generic_alias is None:
+        if isinstance(value, list):
+            if len(value) == 0:
+                return Default[List](value=list())  # type: ignore
+            return Default[List[type(value[0])]](value=value)  # type: ignore
         return Default[type(value)](value=value)  # type: ignore
     elif get_origin(generic_alias) is Literal:
         return Default[generic_alias](value=value)  # type: ignore
-    TypeError("Inappropriate type for argument generic_alias")
+    raise TypeError("Inappropriate type for argument generic_alias")

{catalystwan-0.33.4.dev2 → catalystwan-0.33.4.dev5}/catalystwan/api/feature_profile_api.py

@@ -11,11 +11,18 @@ from catalystwan.endpoints.configuration.feature_profile.sdwan.other import Othe
 from catalystwan.endpoints.configuration.feature_profile.sdwan.service import ServiceFeatureProfile
 from catalystwan.endpoints.configuration.feature_profile.sdwan.system import SystemFeatureProfile
 from catalystwan.endpoints.configuration.feature_profile.sdwan.transport import TransportFeatureProfile
+from catalystwan.exceptions import ManagerHTTPError
 from catalystwan.models.configuration.feature_profile.sdwan.other import AnyOtherParcel
 from catalystwan.models.configuration.feature_profile.sdwan.policy_object.security.url import URLParcel
 from catalystwan.models.configuration.feature_profile.sdwan.service import AnyServiceParcel
 from catalystwan.models.configuration.feature_profile.sdwan.service.multicast import MulticastParcel
 from catalystwan.models.configuration.feature_profile.sdwan.transport import AnyTransportParcel
+from catalystwan.models.configuration.feature_profile.sdwan.transport.bgp import WanRoutingBgpParcel
+from catalystwan.models.configuration.feature_profile.sdwan.transport.cellular_controller import (
+    CellularControllerParcel,
+)
+from catalystwan.models.configuration.feature_profile.sdwan.transport.t1e1controller import T1E1ControllerParcel
+from catalystwan.models.configuration.feature_profile.sdwan.transport.vpn import ManagementVpnParcel, TransportVpnParcel
 from catalystwan.typed_list import DataSequence
 
 if TYPE_CHECKING:
@@ -172,13 +179,69 @@ class TransportFeatureProfileAPI:
         """
         self.endpoint.delete_transport_feature_profile(profile_id)
 
-    def create_parcel(self, profile_id: UUID, payload: AnyTransportParcel) -> ParcelCreationResponse:
+    def create_parcel(
+        self, profile_id: UUID, payload: AnyTransportParcel, vpn_uuid: Optional[UUID] = None
+    ) -> ParcelCreationResponse:
         """
         Create Transport Parcel for selected profile_id based on payload type
         """
-
+        if vpn_uuid is not None:
+            vpn_parcel = self._get_vpn_parcel(profile_id, vpn_uuid).payload
+            if vpn_parcel._get_parcel_type() == TransportVpnParcel._get_parcel_type():
+                return self.endpoint.create_transport_vpn_sub_parcel(
+                    profile_id, vpn_uuid, payload._get_parcel_type(), payload
+                )
+            else:
+                return self.endpoint.create_management_vpn_sub_parcel(
+                    profile_id, vpn_uuid, payload._get_parcel_type(), payload
+                )
         return self.endpoint.create_transport_parcel(profile_id, payload._get_parcel_type(), payload)
 
+    def _get_vpn_parcel(
+        self, profile_id: UUID, vpn_uuid: UUID
+    ) -> Union[Parcel[TransportVpnParcel], Parcel[ManagementVpnParcel]]:
+        """Resolve the VPN parcel type based on the VPN UUID."""
+        try:
+            return self.endpoint.get_transport_parcel(profile_id, TransportVpnParcel._get_parcel_type(), vpn_uuid)
+        except ManagerHTTPError:
+            return self.endpoint.get_transport_parcel(profile_id, ManagementVpnParcel._get_parcel_type(), vpn_uuid)
+
+    @overload
+    def get_parcel(
+        self, profile_id: UUID, parcel_type: Type[CellularControllerParcel], parcel_id: UUID
+    ) -> Parcel[CellularControllerParcel]:
+        ...
+
+    @overload
+    def get_parcel(
+        self, profile_id: UUID, parcel_type: Type[T1E1ControllerParcel], parcel_id: UUID
+    ) -> Parcel[T1E1ControllerParcel]:
+        ...
+
+    @overload
+    def get_parcel(
+        self, profile_id: UUID, parcel_type: Type[WanRoutingBgpParcel], parcel_id: UUID
+    ) -> Parcel[WanRoutingBgpParcel]:
+        ...
+
+    @overload
+    def get_parcel(
+        self, profile_id: UUID, parcel_type: Type[TransportVpnParcel], parcel_id: UUID
+    ) -> Parcel[TransportVpnParcel]:
+        ...
+
+    @overload
+    def get_parcel(
+        self, profile_id: UUID, parcel_type: Type[ManagementVpnParcel], parcel_id: UUID
+    ) -> Parcel[ManagementVpnParcel]:
+        ...
+
+    def get_parcel(self, profile_id: UUID, parcel_type: Type[AnyTransportParcel], parcel_id: UUID) -> Parcel:
+        """
+        Get one Transport Parcel given profile id, parcel type and parcel id
+        """
+        return self.endpoint.get_transport_parcel(profile_id, parcel_type._get_parcel_type(), parcel_id)
+
 
 class OtherFeatureProfileAPI:
     """

{catalystwan-0.33.4.dev2 → catalystwan-0.33.4.dev5}/catalystwan/api/policy_api.py

@@ -11,6 +11,7 @@ from catalystwan.endpoints.configuration.policy.definition.access_control_list i
 from catalystwan.endpoints.configuration.policy.definition.access_control_list_ipv6 import (
     ConfigurationPolicyAclIPv6Definition,
 )
+from catalystwan.endpoints.configuration.policy.definition.aip import ConfigurationPolicyAIPDefinition
 from catalystwan.endpoints.configuration.policy.definition.amp import ConfigurationPolicyAMPDefinition
 from catalystwan.endpoints.configuration.policy.definition.control import ConfigurationPolicyControlDefinition
 from catalystwan.endpoints.configuration.policy.definition.device_access import (
@@ -20,6 +21,9 @@ from catalystwan.endpoints.configuration.policy.definition.device_access_ipv6 im
     ConfigurationPolicyDeviceAccessIPv6Definition,
 )
 from catalystwan.endpoints.configuration.policy.definition.hub_and_spoke import ConfigurationPolicyHubAndSpokeDefinition
+from catalystwan.endpoints.configuration.policy.definition.intrusion_prevention import (
+    ConfigurationPolicyIntrusionPreventionDefinition,
+)
 from catalystwan.endpoints.configuration.policy.definition.mesh import ConfigurationPolicyMeshDefinition
 from catalystwan.endpoints.configuration.policy.definition.qos_map import ConfigurationPolicyQoSMapDefinition
 from catalystwan.endpoints.configuration.policy.definition.rewrite import ConfigurationPolicyRewriteRuleDefinition
@@ -28,6 +32,9 @@ from catalystwan.endpoints.configuration.policy.definition.security_group import
     ConfigurationPolicySecurityGroupDefinition,
 )
 from catalystwan.endpoints.configuration.policy.definition.traffic_data import ConfigurationPolicyDataDefinition
+from catalystwan.endpoints.configuration.policy.definition.url_filtering import (
+    ConfigurationPolicyUrlFilteringDefinition,
+)
 from catalystwan.endpoints.configuration.policy.definition.vpn_membership import (
     ConfigurationPolicyVPNMembershipGroupDefinition,
 )
@@ -120,6 +127,10 @@ from catalystwan.models.policy import (
 from catalystwan.models.policy.centralized import CentralizedPolicy, CentralizedPolicyEditPayload, CentralizedPolicyInfo
 from catalystwan.models.policy.definition.access_control_list import AclPolicy, AclPolicyGetResponse
 from catalystwan.models.policy.definition.access_control_list_ipv6 import AclIPv6Policy, AclIPv6PolicyGetResponse
+from catalystwan.models.policy.definition.aip import (
+    AdvancedInspectionProfilePolicy,
+    AdvancedInspectionProfilePolicyGetResponse,
+)
 from catalystwan.models.policy.definition.amp import (
     AdvancedMalwareProtectionPolicy,
     AdvancedMalwareProtectionPolicyGetResponse,
@@ -131,12 +142,17 @@ from catalystwan.models.policy.definition.device_access_ipv6 import (
     DeviceAccessIPv6PolicyGetResponse,
 )
 from catalystwan.models.policy.definition.hub_and_spoke import HubAndSpokePolicy, HubAndSpokePolicyGetResponse
+from catalystwan.models.policy.definition.intrusion_prevention import (
+    IntrusionPreventionPolicy,
+    IntrusionPreventionPolicyGetResponse,
+)
 from catalystwan.models.policy.definition.mesh import MeshPolicy, MeshPolicyGetResponse
 from catalystwan.models.policy.definition.qos_map import QoSMapPolicy, QoSMapPolicyGetResponse
 from catalystwan.models.policy.definition.rewrite import RewritePolicy, RewritePolicyGetResponse
 from catalystwan.models.policy.definition.rule_set import RuleSet, RuleSetGetResponse
 from catalystwan.models.policy.definition.security_group import SecurityGroup, SecurityGroupGetResponse
 from catalystwan.models.policy.definition.traffic_data import TrafficDataPolicy, TrafficDataPolicyGetResponse
+from catalystwan.models.policy.definition.url_filtering import UrlFilteringPolicy, UrlFilteringPolicyGetResponse
 from catalystwan.models.policy.definition.vpn_membership import VPNMembershipPolicy, VPNMembershipPolicyGetResponse
 from catalystwan.models.policy.definition.zone_based_firewall import ZoneBasedFWPolicy, ZoneBasedFWPolicyGetResponse
 from catalystwan.models.policy.list.app_probe import AppProbeClassListInfo
@@ -224,7 +240,10 @@ POLICY_DEFINITION_ENDPOINTS_MAP: Mapping[type, type] = {
     AclIPv6Policy: ConfigurationPolicyAclIPv6Definition,
     DeviceAccessPolicy: ConfigurationPolicyDeviceAccessDefinition,
     DeviceAccessIPv6Policy: ConfigurationPolicyDeviceAccessIPv6Definition,
+    AdvancedInspectionProfilePolicy: ConfigurationPolicyAIPDefinition,
     AdvancedMalwareProtectionPolicy: ConfigurationPolicyAMPDefinition,
+    IntrusionPreventionPolicy: ConfigurationPolicyIntrusionPreventionDefinition,
+    UrlFilteringPolicy: ConfigurationPolicyUrlFilteringDefinition,
 }
 
 
@@ -648,10 +667,22 @@ class PolicyDefinitionsAPI:
         endpoints = self.__get_definition_endpoints_instance(type)
         endpoints.delete_policy_definition(id=id)
 
+    @overload
+    def get(self, type: Type[IntrusionPreventionPolicy]) -> DataSequence[PolicyDefinitionInfo]:
+        ...
+
     @overload
     def get(self, type: Type[TrafficDataPolicy]) -> DataSequence[PolicyDefinitionInfo]:
         ...
 
+    @overload
+    def get(self, type: Type[UrlFilteringPolicy]) -> DataSequence[PolicyDefinitionInfo]:
+        ...
+
+    @overload
+    def get(self, type: Type[AdvancedInspectionProfilePolicy]) -> DataSequence[PolicyDefinitionInfo]:
+        ...
+
     @overload
     def get(self, type: Type[AdvancedMalwareProtectionPolicy]) -> DataSequence[PolicyDefinitionInfo]:
         ...
@@ -709,11 +740,22 @@ class PolicyDefinitionsAPI:
         ...
 
     # get by id
+    @overload
+    def get(self, type: Type[IntrusionPreventionPolicy], id: UUID) -> IntrusionPreventionPolicyGetResponse:
+        ...
 
     @overload
     def get(self, type: Type[TrafficDataPolicy], id: UUID) -> TrafficDataPolicyGetResponse:
         ...
 
+    @overload
+    def get(self, type: Type[UrlFilteringPolicy], id: UUID) -> UrlFilteringPolicyGetResponse:
+        ...
+
+    @overload
+    def get(self, type: Type[AdvancedInspectionProfilePolicy], id: UUID) -> AdvancedInspectionProfilePolicyGetResponse:
+        ...
+
     @overload
     def get(self, type: Type[AdvancedMalwareProtectionPolicy], id: UUID) -> AdvancedMalwareProtectionPolicyGetResponse:
         ...

{catalystwan-0.33.4.dev2 → catalystwan-0.33.4.dev5}/catalystwan/endpoints/configuration/feature_profile/sdwan/transport.py

@@ -2,6 +2,7 @@
 
 # mypy: disable-error-code="empty-body"
 from typing import Optional
+from uuid import UUID
 
 from catalystwan.api.configuration_groups.parcel import _ParcelBase
 from catalystwan.endpoints import JSON, APIEndpoints, delete, get, post, put, versions
@@ -14,12 +15,12 @@ from catalystwan.models.configuration.feature_profile.common import (
     GetFeatureProfilesPayload,
     SchemaTypeQuery,
 )
-from catalystwan.models.configuration.feature_profile.parcel import ParcelCreationResponse, ParcelId
+from catalystwan.models.configuration.feature_profile.parcel import Parcel, ParcelCreationResponse, ParcelId
 from catalystwan.models.configuration.feature_profile.sdwan.transport import (
     AnyTransportParcel,
     CellularControllerParcel,
 )
-from catalystwan.models.configuration.feature_profile.sdwan.transport.vpn_management import ManagementVpn
+from catalystwan.models.configuration.feature_profile.sdwan.transport.vpn import ManagementVpnParcel
 from catalystwan.typed_list import DataSequence
 
 
@@ -38,56 +39,82 @@ class TransportFeatureProfile(APIEndpoints):
 
     @versions(supported_versions=(">=20.13"), raises=False)
     @get("/v1/feature-profile/sdwan/transport/{profile_id}")
-    def get_transport_feature_profile(self, profile_id: str, params: GetFeatureProfilesPayload) -> FeatureProfileDetail:
+    def get_transport_feature_profile(
+        self, profile_id: UUID, params: GetFeatureProfilesPayload
+    ) -> FeatureProfileDetail:
         ...
 
     @versions(supported_versions=(">=20.13"), raises=False)
     @put("/v1/feature-profile/sdwan/transport/{profile_id}")
     def edit_transport_feature_profile(
-        self, profile_id: str, payload: FeatureProfileEditPayload
+        self, profile_id: UUID, payload: FeatureProfileEditPayload
     ) -> FeatureProfileCreationResponse:
         ...
 
     @versions(supported_versions=(">=20.13"), raises=False)
     @delete("/v1/feature-profile/sdwan/transport/{profile_id}")
-    def delete_transport_feature_profile(self, profile_id: str) -> None:
+    def delete_transport_feature_profile(self, profile_id: UUID) -> None:
         ...
 
     @versions(supported_versions=(">=20.13"), raises=False)
     @post("/v1/feature-profile/sdwan/transport/{profile_id}/{parcel_type}")
     def create_transport_parcel(
-        self, profile_id: str, parcel_type: str, payload: AnyTransportParcel
+        self, profile_id: UUID, parcel_type: str, payload: _ParcelBase
     ) -> ParcelCreationResponse:
         ...
 
+    @versions(supported_versions=(">=20.13"), raises=False)
+    @post("/v1/feature-profile/sdwan/transport/{profile_id}/wan/vpn/{vpn_id}/{parcel_type}")
+    def create_transport_vpn_sub_parcel(
+        self, profile_id: UUID, vpn_id: UUID, parcel_type: str, payload: _ParcelBase
+    ) -> ParcelCreationResponse:
+        ...
+
+    @versions(supported_versions=(">=20.13"), raises=False)
+    @post("/v1/feature-profile/sdwan/transport/{profile_id}/management/vpn/{vpn_id}/{parcel_type}")
+    def create_management_vpn_sub_parcel(
+        self, profile_id: UUID, vpn_id: UUID, parcel_type: str, payload: _ParcelBase
+    ) -> ParcelCreationResponse:
+        ...
+
+    @versions(supported_versions=(">=20.13"), raises=False)
+    @get("/v1/feature-profile/sdwan/transport/{profile_id}/{parcel_type}")
+    def get_transport_parcels(self, profile_id: UUID, parcel_type: str) -> DataSequence[Parcel[AnyTransportParcel]]:
+        ...
+
+    @versions(supported_versions=(">=20.13"), raises=False)
+    @get("/v1/feature-profile/sdwan/transport/{profile_id}/{parcel_type}/{parcel_id}")
+    def get_transport_parcel(self, profile_id: UUID, parcel_type: str, parcel_id: UUID) -> Parcel[AnyTransportParcel]:
+        ...
+
     #
     # ManagementVPN parcel
     #
     @versions(supported_versions=(">=20.13"), raises=False)
     @post("/v1/feature-profile/sdwan/transport/{profile_id}/management/vpn")
-    def create_management_vpn_parcel(self, profile_id: str, payload: _ParcelBase) -> ParcelCreationResponse:
+    def create_management_vpn_parcel(self, profile_id: UUID, payload: _ParcelBase) -> ParcelCreationResponse:
         ...
 
     # @versions(supported_versions=(">=20.13"), raises=False)
     # @get("/v1/feature-profile/sdwan/transport/{profile_id}/management/vpn")
-    # def get_management_vpn_parcels(self, profile_id: str) -> ParcelSequence[ManagementVPN]:
+    # def get_management_vpn_parcels(self, profile_id: UUID) -> ParcelSequence[ManagementVPN]:
     #     ...
 
     # @versions(supported_versions=(">=20.13"), raises=False)
     # @get("/v1/feature-profile/sdwan/transport/{profile_id}/management/vpn/{parcel_id}")
-    # def get_management_vpn_parcel(self, profile_id: str, parcel_id: str) -> Parcel[ManagementVPN]:
+    # def get_management_vpn_parcel(self, profile_id: UUID, parcel_id: str) -> Parcel[ManagementVPN]:
     #     ...
 
     @versions(supported_versions=(">=20.13"), raises=False)
     @put("/v1/feature-profile/sdwan/transport/{profile_id}/management/vpn/{parcel_id}")
     def edit_management_vpn_parcel(
-        self, profile_id: str, parcel_id: str, payload: ManagementVpn
+        self, profile_id: UUID, parcel_id: str, payload: ManagementVpnParcel
     ) -> ParcelCreationResponse:
         ...
 
     @versions(supported_versions=(">=20.13"), raises=False)
     @delete("/v1/feature-profile/sdwan/transport/{profile_id}/management/vpn/{parcel_id}")
-    def delete_management_vpn_parcel(self, profile_id: str, parcel_id: str) -> None:
+    def delete_management_vpn_parcel(self, profile_id: UUID, parcel_id: str) -> None:
         ...
 
     @versions(supported_versions=(">=20.9"), raises=False)