catalystwan 0.41.2.dev9__py3-none-any.whl → 0.41.3__py3-none-any.whl

catalystwan/endpoints/configuration/feature_profile/sdwan/transport.py

@@ -1,8 +1,7 @@
 # Copyright 2024 Cisco Systems, Inc. and its affiliates
 
 # mypy: disable-error-code="empty-body"
-from typing import Optional, Union
-from uuid import UUID
+from typing import Optional
 
 from catalystwan.api.configuration_groups.parcel import _ParcelBase
 from catalystwan.endpoints import JSON, APIEndpoints, delete, get, post, put, versions
@@ -12,158 +11,80 @@ from catalystwan.models.configuration.feature_profile.common import (
     FeatureProfileDetail,
     FeatureProfileEditPayload,
     FeatureProfileInfo,
-    GetFeatureProfilesParams,
-    SchemaTypeQuery,
-)
-from catalystwan.models.configuration.feature_profile.parcel import (
-    Parcel,
-    ParcelAssociationPayload,
+    GetFeatureProfilesPayload,
     ParcelCreationResponse,
     ParcelId,
+    SchemaTypeQuery,
 )
-from catalystwan.models.configuration.feature_profile.sdwan.routing import AnyRoutingParcel
-from catalystwan.models.configuration.feature_profile.sdwan.transport import (
-    AnyTransportParcel,
-    CellularControllerParcel,
-)
-from catalystwan.models.configuration.feature_profile.sdwan.transport.vpn import ManagementVpnParcel
+from catalystwan.models.configuration.feature_profile.sdwan.management.vpn import ManagementVPN
+from catalystwan.models.configuration.feature_profile.sdwan.transport.cellular_controller import CellularController
 from catalystwan.typed_list import DataSequence
 
 
 class TransportFeatureProfile(APIEndpoints):
-    @versions(supported_versions=(">=20.12"), raises=False)
+    @versions(supported_versions=(">=20.13"), raises=False)
     @post("/v1/feature-profile/sdwan/transport")
     def create_transport_feature_profile(
         self, payload: FeatureProfileCreationPayload
     ) -> FeatureProfileCreationResponse:
         ...
 
-    @versions(supported_versions=(">=20.12"), raises=False)
+    @versions(supported_versions=(">=20.13"), raises=False)
     @get("/v1/feature-profile/sdwan/transport")
-    def get_transport_feature_profiles(self, params: GetFeatureProfilesParams) -> DataSequence[FeatureProfileInfo]:
+    def get_transport_feature_profiles(self, params: GetFeatureProfilesPayload) -> DataSequence[FeatureProfileInfo]:
         ...
 
-    @versions(supported_versions=(">=20.12"), raises=False)
+    @versions(supported_versions=(">=20.13"), raises=False)
     @get("/v1/feature-profile/sdwan/transport/{profile_id}")
-    def get_transport_feature_profile(self, profile_id: UUID, params: GetFeatureProfilesParams) -> FeatureProfileDetail:
+    def get_transport_feature_profile(self, profile_id: str, params: GetFeatureProfilesPayload) -> FeatureProfileDetail:
         ...
 
-    @versions(supported_versions=(">=20.12"), raises=False)
+    @versions(supported_versions=(">=20.13"), raises=False)
     @put("/v1/feature-profile/sdwan/transport/{profile_id}")
     def edit_transport_feature_profile(
-        self, profile_id: UUID, payload: FeatureProfileEditPayload
+        self, profile_id: str, payload: FeatureProfileEditPayload
     ) -> FeatureProfileCreationResponse:
         ...
 
-    @versions(supported_versions=(">=20.12"), raises=False)
+    @versions(supported_versions=(">=20.13"), raises=False)
     @delete("/v1/feature-profile/sdwan/transport/{profile_id}")
