Merge branch 'main' into pre-commit-ci-update-config

Author: dbasunag

OWNERS

@@ -3,8 +3,10 @@ approvers:
   - fege
   - jgarciao
   - lugi0
+  - mwaykole
 reviewers:
   - dbasunag
   - fege
   - jgarciao
   - lugi0
+  - mwaykole

docs/GETTING_STARTED.md

@@ -138,7 +138,7 @@ To run tests with admin client only, pass `--tc=use_unprivileged_client:False` t
 ### jira integration
 
 To skip running tests which have open bugs, [pytest_jira](https://github.com/rhevm-qe-automation/pytest_jira) plugin is used.
-To run tests with jira integration, you need to set `PYTEST_JIRA_URL` and `PYTEST_JIRA_TOKEN` environment variables.
+To run tests with jira integration, you need to set `PYTEST_JIRA_URL`, `PYTEST_JIRA_USERNAME` and `PYTEST_JIRA_PASSWORD` environment variables.
 To make a test with jira marker, add: `@pytest.mark.jira(jira_id="RHOAIENG-0000", run=False)` to the test.
 
 ### Running containerized tests

tests/model_registry/mcp_servers/config/test_invalid_yaml.py

@@ -37,7 +37,8 @@
 )
 @pytest.mark.usefixtures("mcp_invalid_yaml_configmap_patch")
 class TestMCPServerInvalidYAML:
-    """RHOAIENG-51582: Tests for graceful handling of invalid YAML sources (TC-LOAD-007, TC-LOAD-008)."""
+    """
+    Tests for graceful handling of invalid YAML sources (TC-LOAD-007, TC-LOAD-008)."""
 
     def test_valid_servers_loaded_despite_invalid_source(
         self: Self,

tests/model_registry/mcp_servers/config/test_multi_source.py

@@ -13,7 +13,7 @@
 
 @pytest.mark.usefixtures("mcp_multi_source_configmap_patch")
 class TestMCPServerMultiSource:
-    """RHOAIENG-51582: Tests for loading MCP servers from multiple YAML sources (TC-LOAD-002)."""
+    """Tests for loading MCP servers from multiple YAML sources (TC-LOAD-002)."""
 
     def test_all_servers_from_multiple_sources_loaded(
         self: Self,

tests/model_registry/mcp_servers/config/test_named_queries.py

@@ -11,7 +11,7 @@
 
 @pytest.mark.usefixtures("mcp_servers_configmap_patch")
 class TestMCPServerNamedQueries:
-    """RHOAIENG-52375: Tests for MCP server named query functionality."""
+    """Tests for MCP server named query functionality."""
 
     @pytest.mark.parametrize(
         "named_query, expected_custom_properties",

tests/model_registry/mcp_servers/search/test_filtering.py

@@ -11,7 +11,7 @@
 
 @pytest.mark.usefixtures("mcp_servers_configmap_patch")
 class TestMCPServerFiltering:
-    """RHOAIENG-51584: Tests for MCP server filterQuery functionality."""
+    """Tests for MCP server filterQuery functionality."""
 
     @pytest.mark.parametrize(
         "filter_query, expected_count, expected_name, field_check",

tests/model_registry/mcp_servers/search/test_keyword_search.py

@@ -0,0 +1,46 @@
+from typing import Self
+
+import pytest
+from simple_logger.logger import get_logger
+
+from tests.model_registry.mcp_servers.constants import CALCULATOR_SERVER_NAME
+from tests.model_registry.utils import execute_get_command
+
+LOGGER = get_logger(name=__name__)
+
+
+@pytest.mark.usefixtures("mcp_servers_configmap_patch")
+class TestMCPServerKeywordSearch:
+    """Tests for MCP server keyword search via q parameter combined with other features."""
+
+    @pytest.mark.parametrize(
+        "params, expected_names",
+        [
+            pytest.param(
+                {"q": "Community", "filterQuery": "license='MIT'"},
+                {"weather-api", CALCULATOR_SERVER_NAME},
+                id="with_filter_query",
+            ),
+            pytest.param(
+                {"q": "Math", "namedQuery": "production_ready"},
+                {CALCULATOR_SERVER_NAME},
+                id="with_named_query",
+            ),
+        ],
+    )
+    def test_keyword_search_combined(
+        self: Self,
+        mcp_catalog_rest_urls: list[str],
+        model_registry_rest_headers: dict[str, str],
+        params: dict[str, str],
+        expected_names: set[str],
+    ):
+        """TC-API-012: Test q parameter combined with filterQuery or namedQuery (AND logic)."""
+        response = execute_get_command(
+            url=f"{mcp_catalog_rest_urls[0]}mcp_servers",
+            headers=model_registry_rest_headers,
+            params=params,
+        )
+        items = response.get("items", [])
+        actual_names = {server["name"] for server in items}
+        assert actual_names == expected_names

tests/model_registry/mcp_servers/search/test_ordering.py

@@ -10,7 +10,7 @@
 
 @pytest.mark.usefixtures("mcp_servers_configmap_patch")
 class TestMCPServerOrdering:
-    """RHOAIENG-51584: Tests for MCP server ordering functionality."""
+    """Tests for MCP server ordering functionality."""
 
     @pytest.mark.parametrize(
         "sort_order",

tests/model_registry/mcp_servers/test_data_integrity.py

@@ -15,7 +15,7 @@
 
 @pytest.mark.usefixtures("mcp_servers_configmap_patch")
 class TestMCPServerLoading:
-    """RHOAIENG-51582: Tests for loading MCP servers from YAML into the catalog (TC-LOAD-001)."""
+    """Tests for loading MCP servers from YAML into the catalog (TC-LOAD-001)."""
 
     def test_mcp_servers_loaded(
         self: Self,

tests/model_registry/model_catalog/catalog_config/conftest.py

@@ -35,7 +35,7 @@ def recreated_model_catalog_configmap(
         ConfigMap: The recreated ConfigMap instance
     """
     namespace_name = py_config["model_registry_namespace"]
-    # TODO: RHOAIENG-46741 would require changing this to look for configmaps based on label
+    # TODO: would require changing this to look for configmaps based on label
     # Get the existing ConfigMap
     configmap = ConfigMap(
         name=DEFAULT_CUSTOM_MODEL_CATALOG, client=admin_client, namespace=namespace_name, ensure_exists=True