Skip to content

Commit

Permalink
fixing tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@sanderegg
sanderegg committed Jul 5, 2023
1 parent ac1800c commit 5cb4fe3
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 35 deletions.
12 changes: 7 additions & 5 deletions .../src/simcore_service_director_v2/modules/dynamic_sidecar/docker_service_specs/settings.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

from models_library.basic_types import PortInt
from models_library.boot_options import BootOption, EnvVarKey
from models_library.docker import _SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX
from models_library.docker import to_simcore_runtime_docker_label_key
from models_library.service_settings_labels import (
ComposeSpecLabelDict,
SimcoreServiceLabels,
Expand Down Expand Up @@ -157,23 +157,25 @@ def update_service_params_from_settings(
container_spec = create_service_params["task_template"]["ContainerSpec"]
# set labels for CPU and Memory limits, for both service and container labels
# NOTE: cpu-limit is a float not NanoCPUs!!
container_spec["Labels"][f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}cpu-limit"] = str(
container_spec["Labels"][
f"{to_simcore_runtime_docker_label_key('cpu-limit')}"
] = str(
float(create_service_params["task_template"]["Resources"]["Limits"]["NanoCPUs"])
/ (1 * 10**9)
)
create_service_params["labels"][
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}cpu-limit"
f"{to_simcore_runtime_docker_label_key('cpu-limit')}"
] = str(
float(create_service_params["task_template"]["Resources"]["Limits"]["NanoCPUs"])
/ (1 * 10**9)
)
container_spec["Labels"][
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}memory-limit"
f"{to_simcore_runtime_docker_label_key('memory-limit')}"
] = str(
create_service_params["task_template"]["Resources"]["Limits"]["MemoryBytes"]
)
create_service_params["labels"][
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}memory-limit"
f"{to_simcore_runtime_docker_label_key('memory-limit')}"
] = str(
create_service_params["task_template"]["Resources"]["Limits"]["MemoryBytes"]
)
Expand Down
18 changes: 9 additions & 9 deletions services/director-v2/tests/unit/test_modules_dask_client.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
from fastapi.applications import FastAPI
from models_library.api_schemas_storage import LinkType
from models_library.clusters import ClusterID, NoAuthentication, SimpleAuthentication
from models_library.docker import _SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX
from models_library.docker import to_simcore_runtime_docker_label_key
from models_library.projects import ProjectID
from models_library.projects_nodes_io import NodeID
from models_library.projects_state import RunningState
Expand Down Expand Up @@ -546,14 +546,14 @@ def fake_sidecar_fct(
expected_envs={},
expected_labels=task_labels
| {
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}user-id": f"{user_id}",
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}project-id": f"{project_id}",
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}node-id": f"{node_id}",
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}cpu-limit": f"{image_params.fake_tasks[node_id].node_requirements.cpu}",
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}memory-limit": f"{image_params.fake_tasks[node_id].node_requirements.ram}",
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}product-name": f"{comp_run_metadata['product_name']}",
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}simcore-user-agent": f"{comp_run_metadata['simcore_user_agent']}",
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}swarm-stack-name": "undefined-label",
f"{to_simcore_runtime_docker_label_key('user-id')}": f"{user_id}",
f"{to_simcore_runtime_docker_label_key('project-id')}": f"{project_id}",
f"{to_simcore_runtime_docker_label_key('node-id')}": f"{node_id}",
f"{to_simcore_runtime_docker_label_key('cpu-limit')}": f"{image_params.fake_tasks[node_id].node_requirements.cpu}",
f"{to_simcore_runtime_docker_label_key('memory-limit')}": f"{image_params.fake_tasks[node_id].node_requirements.ram}",
f"{to_simcore_runtime_docker_label_key('product-name')}": f"{comp_run_metadata['product_name']}",
f"{to_simcore_runtime_docker_label_key('simcore-user-agent')}": f"{comp_run_metadata['simcore_user_agent']}",
f"{to_simcore_runtime_docker_label_key('swarm-stack-name')}": "undefined-label",
}, # type: ignore
),
metadata=comp_run_metadata,
Expand Down
18 changes: 9 additions & 9 deletions services/director-v2/tests/unit/test_modules_dynamic_sidecar_docker_compose_specs.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import pytest
import yaml
from models_library.docker import _SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX
from models_library.docker import to_simcore_runtime_docker_label_key
from models_library.projects import ProjectID
from models_library.projects_nodes_io import NodeID
from models_library.service_settings_labels import (
Expand Down Expand Up @@ -221,14 +221,14 @@ def test_regression_service_has_no_reservations():

EXPECTED_LABELS: list[str] = sorted(
[
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}product-name={PRODUCT_NAME}",
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}simcore-user-agent={SIMCORE_USER_AGENT}",
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}project-id={PROJECT_ID}",
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}user-id={USER_ID}",
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}node-id={NODE_ID}",
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}swarm-stack-name={SWARM_STACK_NAME}",
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}cpu-limit=0",
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}memory-limit=0",
f"{to_simcore_runtime_docker_label_key('product-name')}={PRODUCT_NAME}",
f"{to_simcore_runtime_docker_label_key('simcore-user-agent')}={SIMCORE_USER_AGENT}",
f"{to_simcore_runtime_docker_label_key('project-id')}={PROJECT_ID}",
f"{to_simcore_runtime_docker_label_key('user-id')}={USER_ID}",
f"{to_simcore_runtime_docker_label_key('node-id')}={NODE_ID}",
f"{to_simcore_runtime_docker_label_key('swarm-stack-name')}={SWARM_STACK_NAME}",
f"{to_simcore_runtime_docker_label_key('cpu-limit')}=0",
f"{to_simcore_runtime_docker_label_key('memory-limit')}=0",
]
)