-    def delete_transport_feature_profile(self, profile_id: UUID) -> None:
-        ...
-
-    @versions(supported_versions=(">=20.12"), raises=False)
-    @post("/v1/feature-profile/sdwan/transport/{profile_id}/{parcel_type}")
-    def create_transport_parcel(
-        self, profile_id: UUID, parcel_type: str, payload: _ParcelBase
-    ) -> ParcelCreationResponse:
-        ...
-
-    @versions(supported_versions=(">=20.12"), 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.12"), 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.12"), 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[Union[AnyTransportParcel, AnyRoutingParcel]]]:
-        ...
-
-    @versions(supported_versions=(">=20.12"), 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[Union[AnyTransportParcel, AnyRoutingParcel]]:
-        ...
-
-    @versions(supported_versions=(">=20.12"), raises=False)
-    @put("/v1/feature-profile/sdwan/transport/{profile_id}/{parcel_type}/{parcel_id}")
-    def update_transport_parcel(
-        self, profile_id: UUID, parcel_type: str, parcel_id: UUID, payload: _ParcelBase
-    ) -> ParcelCreationResponse:
-        ...
-
-    @versions(supported_versions=(">=20.12"), raises=False)
-    @get("/v1/feature-profile/sdwan/transport/{profile_id}/wan/vpn/{vpn_id}/{parcel_type}/{parcel_id}")
-    def get_transport_vpn_sub_parcel(
-        self, profile_id: UUID, vpn_id: UUID, parcel_type: str, parcel_id: UUID
-    ) -> Parcel[AnyTransportParcel]:
-        ...
-
-    @versions(supported_versions=(">=20.12"), raises=False)
-    @get("/v1/feature-profile/sdwan/transport/{profile_id}/management/vpn/{vpn_id}/{parcel_type}/{parcel_id}")
-    def get_management_vpn_sub_parcel(
-        self, profile_id: UUID, vpn_id: UUID, parcel_type: str, parcel_id: UUID
-    ) -> Parcel[AnyTransportParcel]:
-        ...
-
-    @versions(supported_versions=(">=20.12"), raises=False)
-    @put("/v1/feature-profile/sdwan/transport/{profile_id}/wan/vpn/{vpn_id}/{parcel_type}/{parcel_id}")
-    def update_transport_vpn_sub_parcel(
-        self, profile_id: UUID, vpn_id: UUID, parcel_type: str, parcel_id: UUID, payload: _ParcelBase
-    ) -> ParcelCreationResponse:
-        ...
-
-    @versions(supported_versions=(">=20.12"), raises=False)
-    @put("/v1/feature-profile/sdwan/transport/{profile_id}/management/vpn/{vpn_id}/{parcel_type}/{parcel_id}")
-    def update_management_vpn_sub_parcel(
-        self, profile_id: UUID, vpn_id: UUID, parcel_type: str, parcel_id: UUID, payload: _ParcelBase
-    ) -> ParcelCreationResponse:
+    def delete_transport_feature_profile(self, profile_id: str) -> None:
         ...
 
     #
     # ManagementVPN parcel
     #
-    @versions(supported_versions=(">=20.12"), raises=False)
+    @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: UUID, payload: _ParcelBase) -> ParcelCreationResponse:
+    def create_management_vpn_parcel(self, profile_id: str, payload: _ParcelBase) -> ParcelCreationResponse:
         ...
 
-    # @versions(supported_versions=(">=20.12"), raises=False)
+    # @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: UUID) -> ParcelSequence[ManagementVPN]:
+    # def get_management_vpn_parcels(self, profile_id: str) -> ParcelSequence[ManagementVPN]:
     #     ...
 
-    # @versions(supported_versions=(">=20.12"), raises=False)
+    # @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: UUID, parcel_id: str) -> Parcel[ManagementVPN]:
+    # def get_management_vpn_parcel(self, profile_id: str, parcel_id: str) -> Parcel[ManagementVPN]:
     #     ...
 
-    @versions(supported_versions=(">=20.12"), raises=False)
+    @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: UUID, parcel_id: str, payload: ManagementVpnParcel
+        self, profile_id: str, parcel_id: str, payload: ManagementVPN
     ) -> ParcelCreationResponse:
         ...
 
-    @versions(supported_versions=(">=20.12"), raises=False)
+    @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: UUID, parcel_id: str) -> None:
+    def delete_management_vpn_parcel(self, profile_id: str, parcel_id: str) -> None:
         ...
 
     @versions(supported_versions=(">=20.9"), raises=False)
     @get("/v1/feature-profile/sdwan/transport")
     def get_sdwan_transport_feature_profiles(
-        self, payload: Optional[GetFeatureProfilesParams]
+        self, payload: Optional[GetFeatureProfilesPayload]
     ) -> DataSequence[FeatureProfileInfo]:
         ...
 
