refactor

Author: Andrei Neagu

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

@@ -0,0 +1,6 @@
+from models_library.projects_nodes_io import NodeID
+from models_library.rabbitmq_basic_types import RPCNamespace
+
+
+def get_rpc_namespace(node_id: NodeID) -> RPCNamespace:
+    return RPCNamespace.from_entries({"service": "dy-sidecar", "node_id": f"{node_id}"})

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

@@ -1,11 +1,12 @@
 import logging
 
 from models_library.projects_nodes_io import NodeID
-from models_library.rabbitmq_basic_types import RPCMethodName, RPCNamespace
+from models_library.rabbitmq_basic_types import RPCMethodName
 from pydantic import TypeAdapter
 
 from ....logging_utils import log_decorator
 from ... import RabbitMQRPCClient
+from ._utils import get_rpc_namespace
 
 _logger = logging.getLogger(__name__)
 
@@ -16,9 +17,7 @@ async def free_reserved_disk_space(
     *,
     node_id: NodeID,
 ) -> None:
-    rpc_namespace = RPCNamespace.from_entries(
-        {"service": "dy-sidecar", "node_id": f"{node_id}"}
-    )
+    rpc_namespace = get_rpc_namespace(node_id)
     result = await rabbitmq_rpc_client.request(
         rpc_namespace,
         TypeAdapter(RPCMethodName).validate_python("free_reserved_disk_space"),

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

@@ -2,11 +2,12 @@
 
 from models_library.api_schemas_dynamic_sidecar.telemetry import DiskUsage
 from models_library.projects_nodes_io import NodeID
-from models_library.rabbitmq_basic_types import RPCMethodName, RPCNamespace
+from models_library.rabbitmq_basic_types import RPCMethodName
 from pydantic import TypeAdapter
 
 from ....logging_utils import log_decorator
 from ... import RabbitMQRPCClient
+from ._utils import get_rpc_namespace
 
 _logger = logging.getLogger(__name__)
 
@@ -18,9 +19,7 @@ async def update_disk_usage(
     node_id: NodeID,
     usage: dict[str, DiskUsage],
 ) -> None:
-    rpc_namespace = RPCNamespace.from_entries(
-        {"service": "dy-sidecar", "node_id": f"{node_id}"}
-    )
+    rpc_namespace = get_rpc_namespace(node_id)
     result = await rabbitmq_rpc_client.request(
         rpc_namespace,
         TypeAdapter(RPCMethodName).validate_python("update_disk_usage"),

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

@@ -1,12 +1,13 @@
 import logging
 
 from models_library.projects_nodes_io import NodeID
-from models_library.rabbitmq_basic_types import RPCMethodName, RPCNamespace
+from models_library.rabbitmq_basic_types import RPCMethodName
 from models_library.sidecar_volumes import VolumeCategory, VolumeStatus
 from pydantic import TypeAdapter
 
 from ....logging_utils import log_decorator
 from ... import RabbitMQRPCClient
+from ._utils import get_rpc_namespace
 
 _logger = logging.getLogger(__name__)
 
@@ -19,9 +20,7 @@ async def save_volume_state(
     status: VolumeStatus,
     category: VolumeCategory,
 ) -> None:
-    rpc_namespace = RPCNamespace.from_entries(
-        {"service": "dy-sidecar", "node_id": f"{node_id}"}
-    )
+    rpc_namespace = get_rpc_namespace(node_id)
     result = await rabbitmq_rpc_client.request(
         rpc_namespace,
         TypeAdapter(RPCMethodName).validate_python("save_volume_state"),