Skip to content

Commit b7dfd16

Browse files
sandereggsanderegg
committed
fixing tests
1 parent af45b9a commit b7dfd16

File tree

4 files changed

+37
-35
lines changed

4 files changed

+37
-35
lines changed

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
from models_library.basic_types import PortInt
77
from models_library.boot_options import BootOption, EnvVarKey
8-
from models_library.docker import _SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX
8+
from models_library.docker import to_simcore_runtime_docker_label_key
99
from models_library.service_settings_labels import (
1010
ComposeSpecLabelDict,
1111
SimcoreServiceLabels,
@@ -157,23 +157,25 @@ def update_service_params_from_settings(
157157
container_spec = create_service_params["task_template"]["ContainerSpec"]
158158
# set labels for CPU and Memory limits, for both service and container labels
159159
# NOTE: cpu-limit is a float not NanoCPUs!!
160-
container_spec["Labels"][f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}cpu-limit"] = str(
160+
container_spec["Labels"][
161+
f"{to_simcore_runtime_docker_label_key('cpu-limit')}"
162+
] = str(
161163
float(create_service_params["task_template"]["Resources"]["Limits"]["NanoCPUs"])
162164
/ (1 * 10**9)
163165
)
164166
create_service_params["labels"][
165-
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}cpu-limit"
167+
f"{to_simcore_runtime_docker_label_key('cpu-limit')}"
166168
] = str(
167169
float(create_service_params["task_template"]["Resources"]["Limits"]["NanoCPUs"])
168170
/ (1 * 10**9)
169171
)
170172
container_spec["Labels"][
171-
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}memory-limit"
173+
f"{to_simcore_runtime_docker_label_key('memory-limit')}"
172174
] = str(
173175
create_service_params["task_template"]["Resources"]["Limits"]["MemoryBytes"]
174176
)
175177
create_service_params["labels"][
176-
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}memory-limit"
178+
f"{to_simcore_runtime_docker_label_key('memory-limit')}"
177179
] = str(
178180
create_service_params["task_template"]["Resources"]["Limits"]["MemoryBytes"]
179181
)

‎services/director-v2/tests/unit/test_modules_dask_client.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
from fastapi.applications import FastAPI
4646
from models_library.api_schemas_storage import LinkType
4747
from models_library.clusters import ClusterID, NoAuthentication, SimpleAuthentication
48-
from models_library.docker import _SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX
48+
from models_library.docker import to_simcore_runtime_docker_label_key
4949
from models_library.projects import ProjectID
5050
from models_library.projects_nodes_io import NodeID
5151
from models_library.projects_state import RunningState
@@ -546,14 +546,14 @@ def fake_sidecar_fct(
546546
expected_envs={},
547547
expected_labels=task_labels
548548
| {
549-
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}user-id": f"{user_id}",
550-
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}project-id": f"{project_id}",
551-
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}node-id": f"{node_id}",
552-
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}cpu-limit": f"{image_params.fake_tasks[node_id].node_requirements.cpu}",
553-
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}memory-limit": f"{image_params.fake_tasks[node_id].node_requirements.ram}",
554-
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}product-name": f"{comp_run_metadata['product_name']}",
555-
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}simcore-user-agent": f"{comp_run_metadata['simcore_user_agent']}",
556-
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}swarm-stack-name": "undefined-label",
549+
f"{to_simcore_runtime_docker_label_key('user-id')}": f"{user_id}",
550+
f"{to_simcore_runtime_docker_label_key('project-id')}": f"{project_id}",
551+
f"{to_simcore_runtime_docker_label_key('node-id')}": f"{node_id}",
552+
f"{to_simcore_runtime_docker_label_key('cpu-limit')}": f"{image_params.fake_tasks[node_id].node_requirements.cpu}",
553+
f"{to_simcore_runtime_docker_label_key('memory-limit')}": f"{image_params.fake_tasks[node_id].node_requirements.ram}",
554+
f"{to_simcore_runtime_docker_label_key('product-name')}": f"{comp_run_metadata['product_name']}",
555+
f"{to_simcore_runtime_docker_label_key('simcore-user-agent')}": f"{comp_run_metadata['simcore_user_agent']}",
556+
f"{to_simcore_runtime_docker_label_key('swarm-stack-name')}": "undefined-label",
557557
}, # type: ignore
558558
),
559559
metadata=comp_run_metadata,

‎services/director-v2/tests/unit/test_modules_dynamic_sidecar_docker_compose_specs.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import pytest
1010
import yaml
11-
from models_library.docker import _SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX
11+
from models_library.docker import to_simcore_runtime_docker_label_key
1212
from models_library.projects import ProjectID
1313
from models_library.projects_nodes_io import NodeID
1414
from models_library.service_settings_labels import (
@@ -221,14 +221,14 @@ def test_regression_service_has_no_reservations():
221221

222222
EXPECTED_LABELS: list[str] = sorted(
223223
[
224-
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}product-name={PRODUCT_NAME}",
225-
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}simcore-user-agent={SIMCORE_USER_AGENT}",
226-
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}project-id={PROJECT_ID}",
227-
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}user-id={USER_ID}",
228-
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}node-id={NODE_ID}",
229-
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}swarm-stack-name={SWARM_STACK_NAME}",
230-
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}cpu-limit=0",
231-
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}memory-limit=0",
224+
f"{to_simcore_runtime_docker_label_key('product-name')}={PRODUCT_NAME}",
225+
f"{to_simcore_runtime_docker_label_key('simcore-user-agent')}={SIMCORE_USER_AGENT}",
226+
f"{to_simcore_runtime_docker_label_key('project-id')}={PROJECT_ID}",
227+
f"{to_simcore_runtime_docker_label_key('user-id')}={USER_ID}",
228+
f"{to_simcore_runtime_docker_label_key('node-id')}={NODE_ID}",
229+
f"{to_simcore_runtime_docker_label_key('swarm-stack-name')}={SWARM_STACK_NAME}",
230+
f"{to_simcore_runtime_docker_label_key('cpu-limit')}=0",
231+
f"{to_simcore_runtime_docker_label_key('memory-limit')}=0",
232232
]
233233
)
234234

‎services/director-v2/tests/unit/with_dbs/test_utils_dask.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
from fastapi import FastAPI
3131
from models_library.api_schemas_storage import FileUploadLinks, FileUploadSchema
3232
from models_library.clusters import ClusterID
33-
from models_library.docker import _SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX
33+
from models_library.docker import to_simcore_runtime_docker_label_key
3434
from models_library.projects import ProjectID
3535
from models_library.projects_nodes_io import NodeID, SimCoreFileLink, SimcoreS3FileID
3636
from models_library.users import UserID
@@ -566,18 +566,18 @@ async def test_check_if_cluster_is_able_to_run_pipeline(
566566
(
567567
{},
568568
{
569-
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}product-name": _UNDEFINED_METADATA,
570-
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}simcore-user-agent": _UNDEFINED_METADATA,
569+
f"{to_simcore_runtime_docker_label_key('product-name')}": _UNDEFINED_METADATA,
570+
f"{to_simcore_runtime_docker_label_key('simcore-user-agent')}": _UNDEFINED_METADATA,
571571
},
572572
),
573573
(
574574
{
575-
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}product-name": "the awesome osparc",
575+
f"{to_simcore_runtime_docker_label_key('product-name')}": "the awesome osparc",
576576
"some-crazy-additional-label": "with awesome value",
577577
},
578578
{
579-
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}product-name": "the awesome osparc",
580-
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}simcore-user-agent": _UNDEFINED_METADATA,
579+
f"{to_simcore_runtime_docker_label_key('product-name')}": "the awesome osparc",
580+
f"{to_simcore_runtime_docker_label_key('simcore-user-agent')}": _UNDEFINED_METADATA,
581581
"some-crazy-additional-label": "with awesome value",
582582
},
583583
),
@@ -604,12 +604,12 @@ async def test_compute_task_labels(
604604
node_requirements=sleeper_task.image.node_requirements,
605605
)
606606
expected_task_labels = {
607-
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}user-id": f"{user_id}",
608-
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}project-id": f"{project_id}",
609-
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}node-id": f"{node_id}",
610-
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}swarm-stack-name": f"{_UNDEFINED_METADATA}",
611-
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}cpu-limit": f"{sleeper_task.image.node_requirements.cpu}",
612-
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}memory-limit": f"{sleeper_task.image.node_requirements.ram}",
607+
f"{to_simcore_runtime_docker_label_key('user-id')}": f"{user_id}",
608+
f"{to_simcore_runtime_docker_label_key('project-id')}": f"{project_id}",
609+
f"{to_simcore_runtime_docker_label_key('node-id')}": f"{node_id}",
610+
f"{to_simcore_runtime_docker_label_key('swarm-stack-name')}": f"{_UNDEFINED_METADATA}",
611+
f"{to_simcore_runtime_docker_label_key('cpu-limit')}": f"{sleeper_task.image.node_requirements.cpu}",
612+
f"{to_simcore_runtime_docker_label_key('memory-limit')}": f"{sleeper_task.image.node_requirements.ram}",
613613
} | expected_additional_task_labels
614614
assert task_labels == expected_task_labels
615615

0 commit comments

Comments
 (0)