@@ -187,45 +108,6 @@ class TransportFeatureProfile(APIEndpoints):
     @versions(supported_versions=(">=20.9"), raises=False)
     @post("/v1/feature-profile/sdwan/transport/{transport_id}/cellular-controller")
     def create_cellular_controller_profile_parcel_for_transport(
-        self, transport_id: str, payload: CellularControllerParcel
-    ) -> ParcelId:
-        ...
-
-    #
-    # Cellular controller
-    #
-
-    @versions(supported_versions=(">=20.9"), raises=False)
-    @post("/v1/feature-profile/sdwan/transport/{profile_id}/cellular-controller/{cellular_controler_id}/{parcel_type}")
-    def associate_with_cellular_controller(
-        self, profile_id: UUID, cellular_controler_id: UUID, parcel_type: str, payload: ParcelAssociationPayload
+        self, transport_id: str, payload: CellularController
     ) -> ParcelId:
         ...
-
-    #
-    # Routing
-    #
-
-    @versions(supported_versions=(">=20.9"), raises=False)
-    @post("/v1/feature-profile/sdwan/transport/{profile_id}/wan/vpn/{vpn_id}/{parcel_type}")
-    def associate_with_vpn(
-        self, profile_id: UUID, vpn_id: UUID, parcel_type: str, payload: ParcelAssociationPayload
-    ) -> ParcelCreationResponse:
-        ...
-
-    # Tracker, TrackerGroup, IPv6Tracker, TrackerGroupIPv6
-    @versions(supported_versions=(">=20.9"), raises=False)
-    @post(
-        "/v1/feature-profile/sdwan/transport/{profile_uuid}/wan/vpn/"
-        "{vpn_uuid}/{interface_parcel_type}/{interface_uuid}/{tracker_type}"
-    )
-    def associate_tracker_with_vpn_interface(
-        self,
-        profile_uuid: UUID,
-        vpn_uuid: UUID,
-        interface_parcel_type: str,
-        interface_uuid: UUID,
-        tracker_type: str,
-        payload: ParcelAssociationPayload,
-    ) -> ParcelCreationResponse:
-        ...

catalystwan/endpoints/configuration/policy/definition/access_control_list.py

@@ -4,14 +4,11 @@
 from uuid import UUID
 
 from catalystwan.endpoints import APIEndpoints, delete, get, post, put
