Minor changes to default catalog source (#690)

Signed-off-by: Debarati Basu-Nag <dbasunag@redhat.com>

Author: dbasunag

tests/model_registry/model_catalog/conftest.py

@@ -41,6 +41,16 @@ def catalog_config_map(admin_client: DynamicClient, model_registry_namespace: st
     return ConfigMap(name=DEFAULT_MODEL_CATALOG, client=admin_client, namespace=model_registry_namespace)
 
 
+@pytest.fixture(scope="class")
+def model_catalog_config_map(
+    request: pytest.FixtureRequest, admin_client: DynamicClient, model_registry_namespace: str
+) -> ConfigMap:
+    """Parameterized fixture that takes a dict with configmap_name key and ensures it exists"""
+    param = getattr(request, "param", {})
+    configmap_name = param.get("configmap_name", "model-catalog-default-sources")
+    return ConfigMap(name=configmap_name, client=admin_client, namespace=model_registry_namespace, ensure_exists=True)
+
+
 @pytest.fixture(scope="class")
 def model_catalog_routes(admin_client: DynamicClient, model_registry_namespace: str) -> list[Route]:
     return list(

tests/model_registry/model_catalog/test_default_model_catalog.py

@@ -34,14 +34,26 @@
 
 @pytest.mark.skip_must_gather
 class TestModelCatalogGeneral:
-    @pytest.mark.post_upgrade
-    def test_config_map_exists(self: Self, catalog_config_map: ConfigMap):
-        # Check that the default configmaps is created when model registry is
+    @pytest.mark.parametrize(
+        "model_catalog_config_map",
+        [
+            pytest.param(
+                {"configmap_name": "model-catalog-sources"},
+                id="test_model_catalog_sources_configmap",
+            ),
+            pytest.param(
+                {"configmap_name": "model-catalog-default-sources"},
+                id="test_model_catalog_default_sources_configmap",
+            ),
+        ],
+        indirect=["model_catalog_config_map"],
+    )
+    def test_config_map_exists(self: Self, model_catalog_config_map: ConfigMap):
+        # Check that model catalog configmaps is created when model registry is
         # enabled on data science cluster.
-        assert catalog_config_map.exists, f"{catalog_config_map.name} does not exist"
-        catalogs = yaml.safe_load(catalog_config_map.instance.data["sources.yaml"])["catalogs"]
+        catalogs = yaml.safe_load(model_catalog_config_map.instance.data["sources.yaml"])["catalogs"]
         assert catalogs
-        assert len(catalogs) == 1, f"{catalog_config_map.name} should have 1 catalog"
+        assert len(catalogs) == 1, f"{model_catalog_config_map.name} should have 1 catalog"
         validate_default_catalog(default_catalog=catalogs[0])
 
     @pytest.mark.parametrize(
@@ -65,7 +77,6 @@ def test_config_map_exists(self: Self, catalog_config_map: ConfigMap):
             ),
         ],
     )
-    @pytest.mark.post_upgrade
     def test_model_catalog_resources_exists(
         self: Self, admin_client: DynamicClient, model_registry_namespace: str, resource_name: Any
     ):