From eba6da485d29d49bacc37ce7b8b284cee4b60fa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20S=C3=B8rensen?= Date: Mon, 4 Oct 2021 22:46:28 +0200 Subject: [PATCH] Rename disk_data to data_disk (#3200) --- supervisor/api/const.py | 2 +- supervisor/api/os.py | 4 ++-- tests/api/test_os.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/supervisor/api/const.py b/supervisor/api/const.py index 5a59a8d53..0e4b3bdaa 100644 --- a/supervisor/api/const.py +++ b/supervisor/api/const.py @@ -2,8 +2,8 @@ ATTR_AGENT_VERSION = "agent_version" ATTR_BOOT_TIMESTAMP = "boot_timestamp" +ATTR_DATA_DISK = "data_disk" ATTR_DEVICE = "device" -ATTR_DISK_DATA = "disk_data" ATTR_DT_SYNCHRONIZED = "dt_synchronized" ATTR_DT_UTC = "dt_utc" ATTR_STARTUP_TIME = "startup_time" diff --git a/supervisor/api/os.py b/supervisor/api/os.py index 8ba8d193d..e5fdf8788 100644 --- a/supervisor/api/os.py +++ b/supervisor/api/os.py @@ -17,7 +17,7 @@ from ..const import ( ) from ..coresys import CoreSysAttributes from ..validate import version_tag -from .const import ATTR_DEVICE, ATTR_DISK_DATA +from .const import ATTR_DATA_DISK, ATTR_DEVICE from .utils import api_process, api_validate _LOGGER: logging.Logger = logging.getLogger(__name__) @@ -38,7 +38,7 @@ class APIOS(CoreSysAttributes): ATTR_UPDATE_AVAILABLE: self.sys_os.need_update, ATTR_BOARD: self.sys_os.board, ATTR_BOOT: self.sys_dbus.rauc.boot_slot, - ATTR_DISK_DATA: self.sys_os.datadisk.disk_used, + ATTR_DATA_DISK: self.sys_os.datadisk.disk_used, } @api_process diff --git a/tests/api/test_os.py b/tests/api/test_os.py index cacc694ac..a470195e5 100644 --- a/tests/api/test_os.py +++ b/tests/api/test_os.py @@ -21,7 +21,7 @@ async def test_api_os_info(api_client): "update_available", "board", "boot", - "disk_data", + "data_disk", ): assert attr in result["data"] @@ -35,7 +35,7 @@ async def test_api_os_info_with_agent(api_client, coresys: CoreSys): resp = await api_client.get("/os/info") result = await resp.json() - assert result["data"]["disk_data"] == "/dev/sda" + assert result["data"]["data_disk"] == "/dev/sda" @pytest.mark.asyncio