From 29a9ebd3d5d753029bda9ac68d4b109ffb491d56 Mon Sep 17 00:00:00 2001 From: Szymon Basan <116343782+sbasan@users.noreply.github.com> Date: Tue, 8 Oct 2024 12:10:48 +0200 Subject: [PATCH] dev: sync with 0.35.5 (#837) * fix: device ip arguement for listing partitions (#835) * Bump actions/checkout from 4.1.7 to 4.2.0 (#834) Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.7 to 4.2.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/692973e3d937129bcbf40652eb9f2f61becf3332...d632683dd7b4114ad314bca15554477dd762a938) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * bump dev version --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/linting.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/unittests.yml | 2 +- ENDPOINTS.md | 9 ++++++--- catalystwan/api/versions_utils.py | 9 +++++---- pyproject.toml | 2 +- 6 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index 5105c881..218065a9 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -16,7 +16,7 @@ jobs: shell: sh steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - name: Set up Python uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 676d55c2..2534b441 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,7 @@ jobs: run: shell: bash steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - name: Set up Python uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0 with: diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml index cfde071c..68aeca69 100644 --- a/.github/workflows/unittests.yml +++ b/.github/workflows/unittests.yml @@ -16,7 +16,7 @@ jobs: shell: bash steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - name: Set up Python uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0 with: diff --git a/ENDPOINTS.md b/ENDPOINTS.md index 997165b5..4dea1314 100644 --- a/ENDPOINTS.md +++ b/ENDPOINTS.md @@ -1,6 +1,6 @@ **THIS FILE WAS AUTO-GENERATED DO NOT EDIT** -Generated for: catalystwan-0.35.4.dev6 +Generated for: catalystwan-0.35.5.dev0 All URIs are relative to */dataservice* HTTP request | Supported Versions | Method | Payload Type | Return Type | Tenancy Mode @@ -34,8 +34,11 @@ GET /setting/configuration/webserver/certificate||[**CertificateManagementVManag GET /client/server||[**Client.server**](https://github.com/cisco-open/cisco-catalyst-wan-sdk/blob/main/catalystwan/endpoints/client.py#L86)||[**ServerInfo**](https://github.com/cisco-open/cisco-catalyst-wan-sdk/blob/main/catalystwan/endpoints/client.py#L23)| GET /client/server/ready||[**Client.server_ready**](https://github.com/cisco-open/cisco-catalyst-wan-sdk/blob/main/catalystwan/endpoints/client.py#L90)||[**ServerReady**](https://github.com/cisco-open/cisco-catalyst-wan-sdk/blob/main/catalystwan/endpoints/client.py#L80)| GET /client/about||[**Client.about**](https://github.com/cisco-open/cisco-catalyst-wan-sdk/blob/main/catalystwan/endpoints/client.py#L94)||[**AboutInfo**](https://github.com/cisco-open/cisco-catalyst-wan-sdk/blob/main/catalystwan/endpoints/client.py#L64)| -GET /clusterManagement/tenancy/mode||[**ClusterManagement.get_tenancy_mode**](https://github.com/cisco-open/cisco-catalyst-wan-sdk/blob/main/catalystwan/endpoints/cluster_management.py#L64)||[**TenancyMode**](https://github.com/cisco-open/cisco-catalyst-wan-sdk/blob/main/catalystwan/endpoints/cluster_management.py#L14)| -GET /clusterManagement/vManage/details/{vmanageIP}||[**ClusterManagement.get_vmanage_details**](https://github.com/cisco-open/cisco-catalyst-wan-sdk/blob/main/catalystwan/endpoints/cluster_management.py#L72)||DataSequence[[**VManageDetails**](https://github.com/cisco-open/cisco-catalyst-wan-sdk/blob/main/catalystwan/endpoints/cluster_management.py#L21)]| +POST /clusterManagement/setup||[**ClusterManagement.add_vmanage**](https://github.com/cisco-open/cisco-catalyst-wan-sdk/blob/main/catalystwan/endpoints/cluster_management.py#L51)|[**VManageSetup**](https://github.com/cisco-open/cisco-catalyst-wan-sdk/blob/main/catalystwan/endpoints/cluster_management.py#L35)|None| +PUT /clusterManagement/setup||[**ClusterManagement.edit_vmanage**](https://github.com/cisco-open/cisco-catalyst-wan-sdk/blob/main/catalystwan/endpoints/cluster_management.py#L64)|[**VManageSetup**](https://github.com/cisco-open/cisco-catalyst-wan-sdk/blob/main/catalystwan/endpoints/cluster_management.py#L35)|None| +GET /clusterManagement/connectedDevices/{vmanageIP}||[**ClusterManagement.get_connected_devices**](https://github.com/cisco-open/cisco-catalyst-wan-sdk/blob/main/catalystwan/endpoints/cluster_management.py#L77)||DataSequence[[**ConnectedDevice**](https://github.com/cisco-open/cisco-catalyst-wan-sdk/blob/main/catalystwan/endpoints/cluster_management.py#L29)]| +GET /clusterManagement/tenancy/mode||[**ClusterManagement.get_tenancy_mode**](https://github.com/cisco-open/cisco-catalyst-wan-sdk/blob/main/catalystwan/endpoints/cluster_management.py#L85)||[**TenancyMode**](https://github.com/cisco-open/cisco-catalyst-wan-sdk/blob/main/catalystwan/endpoints/cluster_management.py#L16)| +GET /clusterManagement/vManage/details/{vmanageIP}||[**ClusterManagement.get_vmanage_details**](https://github.com/cisco-open/cisco-catalyst-wan-sdk/blob/main/catalystwan/endpoints/cluster_management.py#L93)||DataSequence[[**VManageDetails**](https://github.com/cisco-open/cisco-catalyst-wan-sdk/blob/main/catalystwan/endpoints/cluster_management.py#L23)]| POST /system/device/{device_uuid}/unlock|>=20.9|[**ConfigurationDeviceInventory.unlock**](https://github.com/cisco-open/cisco-catalyst-wan-sdk/blob/main/catalystwan/endpoints/configuration_device_inventory.py#L275)|[**DeviceUnlockPayload**](https://github.com/cisco-open/cisco-catalyst-wan-sdk/blob/main/catalystwan/endpoints/configuration_device_inventory.py#L20)|[**DeviceUnlockResponse**](https://github.com/cisco-open/cisco-catalyst-wan-sdk/blob/main/catalystwan/endpoints/configuration_device_inventory.py#L25)| POST /system/device||[**ConfigurationDeviceInventory.create_device**](https://github.com/cisco-open/cisco-catalyst-wan-sdk/blob/main/catalystwan/endpoints/configuration_device_inventory.py#L280)|[**DeviceCreationPayload**](https://github.com/cisco-open/cisco-catalyst-wan-sdk/blob/main/catalystwan/endpoints/configuration_device_inventory.py#L32)|None| DELETE /system/device/{uuid}||[**ConfigurationDeviceInventory.delete_device**](https://github.com/cisco-open/cisco-catalyst-wan-sdk/blob/main/catalystwan/endpoints/configuration_device_inventory.py#L284)||[**DeviceDeletionResponse**](https://github.com/cisco-open/cisco-catalyst-wan-sdk/blob/main/catalystwan/endpoints/configuration_device_inventory.py#L44)| diff --git a/catalystwan/api/versions_utils.py b/catalystwan/api/versions_utils.py index eeb57099..6e920640 100644 --- a/catalystwan/api/versions_utils.py +++ b/catalystwan/api/versions_utils.py @@ -162,7 +162,7 @@ def get_remote_image( ): if not (image_details.remote_server_id and image_details.version_id): raise ValueError( - f"Requested image: '{image_name}' does not include include required fields for this operation:" + f"Requested image: '{image_name}' does not include include required fields for this operation: " f"image_details.remote_server_id - (current value: {image_details.remote_server_id})" f"image_details.version_id - (current value: {image_details.version_id})" ) @@ -221,9 +221,9 @@ def _validate_devices_required_fields(self, devices: DataSequence[DeviceDetailsR for device in devices: if not device.uuid or not device.local_system_ip: raise ValueError( - f"Provided device '{device.host_name}' doesn't include required fields for this operation:" + f"Provided device '{device.host_name}' doesn't include required fields for this operation: " f"device.uuid (current value: {device.uuid})" - f"device.device_ip (current value: {device.device_ip})" + f"device.local_system_ip (current value: {device.local_system_ip})" ) def get_lxcactivate_device_list( @@ -409,5 +409,6 @@ def get_device_list(self, devices: DataSequence[DeviceDetailsResponse]) -> List[ self._validate_devices_required_fields(devices) return [ - PartitionDevice(device_id=device.uuid, device_ip=device.device_ip) for device in devices # type: ignore + PartitionDevice(device_id=device.uuid, device_ip=device.local_system_ip) # type: ignore + for device in devices ] diff --git a/pyproject.toml b/pyproject.toml index 4b541131..61006fd0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "catalystwan" -version = "0.35.4dev7" +version = "0.35.5dev0" description = "Cisco Catalyst WAN SDK for Python" authors = ["kagorski "] readme = "README.md"