fix: correct Catalog names

Added catalog names as constants and included labels field in catalog definitions.
Renamed REDHATI_AI_FILTER to REDHAT_AI_FILTER and REDHATI_AI_VALIDATED_FILTER
to REDHAT_AI_VALIDATED_FILTER for consistency.

Author: fege

tests/model_registry/model_catalog/constants.py

@@ -11,23 +11,28 @@
     {"id": CUSTOM_CATALOG_ID2, "model_name": SAMPLE_MODEL_NAME2},
 ]
 
+REDHAT_AI_CATALOG_NAME: str = "Red Hat AI"
+REDHAT_AI_VALIDATED_CATALOG_NAME: str = "Red Hat AI validated"
+
 SAMPLE_MODEL_NAME3 = "mistralai/Ministral-8B-Instruct-2410"
 CATALOG_CONTAINER: str = "catalog"
 DEFAULT_CATALOGS: dict[str, Any] = {
     "redhat_ai_models": {
-        "name": "Red Hat AI models",
+        "name": REDHAT_AI_CATALOG_NAME,
         "type": "yaml",
         "properties": {"yamlCatalogPath": "/shared-data/models-catalog.yaml"},
+        "labels": [REDHAT_AI_CATALOG_NAME],
     },
     "redhat_ai_validated_models": {
-        "name": "Red Hat AI validated models",
+        "name": REDHAT_AI_VALIDATED_CATALOG_NAME,
         "type": "yaml",
         "properties": {"yamlCatalogPath": "/shared-data/validated-models-catalog.yaml"},
+        "labels": [REDHAT_AI_VALIDATED_CATALOG_NAME],
     },
 }
 REDHAT_AI_CATALOG_ID: str = next(iter(DEFAULT_CATALOGS))
 DEFAULT_CATALOG_FILE: str = DEFAULT_CATALOGS[REDHAT_AI_CATALOG_ID]["properties"]["yamlCatalogPath"]
 VALIDATED_CATALOG_ID: str = tuple(DEFAULT_CATALOGS.keys())[1]
 
-REDHATI_AI_FILTER: str = "Red+Hat+AI"
-REDHATI_AI_VALIDATED_FILTER = "Red+Hat+AI+Validated"
+REDHAT_AI_FILTER: str = "Red+Hat+AI"
+REDHAT_AI_VALIDATED_FILTER = "Red+Hat+AI+Validated"

tests/model_registry/model_catalog/test_model_search.py

@@ -4,8 +4,8 @@
 from simple_logger.logger import get_logger
 from typing import Self, Any
 from tests.model_registry.model_catalog.constants import (
-    REDHATI_AI_FILTER,
-    REDHATI_AI_VALIDATED_FILTER,
+    REDHAT_AI_FILTER,
+    REDHAT_AI_VALIDATED_FILTER,
     REDHAT_AI_CATALOG_ID,
     VALIDATED_CATALOG_ID,
 )
@@ -29,13 +29,13 @@ def test_search_model_catalog_source_label(
         """
 
         result = execute_get_command(
-            url=f"{model_catalog_rest_url[0]}models?sourceLabel={REDHATI_AI_FILTER}&pageSize=100",
+            url=f"{model_catalog_rest_url[0]}models?sourceLabel={REDHAT_AI_FILTER}&pageSize=100",
             headers=model_registry_rest_headers,
         )
         redhai_ai_filter_moldels_size = result["size"]
 
         result = execute_get_command(
-            url=f"{model_catalog_rest_url[0]}models?sourceLabel={REDHATI_AI_VALIDATED_FILTER}&pageSize=100",
+            url=f"{model_catalog_rest_url[0]}models?sourceLabel={REDHAT_AI_VALIDATED_FILTER}&pageSize=100",
             headers=model_registry_rest_headers,
         )
         redhai_ai_validated_filter_models_size = result["size"]
@@ -48,7 +48,7 @@ def test_search_model_catalog_source_label(
         result = execute_get_command(
             url=(
                 f"{model_catalog_rest_url[0]}models?"
-                f"sourceLabel={REDHATI_AI_VALIDATED_FILTER},{REDHATI_AI_FILTER}&pageSize=100"
+                f"sourceLabel={REDHAT_AI_VALIDATED_FILTER},{REDHAT_AI_FILTER}&pageSize=100"
             ),
             headers=model_registry_rest_headers,
         )
@@ -85,11 +85,11 @@ def test_search_model_catalog_invalid_source_label(
         [
             pytest.param(
                 {"source": VALIDATED_CATALOG_ID},
-                REDHATI_AI_VALIDATED_FILTER,
+                REDHAT_AI_VALIDATED_FILTER,
                 id="test_search_model_catalog_redhat_ai_validated",
             ),
             pytest.param(
-                {"source": REDHAT_AI_CATALOG_ID}, REDHATI_AI_FILTER, id="test_search_model_catalog_redhat_ai_default"
+                {"source": REDHAT_AI_CATALOG_ID}, REDHAT_AI_FILTER, id="test_search_model_catalog_redhat_ai_default"
             ),
         ],
         indirect=["randomly_picked_model"],

tests/model_registry/model_catalog/utils.py

@@ -91,15 +91,16 @@ def validate_model_catalog_resource(
 
 
 def validate_default_catalog(catalogs: list[dict[Any, Any]]) -> None:
-    errors = ""
+    errors = []
     for catalog in catalogs:
         expected_catalog = DEFAULT_CATALOGS.get(catalog["id"])
         assert expected_catalog, f"Unexpected catalog: {catalog}"
-        for field in ["type", "name", "properties"]:
-            if catalog[field] != expected_catalog[field]:
-                errors += f"For {catalog['id']} expected {field}={expected_catalog[field]}, but got {catalog[field]}"
+        for key, expected_value in expected_catalog.items():
+            actual_value = catalog.get(key)
+            if actual_value != expected_value:
+                errors.append(f"For catalog '{catalog['id']}': expected {key}={expected_value}, but got {actual_value}")
 
-    assert not errors, errors
+    assert not errors, "\n".join(errors)
 
 
 def get_catalog_str(ids: list[str]) -> str: