rename

ITISFoundation · Nov 25, 2024 · a3e5bda · a3e5bda
1 parent 820414e
commit a3e5bda
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/...ore_service_director_v2/modules/dynamic_sidecar/scheduler/_core/_event_create_sidecars.py b/...ore_service_director_v2/modules/dynamic_sidecar/scheduler/_core/_event_create_sidecars.py
@@ -67,7 +67,7 @@
 )
 
 
-def _get_dynamic_sidecar_service_final_spec(
+def _merge_service_base_and_user_specs(
     dynamic_sidecar_service_spec_base: AioDockerServiceSpec,
     user_specific_service_spec: AioDockerServiceSpec,
 ) -> AioDockerServiceSpec:
@@ -264,7 +264,7 @@ async def action(cls, app: FastAPI, scheduler_data: SchedulerData) -> None:
         user_specific_service_spec = AioDockerServiceSpec.model_validate(
             user_specific_service_spec
         )
-        dynamic_sidecar_service_final_spec = _get_dynamic_sidecar_service_final_spec(
+        dynamic_sidecar_service_final_spec = _merge_service_base_and_user_specs(
             dynamic_sidecar_service_spec_base, user_specific_service_spec
         )
         rabbit_message = ProgressRabbitMessageNode.model_construct(

diff --git a/...ices/director-v2/tests/unit/with_dbs/test_modules_dynamic_sidecar_docker_service_specs.py b/...ices/director-v2/tests/unit/with_dbs/test_modules_dynamic_sidecar_docker_service_specs.py
@@ -45,7 +45,7 @@
 )
 from simcore_service_director_v2.modules.dynamic_sidecar.scheduler._core._event_create_sidecars import (
     _DYNAMIC_SIDECAR_SERVICE_EXTENDABLE_SPECS,
-    _get_dynamic_sidecar_service_final_spec,
+    _merge_service_base_and_user_specs,
 )
 from simcore_service_director_v2.utils.dict_utils import nested_update
 
@@ -623,7 +623,7 @@ async def test_merge_dynamic_sidecar_specs_with_user_specific_specs(
     assert another_merged_dict
 
 
-def test_regression__get_dynamic_sidecar_service_final_spec():
+def test_regression__merge_service_base_and_user_specs():
     mock_service_spec = AioDockerServiceSpec.model_validate(
         {"Labels": {"l1": "false", "l0": "a"}}
     )
@@ -656,7 +656,7 @@ def test_regression__get_dynamic_sidecar_service_final_spec():
             },
         }
     )
-    result = _get_dynamic_sidecar_service_final_spec(
+    result = _merge_service_base_and_user_specs(
         mock_service_spec, mock_catalog_constraints
     )
     assert result.model_dump(by_alias=True, exclude_unset=True) == {