Remove devices from list data disk API

Author: mdegat01

aiohasupervisor/models/__init__.py

@@ -36,7 +36,6 @@
     BootSlot,
     BootSlotName,
     DataDisk,
-    DataDiskList,
     GreenInfo,
     GreenOptions,
     MigrateDataOptions,
@@ -134,7 +133,6 @@
     "OSUpdate",
     "MigrateDataOptions",
     "DataDisk",
-    "DataDiskList",
     "SetBootSlotOptions",
     "GreenInfo",
     "GreenOptions",

aiohasupervisor/models/os.py

@@ -78,9 +78,8 @@ class DataDisk(ResponseData):
 
 @dataclass(frozen=True, slots=True)
 class DataDiskList(ResponseData):
-    """ListDataDisks model."""
+    """DataDiskList model."""
 
-    devices: list[str]
     disks: list[DataDisk]
 
 

aiohasupervisor/os.py

@@ -2,6 +2,7 @@
 
 from .client import _SupervisorComponentClient
 from .models.os import (
+    DataDisk,
     DataDiskList,
     GreenInfo,
     GreenOptions,
@@ -36,10 +37,10 @@ async def migrate_data(self, options: MigrateDataOptions) -> None:
         """Migrate data to new data disk and reboot."""
         await self._client.post("os/datadisk/move", json=options.to_dict())
 
-    async def list_data_disks(self) -> DataDiskList:
+    async def list_data_disks(self) -> list[DataDisk]:
         """Get all data disks."""
         result = await self._client.get("os/datadisk/list")
-        return DataDiskList.from_dict(result.data)
+        return DataDiskList.from_dict(result.data).disks
 
     async def wipe_data(self) -> None:
         """Trigger data disk wipe on host and reboot."""

tests/test_os.py

@@ -81,12 +81,11 @@ async def test_os_list_data_disks(
         body=load_fixture("os_datadisk_list.json"),
     )
     datadisks = await supervisor_client.os.list_data_disks()
-    assert datadisks.devices == ["SSK-SSK-Storage-DF123"]
-    assert datadisks.disks[0].vendor == "SSK"
-    assert datadisks.disks[0].model == "SSK Storage"
-    assert datadisks.disks[0].serial == "DF123"
-    assert datadisks.disks[0].name == "SSK SSK Storage (DF123)"
-    assert datadisks.disks[0].dev_path == PurePath("/dev/sda")
+    assert datadisks[0].vendor == "SSK"
+    assert datadisks[0].model == "SSK Storage"
+    assert datadisks[0].serial == "DF123"
+    assert datadisks[0].name == "SSK SSK Storage (DF123)"
+    assert datadisks[0].dev_path == PurePath("/dev/sda")
 
 
 async def test_os_wipe_data(