Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

UX2 config push #527

Merged
merged 5 commits into from
Mar 18, 2024
Merged

UX2 config push #527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c7de06c
Start work
jpkrajewski Mar 15, 2024
08ed52c
Working push for System and Other. Add Pusher class. Add Config rever…
jpkrajewski Mar 17, 2024
8f5208e
Use from typing_extensions import Annotated instead
jpkrajewski Mar 18, 2024
5feaea6
Delete commented code in push_ux2_config, change UX2ConfigRollback to…
jpkrajewski Mar 18, 2024
18bf17c
Use pydantic instead of dataclass. Rollback class will be used in web…
jpkrajewski Mar 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 39 additions & 39 deletions catalystwan/api/feature_profile_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,21 +178,21 @@ def get(
return self.endpoint.get_all(profile_id, parcel_type._get_parcel_type())
return self.endpoint.get_by_id(profile_id, parcel_type._get_parcel_type(), parcel_id)

def create(self, profile_id: UUID, payload: AnyOtherParcel) -> ParcelCreationResponse:
def create_parcel(self, profile_id: UUID, payload: AnyOtherParcel) -> ParcelCreationResponse:
"""
Create Other Parcel for selected profile_id based on payload type
"""

return self.endpoint.create(profile_id, payload._get_parcel_type(), payload)

def update(self, profile_id: UUID, payload: AnyOtherParcel, parcel_id: UUID) -> ParcelCreationResponse:
def update_parcel(self, profile_id: UUID, payload: AnyOtherParcel, parcel_id: UUID) -> ParcelCreationResponse:
"""
Update Other Parcel for selected profile_id based on payload type
"""

return self.endpoint.update(profile_id, payload._get_parcel_type(), parcel_id, payload)

def delete(self, profile_id: UUID, parcel_type: Type[AnyOtherParcel], parcel_id: UUID) -> None:
def delete_parcel(self, profile_id: UUID, parcel_type: Type[AnyOtherParcel], parcel_id: UUID) -> None:
"""
Delete Other Parcel for selected profile_id based on payload type
"""
Expand Down Expand Up @@ -276,87 +276,87 @@ def get_schema(
return self.endpoint.get_schema(profile_id, parcel_type._get_parcel_type())

@overload
def get(
def get_parcels(
self,
profile_id: UUID,
parcel_type: Type[AAAParcel],
) -> DataSequence[Parcel[AAAParcel]]:
...

@overload
def get(
def get_parcels(
self,
profile_id: UUID,
parcel_type: Type[BFDParcel],
) -> DataSequence[Parcel[BFDParcel]]:
...

@overload
def get(
def get_parcels(
self,
profile_id: UUID,
parcel_type: Type[LoggingParcel],
) -> DataSequence[Parcel[LoggingParcel]]:
...

@overload
def get(
def get_parcels(
self,
profile_id: UUID,
parcel_type: Type[BannerParcel],
) -> DataSequence[Parcel[BannerParcel]]:
...

@overload
def get(
def get_parcels(
self,
profile_id: UUID,
parcel_type: Type[BasicParcel],
) -> DataSequence[Parcel[BasicParcel]]:
...

@overload
def get(
def get_parcels(
self,
profile_id: UUID,
parcel_type: Type[GlobalParcel],
) -> DataSequence[Parcel[GlobalParcel]]:
...

@overload
def get(
def get_parcels(
self,
profile_id: UUID,
parcel_type: Type[NTPParcel],
) -> DataSequence[Parcel[NTPParcel]]:
...

@overload
def get(
def get_parcels(
self,
profile_id: UUID,
parcel_type: Type[MRFParcel],
) -> DataSequence[Parcel[MRFParcel]]:
...

@overload
def get(
def get_parcels(
self,
profile_id: UUID,
parcel_type: Type[OMPParcel],
) -> DataSequence[Parcel[OMPParcel]]:
...

@overload
def get(
def get_parcels(
self,
profile_id: UUID,
parcel_type: Type[SecurityParcel],
) -> DataSequence[Parcel[SecurityParcel]]:
...

@overload
def get(
def get_parcels(
self,
profile_id: UUID,
parcel_type: Type[SNMPParcel],
Expand All @@ -366,7 +366,7 @@ def get(
# get by id

@overload
def get(
def get_parcels(
self,
profile_id: UUID,
parcel_type: Type[AAAParcel],
Expand All @@ -375,7 +375,7 @@ def get(
...

@overload
def get(
def get_parcels(
self,
profile_id: UUID,
parcel_type: Type[BFDParcel],
Expand All @@ -384,7 +384,7 @@ def get(
...

@overload
def get(
def get_parcels(
self,
profile_id: UUID,
parcel_type: Type[LoggingParcel],
Expand All @@ -393,7 +393,7 @@ def get(
...

@overload
def get(
def get_parcels(
self,
profile_id: UUID,
parcel_type: Type[BannerParcel],
Expand All @@ -402,7 +402,7 @@ def get(
...

@overload
def get(
def get_parcels(
self,
profile_id: UUID,
parcel_type: Type[BasicParcel],
Expand All @@ -411,7 +411,7 @@ def get(
...

@overload
def get(
def get_parcels(
self,
profile_id: UUID,
parcel_type: Type[GlobalParcel],
Expand All @@ -420,7 +420,7 @@ def get(
...

@overload
def get(
def get_parcels(
self,
profile_id: UUID,
parcel_type: Type[NTPParcel],
Expand All @@ -429,7 +429,7 @@ def get(
...

@overload
def get(
def get_parcels(
self,
profile_id: UUID,
parcel_type: Type[MRFParcel],
Expand All @@ -438,7 +438,7 @@ def get(
...

@overload
def get(
def get_parcels(
self,
profile_id: UUID,
parcel_type: Type[OMPParcel],
Expand All @@ -447,7 +447,7 @@ def get(
...

@overload
def get(
def get_parcels(
self,
profile_id: UUID,
parcel_type: Type[SecurityParcel],
Expand All @@ -456,15 +456,15 @@ def get(
...

@overload
def get(
def get_parcels(
self,
profile_id: UUID,
parcel_type: Type[SNMPParcel],
parcel_id: UUID,
) -> DataSequence[Parcel[SNMPParcel]]:
...

def get(
def get_parcels(
self,
profile_id: UUID,
parcel_type: Type[AnySystemParcel],
Expand All @@ -478,7 +478,7 @@ def get(
return self.endpoint.get_all(profile_id, parcel_type._get_parcel_type())
return self.endpoint.get_by_id(profile_id, parcel_type._get_parcel_type(), parcel_id)

def create(self, profile_id: UUID, payload: AnySystemParcel) -> ParcelCreationResponse:
def create_parcel(self, profile_id: UUID, payload: AnySystemParcel) -> ParcelCreationResponse:
"""
Create System Parcel for selected profile_id based on payload type
"""
Expand All @@ -493,7 +493,7 @@ def update(self, profile_id: UUID, payload: AnySystemParcel, parcel_id: UUID) ->
return self.endpoint.update(profile_id, payload._get_parcel_type(), parcel_id, payload)

@overload
def delete(
def delete_parcel(
self,
profile_id: UUID,
parcel_type: Type[AAAParcel],
Expand All @@ -502,7 +502,7 @@ def delete(
...

@overload
def delete(
def delete_parcel(
self,
profile_id: UUID,
parcel_type: Type[BFDParcel],
Expand All @@ -511,7 +511,7 @@ def delete(
...

@overload
def delete(
def delete_parcel(
self,
profile_id: UUID,
parcel_type: Type[LoggingParcel],
Expand All @@ -520,7 +520,7 @@ def delete(
...

@overload
def delete(
def delete_parcel(
self,
profile_id: UUID,
parcel_type: Type[BannerParcel],
Expand All @@ -529,7 +529,7 @@ def delete(
...

@overload
def delete(
def delete_parcel(
self,
profile_id: UUID,
parcel_type: Type[BasicParcel],
Expand All @@ -538,7 +538,7 @@ def delete(
...

@overload
def delete(
def delete_parcel(
self,
profile_id: UUID,
parcel_type: Type[GlobalParcel],
Expand All @@ -547,7 +547,7 @@ def delete(
...

@overload
def delete(
def delete_parcel(
self,
profile_id: UUID,
parcel_type: Type[NTPParcel],
Expand All @@ -556,7 +556,7 @@ def delete(
...

@overload
def delete(
def delete_parcel(
self,
profile_id: UUID,
parcel_type: Type[MRFParcel],
Expand All @@ -565,7 +565,7 @@ def delete(
...

@overload
def delete(
def delete_parcel(
self,
profile_id: UUID,
parcel_type: Type[OMPParcel],
Expand All @@ -574,7 +574,7 @@ def delete(
...

@overload
def delete(
def delete_parcel(
self,
profile_id: UUID,
parcel_type: Type[SecurityParcel],
Expand All @@ -583,15 +583,15 @@ def delete(
...

@overload
def delete(
def delete_parcel(
self,
profile_id: UUID,
parcel_type: Type[SNMPParcel],
parcel_id: UUID,
) -> None:
...

def delete(self, profile_id: UUID, parcel_type: Type[AnySystemParcel], parcel_id: UUID) -> None:
def delete_parcel(self, profile_id: UUID, parcel_type: Type[AnySystemParcel], parcel_id: UUID) -> None:
"""
Delete System Parcel for selected profile_id based on payload type
"""
Expand Down
4 changes: 2 additions & 2 deletions catalystwan/integration_tests/feature_profile/sdwan/other/test_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def test_when_default_values_thousandeyes_parcel_expect_successful_post(self):
parcel_description="ThousandEyes Parcel",
)
# Act
parcel_id = self.session.api.sdwan_feature_profiles.other.create(self.profile_id, te_parcel).id
parcel_id = self.session.api.sdwan_feature_profiles.other.create_parcel(self.profile_id, te_parcel).id
# Assert
assert parcel_id

Expand All @@ -45,7 +45,7 @@ def test_when_default_values_ucse_parcel_expect_successful_post(self):
),
)
# Act
parcel_id = self.session.api.sdwan_feature_profiles.other.create(self.profile_id, ucse_parcel).id
parcel_id = self.session.api.sdwan_feature_profiles.other.create_parcel(self.profile_id, ucse_parcel).id
# Assert
assert parcel_id

Expand Down
Loading
Loading