Expand Down
24 changes: 12 additions & 12 deletions services/director-v2/tests/unit/with_dbs/test_utils_dask.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
from fastapi import FastAPI
from models_library.api_schemas_storage import FileUploadLinks, FileUploadSchema
from models_library.clusters import ClusterID
from models_library.docker import _SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX
from models_library.docker import to_simcore_runtime_docker_label_key
from models_library.projects import ProjectID
from models_library.projects_nodes_io import NodeID, SimCoreFileLink, SimcoreS3FileID
from models_library.users import UserID
Expand Down Expand Up @@ -566,18 +566,18 @@ async def test_check_if_cluster_is_able_to_run_pipeline(
(
{},
{
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}product-name": _UNDEFINED_METADATA,
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}simcore-user-agent": _UNDEFINED_METADATA,
f"{to_simcore_runtime_docker_label_key('product-name')}": _UNDEFINED_METADATA,
f"{to_simcore_runtime_docker_label_key('simcore-user-agent')}": _UNDEFINED_METADATA,
},
),
(
{
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}product-name": "the awesome osparc",
f"{to_simcore_runtime_docker_label_key('product-name')}": "the awesome osparc",
"some-crazy-additional-label": "with awesome value",
},
{
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}product-name": "the awesome osparc",
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}simcore-user-agent": _UNDEFINED_METADATA,
f"{to_simcore_runtime_docker_label_key('product-name')}": "the awesome osparc",
f"{to_simcore_runtime_docker_label_key('simcore-user-agent')}": _UNDEFINED_METADATA,
"some-crazy-additional-label": "with awesome value",
},
),
Expand All @@ -604,12 +604,12 @@ async def test_compute_task_labels(
node_requirements=sleeper_task.image.node_requirements,
)
expected_task_labels = {
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}user-id": f"{user_id}",
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}project-id": f"{project_id}",
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}node-id": f"{node_id}",
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}swarm-stack-name": f"{_UNDEFINED_METADATA}",
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}cpu-limit": f"{sleeper_task.image.node_requirements.cpu}",
f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}memory-limit": f"{sleeper_task.image.node_requirements.ram}",
f"{to_simcore_runtime_docker_label_key('user-id')}": f"{user_id}",
f"{to_simcore_runtime_docker_label_key('project-id')}": f"{project_id}",
f"{to_simcore_runtime_docker_label_key('node-id')}": f"{node_id}",
f"{to_simcore_runtime_docker_label_key('swarm-stack-name')}": f"{_UNDEFINED_METADATA}",
f"{to_simcore_runtime_docker_label_key('cpu-limit')}": f"{sleeper_task.image.node_requirements.cpu}",
f"{to_simcore_runtime_docker_label_key('memory-limit')}": f"{sleeper_task.image.node_requirements.ram}",
} | expected_additional_task_labels
assert task_labels == expected_task_labels

Expand Down

0 comments on commit 5cb4fe3

Please sign in to comment.