refactored disk

Author: Andrei Neagu

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/dynamic_sidecar/disk.py

@@ -0,0 +1,26 @@
+import logging
+
+from models_library.projects_nodes_io import NodeID
+from models_library.rabbitmq_basic_types import RPCMethodName, RPCNamespace
+from pydantic import TypeAdapter
+
+from ....logging_utils import log_decorator
+from ... import RabbitMQRPCClient
+
+_logger = logging.getLogger(__name__)
+
+
+@log_decorator(_logger, level=logging.DEBUG)
+async def free_reserved_disk_space(
+    rabbitmq_rpc_client: RabbitMQRPCClient,
+    *,
+    node_id: NodeID,
+) -> None:
+    rpc_namespace = RPCNamespace.from_entries(
+        {"service": "dy-sidecar", "node_id": f"{node_id}"}
+    )
+    result = await rabbitmq_rpc_client.request(
+        rpc_namespace,
+        TypeAdapter(RPCMethodName).validate_python("free_reserved_disk_space"),
+    )
+    assert result is None  # nosec

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/api/rest/disk.py

@@ -1,6 +1,6 @@
 from fastapi import APIRouter, status
 
-from ...core.reserved_space import remove_reserved_disk_space
+from ...services import disk
 
 router = APIRouter()
 
@@ -11,4 +11,4 @@
     status_code=status.HTTP_204_NO_CONTENT,
 )
 async def free_reserved_disk_space() -> None:
-    remove_reserved_disk_space()
+    disk.remove_reserved_disk_space()

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/api/rpc/_disk.py

@@ -0,0 +1,11 @@
+from fastapi import FastAPI
+from servicelib.rabbitmq import RPCRouter
+
+from ...services import disk
+
+router = RPCRouter()
+
+
+@router.expose()
+async def free_reserved_disk_space(_: FastAPI) -> None:
+    disk.remove_reserved_disk_space()

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/api/rpc/routes.py

@@ -4,10 +4,11 @@
 
 from ...core.rabbitmq import get_rabbitmq_rpc_server
 from ...core.settings import ApplicationSettings
-from . import _disk_usage, _volumes
+from . import _disk, _disk_usage, _volumes
 
 ROUTERS: list[RPCRouter] = [
     _disk_usage.router,
+    _disk.router,
     _volumes.router,
 ]
 

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/services/disk.py

@@ -0,0 +1,5 @@
+from ..core.reserved_space import remove_reserved_disk_space
+
+__all__: tuple[str, ...] = ("remove_reserved_disk_space",)
+
+# nopycln: file

services/dynamic-sidecar/tests/unit/test_api_rest_disk.py renamed to services/dynamic-sidecar/tests/unit/api/rest/test_disk.py

@@ -0,0 +1,30 @@
+# pylint:disable=unused-argument
+
+
+from fastapi import FastAPI
+from servicelib.rabbitmq import RabbitMQRPCClient
+from servicelib.rabbitmq.rpc_interfaces.dynamic_sidecar import disk
+from simcore_service_dynamic_sidecar.core.reserved_space import (
+    _RESERVED_DISK_SPACE_NAME,
+)
+from simcore_service_dynamic_sidecar.core.settings import ApplicationSettings
+
+pytest_simcore_core_services_selection = [
+    "rabbit",
+]
+
+
+async def test_free_reserved_disk_space(
+    cleanup_reserved_disk_space: None, app: FastAPI, rpc_client: RabbitMQRPCClient
+):
+    assert _RESERVED_DISK_SPACE_NAME.exists()
+
+    settings: ApplicationSettings = app.state.settings
+
+    result = await disk.free_reserved_disk_space(
+        rpc_client,
+        node_id=settings.DY_SIDECAR_NODE_ID,
+    )
+    assert result is None
+
+    assert not _RESERVED_DISK_SPACE_NAME.exists()