Merge branch 'master' into bugfix/dy-sidecar/upload_subfolder

Author: odeimaiz

services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/docker_service_specs/sidecar.py

@@ -88,7 +88,6 @@ def _get_environment_variables(
 def get_dynamic_sidecar_spec(
     scheduler_data: SchedulerData,
     dynamic_sidecar_settings: DynamicSidecarSettings,
-    dynamic_sidecar_network_id: str,
     swarm_network_id: str,
     settings: SimcoreServiceSettingsLabel,
     app_settings: AppSettings,
@@ -234,10 +233,7 @@ def get_dynamic_sidecar_spec(
             "service_image": dynamic_sidecar_settings.DYNAMIC_SIDECAR_IMAGE,
         },
         "name": scheduler_data.service_name,
-        "networks": [
-            {"Target": swarm_network_id},
-            {"Target": dynamic_sidecar_network_id},
-        ],
+        "networks": [{"Target": swarm_network_id}],
         "task_template": {
             "ContainerSpec": {
                 "Env": _get_environment_variables(

services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/scheduler/events.py

@@ -157,7 +157,6 @@ async def action(cls, app: FastAPI, scheduler_data: SchedulerData) -> None:
             get_dynamic_sidecar_spec(
                 scheduler_data=scheduler_data,
                 dynamic_sidecar_settings=dynamic_sidecar_settings,
-                dynamic_sidecar_network_id=dynamic_sidecar_network_id,
                 swarm_network_id=swarm_network_id,
                 settings=settings,
                 app_settings=app.state.settings,

services/director-v2/tests/unit/test_api_route_dynamic_scheduler.py

@@ -6,12 +6,12 @@
 from typing import AsyncIterator
 
 import pytest
-from requests import Response
 import respx
 from fastapi import status
 from pytest import MonkeyPatch
 from pytest_mock.plugin import MockerFixture
 from pytest_simcore.helpers.typing_env import EnvVarsDict
+from requests import Response
 from simcore_service_director_v2.models.schemas.dynamic_services.scheduler import (
     SchedulerData,
 )

services/director-v2/tests/unit/with_dbs/test_modules_dynamic_sidecar_docker_service_specs.py

@@ -72,11 +72,6 @@ def dynamic_sidecar_settings(mock_env: dict[str, str]) -> DynamicSidecarSettings
     return DynamicSidecarSettings.create_from_envs()
 
 
-@pytest.fixture
-def dynamic_sidecar_network_id() -> str:
-    return "mocked_dynamic_sidecar_network_id"
-
-
 @pytest.fixture
 def swarm_network_id() -> str:
     return "mocked_swarm_network_id"
@@ -169,10 +164,7 @@ def expected_dynamic_sidecar_spec(run_id: RunID) -> dict[str, Any]:
             "uuid": "75c7f3f4-18f9-4678-8610-54a2ade78eaa",
         },
         "name": "dy-sidecar_75c7f3f4-18f9-4678-8610-54a2ade78eaa",
-        "networks": [
-            {"Target": "mocked_swarm_network_id"},
-            {"Target": "mocked_dynamic_sidecar_network_id"},
-        ],
+        "networks": [{"Target": "mocked_swarm_network_id"}],
         "task_template": {
             "ContainerSpec": {
                 "Env": {
@@ -343,7 +335,6 @@ def test_get_dynamic_proxy_spec(
     minimal_app: FastAPI,
     scheduler_data: SchedulerData,
     dynamic_sidecar_settings: DynamicSidecarSettings,
-    dynamic_sidecar_network_id: str,
     swarm_network_id: str,
     simcore_service_labels: SimcoreServiceLabels,
     expected_dynamic_sidecar_spec: dict[str, Any],
@@ -367,7 +358,6 @@ def test_get_dynamic_proxy_spec(
         dynamic_sidecar_spec: AioDockerServiceSpec = get_dynamic_sidecar_spec(
             scheduler_data=scheduler_data,
             dynamic_sidecar_settings=dynamic_sidecar_settings,
-            dynamic_sidecar_network_id=dynamic_sidecar_network_id,
             swarm_network_id=swarm_network_id,
             settings=cast(SimcoreServiceSettingsLabel, simcore_service_labels.settings),
             app_settings=minimal_app.state.settings,
@@ -430,7 +420,6 @@ async def test_merge_dynamic_sidecar_specs_with_user_specific_specs(
     minimal_app: FastAPI,
     scheduler_data: SchedulerData,
     dynamic_sidecar_settings: DynamicSidecarSettings,
-    dynamic_sidecar_network_id: str,
     swarm_network_id: str,
     simcore_service_labels: SimcoreServiceLabels,
     expected_dynamic_sidecar_spec: dict[str, Any],
@@ -440,7 +429,6 @@ async def test_merge_dynamic_sidecar_specs_with_user_specific_specs(
     dynamic_sidecar_spec: AioDockerServiceSpec = get_dynamic_sidecar_spec(
         scheduler_data=scheduler_data,
         dynamic_sidecar_settings=dynamic_sidecar_settings,
-        dynamic_sidecar_network_id=dynamic_sidecar_network_id,
         swarm_network_id=swarm_network_id,
         settings=cast(SimcoreServiceSettingsLabel, simcore_service_labels.settings),
         app_settings=minimal_app.state.settings,