Update workflows

Author: smialy

packages/catalystwan-workflows/pyproject.toml

@@ -1,8 +1,8 @@
 [project]
 name = "catalystwan_workflows"
-version = "0.0.1"
+version = "0.0.2"
 description = "Workflows for Cisco Catalyst WAN SDK for Python"
 requires-python = ">= 3.8"
 dependencies = [
-    "catalystwan-core== 2.0.0a0",
+    "catalystwan-core== 2.0.0a1",
 ]

packages/catalystwan-workflows/src/catalystwan/workflows/admin_tech_workflow.py

@@ -71,7 +71,7 @@ def bulk_collect(
         if device_ips is None:
             device_ips = []
 
-        for device in self.client.device.list_all_devices(
+        for device in self.client.device.get(
             site_id=str(site_id) if site_id else None
         ):
             if device.device_id in device_ips or not device_ips:
@@ -131,7 +131,7 @@ def generate(
             tech_filter=tech_filter,
         )
         logger.info(f"Generating admin-tech for device: {device_ip} ...")
-        response = self.client.device.tools.admintech.create_admin_tech(payload)
+        response = self.client.device.tools.admintech.post(payload)
         filename = ""
         if isinstance(response, Mapping):
             filename = response.get("fileName", "")
@@ -141,7 +141,7 @@ def generate(
     def download(self, filename: str, download_dir: Path = Path.cwd()) -> Path:
         download_path = download_dir / filename
         logger.info(f"Downloading admin-tech to: {download_path} ...")
-        bytes = self.client.device.tools.admintech.download.download_admin_tech_file(
+        bytes = self.client.device.tools.admintech.download.get(
             filename=filename, timeout=(4.0, None)
         )
         with open(download_path, "wb") as file:
@@ -150,7 +150,7 @@ def download(self, filename: str, download_dir: Path = Path.cwd()) -> Path:
         return download_path
 
     def list(self) -> List[Info]:
-        response = self.client.device.tools.admintechs.list_admin_techs()
+        response = self.client.device.tools.admintechs.get()
         return [Info(**asdict(r)) for r in response]
 
     def wait_for_generated_token_ids(self) -> None:

packages/catalystwan-workflows/src/catalystwan/workflows/alarms_workflow.py

@@ -30,9 +30,9 @@ def query(self) -> Type[QuerySpec]:
 
     def get(self, query: Optional[QuerySpec] = None):
         if self.client.api_version in ["20.15", "20.16"]:
-            endpoint = self.client.alarms.post_raw_alarm_data
+            endpoint = self.client.alarms.post
         else:
-            endpoint = self.client.alarms.get_raw_alarm_data
+            endpoint = self.client.alarms.get
 
         payload = Query(query=query)
         response = endpoint(payload=serialize(payload, to_json=True))
@@ -53,7 +53,7 @@ def get_alarms(self, from_time: Optional[int] = None, active: bool = True):
                 value=[str(from_time)],
                 operator="last_n_hours",
             )
-        return self.get(query_spec=query_spec)
+        return self.get(query=query_spec)
 
     @overload
     def clear(self, uuid: Optional[UUID]) -> List[ClearedAlarm]: ...
@@ -77,7 +77,7 @@ def clear(
         cleared_alarms: List[ClearedAlarm] = []
         for id in ids:
             if self.client.api_version in ["20.15", "20.16"]:
-                response = api.clear_stale_alarm(payload={"alarm_uuid": str(id)})
+                response = api.post(payload={"alarm_uuid": str(id)})
                 cleared_alarms.append(
                     ClearedAlarm(
                         alarm_uuid=response.get("alarm_uuid"),
@@ -86,7 +86,7 @@ def clear(
                 )
             else:
                 payload_model = api.m.AlarmsClearBody
-                response = api.clear_stale_alarm(payload=payload_model(alarm_uuid=str(id)))
+                response = api.post(payload=payload_model(alarm_uuid=str(id)))
                 cleared_alarms.append(
                     ClearedAlarm(alarm_uuid=response[0].alarm_uuid, cleared=response[0].cleared)
                 )

packages/catalystwan-workflows/src/catalystwan/workflows/device_workflow.py

@@ -50,13 +50,13 @@ def __init__(self, client: ApiClient):
 
     def get_devices_info(self, rediscover: bool = False) -> List[Device]:
         if rediscover:
-            self.client.device.action.rediscoverall.re_discover_all_device()
+            self.client.device.action.rediscoverall.post()
 
-        devices = self.client.device.list_all_devices()
+        devices = self.client.device.get()
         device_ids = [device.device_id for device in devices]
         devices_info: List[Device] = []
         for i in range(0, len(device_ids), self.PARAMS_LIMIT):
-            response = self.client.device.system.info.create_device_info_list(
+            response = self.client.device.system.info.get(
                 device_id=device_ids[i : i + self.PARAMS_LIMIT]
             )
             devices_info.extend([deserialize(Device, **data) for data in response])