-from catalystwan.endpoints.configuration.policy.abstractions import PolicyDefinitionEndpoints
-from catalystwan.models.policy.definition.access_control_list import (
-    AclPolicy,
-    AclPolicyEditPayload,
-    AclPolicyGetResponse,
-)
+from catalystwan.models.policy.definitions.access_control_list import AclPolicy
 from catalystwan.models.policy.policy_definition import (
     PolicyDefinitionEditResponse,
+    PolicyDefinitionEndpoints,
+    PolicyDefinitionGetResponse,
     PolicyDefinitionId,
     PolicyDefinitionInfo,
     PolicyDefinitionPreview,
@@ -19,6 +16,14 @@ from catalystwan.models.policy.policy_definition import (
 from catalystwan.typed_list import DataSequence
 
 
+class AclPolicyEditPayload(AclPolicy, PolicyDefinitionId):
+    pass
+
+
+class AclPolicyGetResponse(AclPolicy, PolicyDefinitionGetResponse):
+    pass
+
+
 class ConfigurationPolicyAclDefinition(APIEndpoints, PolicyDefinitionEndpoints):
     @post("/template/policy/definition/acl")
     def create_policy_definition(self, payload: AclPolicy) -> PolicyDefinitionId:

catalystwan/endpoints/configuration/policy/definition/access_control_list_ipv6.py

@@ -4,14 +4,11 @@
 from uuid import UUID
 
 from catalystwan.endpoints import APIEndpoints, delete, get, post, put
-from catalystwan.endpoints.configuration.policy.abstractions import PolicyDefinitionEndpoints
-from catalystwan.models.policy.definition.access_control_list_ipv6 import (
-    AclIPv6Policy,
-    AclIPv6PolicyEditPayload,
-    AclIPv6PolicyGetResponse,
-)
+from catalystwan.models.policy.definitions.access_control_list_ipv6 import AclIPv6Policy
 from catalystwan.models.policy.policy_definition import (
     PolicyDefinitionEditResponse,
+    PolicyDefinitionEndpoints,
+    PolicyDefinitionGetResponse,
     PolicyDefinitionId,
     PolicyDefinitionInfo,
     PolicyDefinitionPreview,
@@ -19,6 +16,14 @@ from catalystwan.models.policy.policy_definition import (
 from catalystwan.typed_list import DataSequence
 
 
+class AclIPv6PolicyEditPayload(AclIPv6Policy, PolicyDefinitionId):
+    pass
+
+
+class AclIPv6PolicyGetResponse(AclIPv6Policy, PolicyDefinitionGetResponse):
+    pass
+
+
 class ConfigurationPolicyAclIPv6Definition(APIEndpoints, PolicyDefinitionEndpoints):
     @post("/template/policy/definition/aclv6")
     def create_policy_definition(self, payload: AclIPv6Policy) -> PolicyDefinitionId:

catalystwan/endpoints/configuration/policy/definition/control.py

@@ -4,14 +4,11 @@
 from uuid import UUID
 
 from catalystwan.endpoints import APIEndpoints, delete, get, post, put
-from catalystwan.endpoints.configuration.policy.abstractions import PolicyDefinitionEndpoints
-from catalystwan.models.policy.definition.control import (
-    ControlPolicy,
-    ControlPolicyEditPayload,
-    ControlPolicyGetResponse,
-)
+from catalystwan.models.policy.definitions.control import ControlPolicy
 from catalystwan.models.policy.policy_definition import (
     PolicyDefinitionEditResponse,
+    PolicyDefinitionEndpoints,
+    PolicyDefinitionGetResponse,
     PolicyDefinitionId,
     PolicyDefinitionInfo,
     PolicyDefinitionPreview,
@@ -19,6 +16,14 @@ from catalystwan.models.policy.policy_definition import (
 from catalystwan.typed_list import DataSequence
 
 
+class ControlPolicyEditPayload(ControlPolicy, PolicyDefinitionId):
+    pass
+
+
+class ControlPolicyGetResponse(ControlPolicy, PolicyDefinitionGetResponse):
+    pass
+
+
 class ConfigurationPolicyControlDefinition(APIEndpoints, PolicyDefinitionEndpoints):
     @post("/template/policy/definition/control")
     def create_policy_definition(self, payload: ControlPolicy) -> PolicyDefinitionId:

catalystwan/endpoints/configuration/policy/definition/device_access.py

@@ -4,14 +4,11 @@
 from uuid import UUID
 
 from catalystwan.endpoints import APIEndpoints, delete, get, post, put
-from catalystwan.endpoints.configuration.policy.abstractions import PolicyDefinitionEndpoints
-from catalystwan.models.policy.definition.device_access import (
-    DeviceAccessPolicy,
-    DeviceAccessPolicyEditPayload,
-    DeviceAccessPolicyGetResponse,
-)
+from catalystwan.models.policy.definitions.device_access import DeviceAccessPolicy
 from catalystwan.models.policy.policy_definition import (
     PolicyDefinitionEditResponse,
+    PolicyDefinitionEndpoints,
+    PolicyDefinitionGetResponse,
     PolicyDefinitionId,
     PolicyDefinitionInfo,
     PolicyDefinitionPreview,
@@ -19,6 +16,14 @@ from catalystwan.models.policy.policy_definition import (
 from catalystwan.typed_list import DataSequence
 
 
+class DeviceAccessPolicyEditPayload(DeviceAccessPolicy, PolicyDefinitionId):
+    pass
+
+
+class DeviceAccessPolicyGetResponse(DeviceAccessPolicy, PolicyDefinitionGetResponse):
+    pass
+
+
 class ConfigurationPolicyDeviceAccessDefinition(APIEndpoints, PolicyDefinitionEndpoints):
     @post("/template/policy/definition/deviceaccesspolicy")
     def create_policy_definition(self, payload: DeviceAccessPolicy) -> PolicyDefinitionId:

catalystwan/endpoints/configuration/policy/definition/device_access_ipv6.py

@@ -4,14 +4,11 @@
 from uuid import UUID
 
 from catalystwan.endpoints import APIEndpoints, delete, get, post, put
-from catalystwan.endpoints.configuration.policy.abstractions import PolicyDefinitionEndpoints
-from catalystwan.models.policy.definition.device_access_ipv6 import (
-    DeviceAccessIPv6Policy,
-    DeviceAccessIPv6PolicyEditPayload,
-    DeviceAccessIPv6PolicyGetResponse,
-)
+from catalystwan.models.policy.definitions.device_access_ipv6 import DeviceAccessIPv6Policy
 from catalystwan.models.policy.policy_definition import (
     PolicyDefinitionEditResponse,
+    PolicyDefinitionEndpoints,
+    PolicyDefinitionGetResponse,
     PolicyDefinitionId,
     PolicyDefinitionInfo,
     PolicyDefinitionPreview,
@@ -19,6 +16,14 @@ from catalystwan.models.policy.policy_definition import (
 from catalystwan.typed_list import DataSequence
 
 
+class DeviceAccessIPv6PolicyEditPayload(DeviceAccessIPv6Policy, PolicyDefinitionId):
+    pass
+
+
+class DeviceAccessIPv6PolicyGetResponse(DeviceAccessIPv6Policy, PolicyDefinitionGetResponse):
+    pass
+
+
 class ConfigurationPolicyDeviceAccessIPv6Definition(APIEndpoints, PolicyDefinitionEndpoints):
     @post("/template/policy/definition/deviceaccesspolicyv6")
     def create_policy_definition(self, payload: DeviceAccessIPv6Policy) -> PolicyDefinitionId:

catalystwan/endpoints/configuration/policy/definition/hub_and_spoke.py

@@ -4,14 +4,11 @@
 from uuid import UUID
 
 from catalystwan.endpoints import APIEndpoints, delete, get, post, put
-from catalystwan.endpoints.configuration.policy.abstractions import PolicyDefinitionEndpoints
-from catalystwan.models.policy.definition.hub_and_spoke import (
-    HubAndSpokePolicy,
-    HubAndSpokePolicyEditPayload,
-    HubAndSpokePolicyGetResponse,
-)
+from catalystwan.models.policy.definitions.hub_and_spoke import HubAndSpokePolicy
 from catalystwan.models.policy.policy_definition import (
     PolicyDefinitionEditResponse,
+    PolicyDefinitionEndpoints,
+    PolicyDefinitionGetResponse,
     PolicyDefinitionId,
     PolicyDefinitionInfo,
     PolicyDefinitionPreview,
@@ -19,6 +16,14 @@ from catalystwan.models.policy.policy_definition import (
 from catalystwan.typed_list import DataSequence
 
 
+class HubAndSpokePolicyEditPayload(HubAndSpokePolicy, PolicyDefinitionId):
+    pass
+
+
+class HubAndSpokePolicyGetResponse(HubAndSpokePolicy, PolicyDefinitionGetResponse):
+    pass
+
+
 class ConfigurationPolicyHubAndSpokeDefinition(APIEndpoints, PolicyDefinitionEndpoints):
     @post("/template/policy/definition/hubandspoke")
     def create_policy_definition(self, payload: HubAndSpokePolicy) -> PolicyDefinitionId:

catalystwan/endpoints/configuration/policy/definition/mesh.py

@@ -4,10 +4,11 @@
 from uuid import UUID
 
 from catalystwan.endpoints import APIEndpoints, delete, get, post, put
-from catalystwan.endpoints.configuration.policy.abstractions import PolicyDefinitionEndpoints
-from catalystwan.models.policy.definition.mesh import MeshPolicy, MeshPolicyEditPayload, MeshPolicyGetResponse
+from catalystwan.models.policy.definitions.mesh import MeshPolicy
 from catalystwan.models.policy.policy_definition import (
     PolicyDefinitionEditResponse,
+    PolicyDefinitionEndpoints,
+    PolicyDefinitionGetResponse,
     PolicyDefinitionId,
     PolicyDefinitionInfo,
     PolicyDefinitionPreview,
@@ -15,6 +16,14 @@ from catalystwan.models.policy.policy_definition import (
 from catalystwan.typed_list import DataSequence
 
 
+class MeshPolicyEditPayload(MeshPolicy, PolicyDefinitionId):
+    pass
+
+
+class MeshPolicyGetResponse(MeshPolicy, PolicyDefinitionGetResponse):
+    pass
+
+
 class ConfigurationPolicyMeshDefinition(APIEndpoints, PolicyDefinitionEndpoints):
     @post("/template/policy/definition/mesh")
     def create_policy_definition(self, payload: MeshPolicy) -> PolicyDefinitionId:

catalystwan/endpoints/configuration/policy/definition/qos_map.py

@@ -4,10 +4,11 @@
 from uuid import UUID
 
 from catalystwan.endpoints import APIEndpoints, delete, get, post, put
-from catalystwan.endpoints.configuration.policy.abstractions import PolicyDefinitionEndpoints
-from catalystwan.models.policy.definition.qos_map import QoSMapPolicy, QoSMapPolicyEditPayload, QoSMapPolicyGetResponse
+from catalystwan.models.policy.definitions.qos_map import QoSMapPolicy
 from catalystwan.models.policy.policy_definition import (
     PolicyDefinitionEditResponse,
+    PolicyDefinitionEndpoints,
+    PolicyDefinitionGetResponse,
     PolicyDefinitionId,
     PolicyDefinitionInfo,
     PolicyDefinitionPreview,
@@ -15,6 +16,14 @@ from catalystwan.models.policy.policy_definition import (
 from catalystwan.typed_list import DataSequence
 
 
+class QoSMapPolicyEditPayload(QoSMapPolicy, PolicyDefinitionId):
+    pass
+
+
+class QoSMapPolicyGetResponse(QoSMapPolicy, PolicyDefinitionGetResponse):
+    pass
+
+
 class ConfigurationPolicyQoSMapDefinition(APIEndpoints, PolicyDefinitionEndpoints):
     @post("/template/policy/definition/qosmap")
     def create_policy_definition(self, payload: QoSMapPolicy) -> PolicyDefinitionId:

catalystwan/endpoints/configuration/policy/definition/rewrite.py

@@ -4,14 +4,11 @@
 from uuid import UUID
 
 from catalystwan.endpoints import APIEndpoints, delete, get, post, put
-from catalystwan.endpoints.configuration.policy.abstractions import PolicyDefinitionEndpoints
-from catalystwan.models.policy.definition.rewrite import (
-    RewritePolicy,
-    RewritePolicyEditPayload,
-    RewritePolicyGetResponse,
-)
+from catalystwan.models.policy.definitions.rewrite import RewritePolicy
 from catalystwan.models.policy.policy_definition import (
     PolicyDefinitionEditResponse,
+    PolicyDefinitionEndpoints,
+    PolicyDefinitionGetResponse,
     PolicyDefinitionId,
     PolicyDefinitionInfo,
     PolicyDefinitionPreview,
@@ -19,6 +16,14 @@ from catalystwan.models.policy.policy_definition import (
 from catalystwan.typed_list import DataSequence
 
 
+class RewritePolicyEditPayload(RewritePolicy, PolicyDefinitionId):
+    pass
+
+
+class RewritePolicyGetResponse(RewritePolicy, PolicyDefinitionGetResponse):
+    pass
+
+
 class ConfigurationPolicyRewriteRuleDefinition(APIEndpoints, PolicyDefinitionEndpoints):
     @post("/template/policy/definition/rewriterule")
     def create_policy_definition(self, payload: RewritePolicy) -> PolicyDefinitionId:

catalystwan/endpoints/configuration/policy/definition/rule_set.py

@@ -4,10 +4,11 @@
 from uuid import UUID
 
 from catalystwan.endpoints import APIEndpoints, delete, get, post, put
-from catalystwan.endpoints.configuration.policy.abstractions import PolicyDefinitionEndpoints
-from catalystwan.models.policy.definition.rule_set import RuleSet, RuleSetEditPayload, RuleSetGetResponse
+from catalystwan.models.policy.definitions.rule_set import RuleSet
 from catalystwan.models.policy.policy_definition import (
     PolicyDefinitionEditResponse,
+    PolicyDefinitionEndpoints,
+    PolicyDefinitionGetResponse,
     PolicyDefinitionId,
     PolicyDefinitionInfo,
     PolicyDefinitionPreview,
@@ -15,6 +16,14 @@ from catalystwan.models.policy.policy_definition import (
 from catalystwan.typed_list import DataSequence
 
 
+class RuleSetEditPayload(RuleSet, PolicyDefinitionId):
+    pass
+
+
+class RuleSetGetResponse(RuleSet, PolicyDefinitionGetResponse):
+    pass
+
+
 class ConfigurationPolicyRuleSetDefinition(APIEndpoints, PolicyDefinitionEndpoints):
     @post("/template/policy/definition/ruleset")
     def create_policy_definition(self, payload: RuleSet) -> PolicyDefinitionId:

catalystwan/endpoints/configuration/policy/definition/security_group.py

@@ -4,14 +4,11 @@
 from uuid import UUID
 
 from catalystwan.endpoints import APIEndpoints, delete, get, post, put
-from catalystwan.endpoints.configuration.policy.abstractions import PolicyDefinitionEndpoints
-from catalystwan.models.policy.definition.security_group import (
-    SecurityGroup,
-    SecurityGroupEditPayload,
-    SecurityGroupGetResponse,
-)
+from catalystwan.models.policy.definitions.security_group import SecurityGroup
 from catalystwan.models.policy.policy_definition import (
     PolicyDefinitionEditResponse,
+    PolicyDefinitionEndpoints,
+    PolicyDefinitionGetResponse,
     PolicyDefinitionId,
     PolicyDefinitionInfo,
     PolicyDefinitionPreview,
@@ -19,6 +16,14 @@ from catalystwan.models.policy.policy_definition import (
 from catalystwan.typed_list import DataSequence
 
 
+class SecurityGroupEditPayload(SecurityGroup, PolicyDefinitionId):
+    pass
+
+
+class SecurityGroupGetResponse(SecurityGroup, PolicyDefinitionGetResponse):
+    pass
+
+
 class ConfigurationPolicySecurityGroupDefinition(APIEndpoints, PolicyDefinitionEndpoints):
     @post("/template/policy/definition/securitygroup")
     def create_policy_definition(self, payload: SecurityGroup) -> PolicyDefinitionId:

catalystwan/endpoints/configuration/policy/definition/traffic_data.py

@@ -5,14 +5,11 @@
 from uuid import UUID
 
 from catalystwan.endpoints import APIEndpoints, delete, get, post, put
-from catalystwan.endpoints.configuration.policy.abstractions import PolicyDefinitionEndpoints
-from catalystwan.models.policy.definition.traffic_data import (
-    TrafficDataPolicy,
-    TrafficDataPolicyEditPayload,
-    TrafficDataPolicyGetResponse,
-)
+from catalystwan.models.policy.definitions.traffic_data import TrafficDataPolicy
 from catalystwan.models.policy.policy_definition import (
     PolicyDefinitionEditResponse,
+    PolicyDefinitionEndpoints,
+    PolicyDefinitionGetResponse,
     PolicyDefinitionId,
     PolicyDefinitionInfo,
     PolicyDefinitionPreview,
@@ -20,6 +17,14 @@ from catalystwan.models.policy.policy_definition import (
 from catalystwan.typed_list import DataSequence
 
 
+class TrafficDataPolicyEditPayload(TrafficDataPolicy, PolicyDefinitionId):
+    pass
+
+
+class TrafficDataPolicyGetResponse(TrafficDataPolicy, PolicyDefinitionGetResponse):
+    pass
+
+
 class ConfigurationPolicyDataDefinition(APIEndpoints, PolicyDefinitionEndpoints):
     @post("/template/policy/definition/data")
     def create_policy_definition(self, payload: TrafficDataPolicy) -> PolicyDefinitionId:

catalystwan/endpoints/configuration/policy/definition/vpn_membership.py

@@ -4,14 +4,11 @@
 from uuid import UUID
 
 from catalystwan.endpoints import APIEndpoints, delete, get, post, put
-from catalystwan.endpoints.configuration.policy.abstractions import PolicyDefinitionEndpoints
-from catalystwan.models.policy.definition.vpn_membership import (
-    VPNMembershipPolicy,
-    VPNMembershipPolicyEditPayload,
-    VPNMembershipPolicyGetResponse,
-)
+from catalystwan.models.policy.definitions.vpn_membership import VPNMembershipPolicy
 from catalystwan.models.policy.policy_definition import (
     PolicyDefinitionEditResponse,
+    PolicyDefinitionEndpoints,
+    PolicyDefinitionGetResponse,
     PolicyDefinitionId,
     PolicyDefinitionInfo,
     PolicyDefinitionPreview,
@@ -19,6 +16,14 @@ from catalystwan.models.policy.policy_definition import (
 from catalystwan.typed_list import DataSequence
 
 
+class VPNMembershipPolicyEditPayload(VPNMembershipPolicy, PolicyDefinitionId):
+    pass
+
+
+class VPNMembershipPolicyGetResponse(VPNMembershipPolicy, PolicyDefinitionGetResponse):
+    pass
+
+
 class ConfigurationPolicyVPNMembershipGroupDefinition(APIEndpoints, PolicyDefinitionEndpoints):
     @post("/template/policy/definition/vpnmembershipgroup")
     def create_policy_definition(self, payload: VPNMembershipPolicy) -> PolicyDefinitionId: