From 2841cd200243b5be4557297fa017ef772ee1729e Mon Sep 17 00:00:00 2001 From: Olivier Gayot Date: Fri, 26 Apr 2024 21:23:30 +0200 Subject: [PATCH] storage: replace use of v1 POST reset by v2 POST reset Signed-off-by: Olivier Gayot --- subiquity/client/controllers/filesystem.py | 6 +++++- subiquity/server/controllers/filesystem.py | 6 ++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/subiquity/client/controllers/filesystem.py b/subiquity/client/controllers/filesystem.py index 28807f52..d11c5010 100644 --- a/subiquity/client/controllers/filesystem.py +++ b/subiquity/client/controllers/filesystem.py @@ -301,7 +301,11 @@ class FilesystemController(SubiquityTuiController, FilesystemManipulator): run_bg_task(reset_and_redraw()) async def _reset(self, refresh_view: bool) -> None: - status = await self.endpoint.reset.POST() + async def v2_reset_with_v1_response() -> StorageResponse: + await self.endpoint.v2.reset.POST() + return await self.endpoint.GET() + + status = await v2_reset_with_v1_response() self.app.ui.block_input = False self.model.load_server_data(status) if refresh_view: diff --git a/subiquity/server/controllers/filesystem.py b/subiquity/server/controllers/filesystem.py index e76ce409..5df64453 100644 --- a/subiquity/server/controllers/filesystem.py +++ b/subiquity/server/controllers/filesystem.py @@ -1004,10 +1004,8 @@ class FilesystemController(SubiquityController, FilesystemManipulator): await self.configured() return self._done_response() - async def reset_POST(self, context, request) -> StorageResponse: - log.info("Resetting Filesystem model") - self.model.reset() - return await self.GET(context) + async def reset_POST(self) -> StorageResponse: + raise NotImplementedError async def has_rst_GET(self) -> bool: search = "/sys/module/ahci/drivers/pci:ahci/*/remapped_nvme"