drafts tests

Author: pcrespov

services/catalog/tests/unit/conftest.py

@@ -407,8 +407,10 @@ def mocked_director_rest_api_base(
 
 @pytest.fixture
 def get_mocked_service_labels() -> Callable[[str, str], dict]:
-    def _(service_key: str, service_version: str) -> dict:
-        return {
+    def _(
+        service_key: str, service_version: str, *, include_org_labels: bool = True
+    ) -> dict:
+        base_labels = {
             "io.simcore.authors": '{"authors": [{"name": "John Smith", "email": "[email protected]", "affiliation": "ACME\'IS Foundation"}]}',
             "io.simcore.contact": '{"contact": "[email protected]"}',
             "io.simcore.description": '{"description": "Autonomous Nervous System Network model"}',
@@ -423,14 +425,22 @@ def _(service_key: str, service_version: str) -> dict:
                 "xxxxx", service_version
             ),
             "maintainer": "johnsmith",
-            "org.label-schema.build-date": "2023-04-17T08:04:15Z",
-            "org.label-schema.schema-version": "1.0",
-            "org.label-schema.vcs-ref": "4d79449a2e79f8a3b3b2e1dd0290af9f3d1a8792",
-            "org.label-schema.vcs-url": "https://github.com/ITISFoundation/jupyter-math.git",
             "simcore.service.restart-policy": "no-restart",
             "simcore.service.settings": '[{"name": "Resources", "type": "Resources", "value": {"Limits": {"NanoCPUs": 1000000000, "MemoryBytes": 4194304}, "Reservations": {"NanoCPUs": 4000000000, "MemoryBytes": 2147483648}}}]',
         }
 
+        if include_org_labels:
+            base_labels.update(
+                {
+                    "org.label-schema.build-date": "2023-04-17T08:04:15Z",
+                    "org.label-schema.schema-version": "1.0",
+                    "org.label-schema.vcs-ref": "4d79449a2e79f8a3b3b2e1dd0290af9f3d1a8792",
+                    "org.label-schema.vcs-url": "https://github.com/ITISFoundation/jupyter-math.git",
+                }
+            )
+
+        return base_labels
+
     return _
 
 

services/catalog/tests/unit/test_clients_director.py

@@ -7,8 +7,10 @@
 
 
 import urllib.parse
+from collections.abc import Callable
 from typing import Any
 
+import httpx
 import pytest
 from fastapi import FastAPI
 from models_library.services_metadata_published import ServiceMetaDataPublished
@@ -57,7 +59,6 @@ async def test_director_client_high_level_api(
         await director_api.get_service(expected_service.key, expected_service.version)
         == expected_service
     )
-    # TODO: error handling!
 
 
 async def test_director_client_low_level_api(
@@ -84,3 +85,78 @@ async def test_director_client_low_level_api(
         f"/services/{urllib.parse.quote_plus(key)}/{version}"
     )
     assert service
+
+
+async def test_director_client_get_service_extras_with_org_labels(
+    repository_lifespan_disabled: None,
+    background_task_lifespan_disabled: None,
+    rabbitmq_and_rpc_setup_disabled: None,
+    mocked_director_rest_api: MockRouter,
+    expected_director_rest_api_list_services: list[dict[str, Any]],
+    app: FastAPI,
+):
+    director_api = get_director_client(app)
+
+    expected_service = expected_director_rest_api_list_services[0]
+    key = expected_service["key"]
+    version = expected_service["version"]
+
+    service_extras = await director_api.get_service_extras(key, version)
+
+    # Check node requirements are present
+    assert service_extras.node_requirements is not None
+    assert service_extras.node_requirements.cpu > 0
+    assert service_extras.node_requirements.ram > 0
+
+    # Check service build details are present (since we have org.label-schema labels)
+    assert service_extras.service_build_details is not None
+    assert service_extras.service_build_details.build_date == "2023-04-17T08:04:15Z"
+    assert (
+        service_extras.service_build_details.vcs_ref
+        == "4d79449a2e79f8a3b3b2e1dd0290af9f3d1a8792"
+    )
+    assert (
+        service_extras.service_build_details.vcs_url
+        == "https://github.com/ITISFoundation/jupyter-math.git"
+    )
+
+
+async def test_director_client_get_service_extras_without_org_labels(
+    repository_lifespan_disabled: None,
+    background_task_lifespan_disabled: None,
+    rabbitmq_and_rpc_setup_disabled: None,
+    mocked_director_rest_api_base: MockRouter,
+    expected_director_rest_api_list_services: list[dict[str, Any]],
+    get_mocked_service_labels: Callable[[str, str, bool], dict],
+    app: FastAPI,
+):
+    # Setup mock without org.label-schema labels
+    expected_service = expected_director_rest_api_list_services[0]
+    service_key = expected_service["key"]
+    service_version = expected_service["version"]
+
+    # Mock the labels endpoint without org labels
+    @mocked_director_rest_api_base.get(
+        path__regex=r"^/services/(?P<service_key>[/\w-]+)/(?P<service_version>[0-9\.]+)/labels$",
+        name="get_service_labels_no_org",
+    )
+    def _get_service_labels_no_org(request, service_key, service_version):
+        return httpx.Response(
+            status_code=200,
+            json={
+                "data": get_mocked_service_labels(
+                    service_key, service_version, include_org_labels=False
+                )
+            },
+        )
+
+    director_api = get_director_client(app)
+    service_extras = await director_api.get_service_extras(service_key, service_version)
+
+    # Check node requirements are present
+    assert service_extras.node_requirements is not None
+    assert service_extras.node_requirements.cpu > 0
+    assert service_extras.node_requirements.ram > 0
+
+    # Check service build details are NOT present (since we don't have org.label-schema labels)
+    assert service_extras.service_build_details is None