Update pod test to count for newly added mc pod (#694)

Signed-off-by: Debarati Basu-Nag <dbasunag@redhat.com>
Co-authored-by: Luca Giorgi <lgiorgi@redhat.com>

Author: dbasunag

tests/model_registry/model_catalog/test_default_model_catalog.py

@@ -57,33 +57,44 @@ def test_config_map_exists(self: Self, model_catalog_config_map: ConfigMap):
         validate_default_catalog(default_catalog=catalogs[0])
 
     @pytest.mark.parametrize(
-        "resource_name",
+        "resource_name, expected_resource_count",
         [
             pytest.param(
                 Deployment,
+                1,
                 id="test_model_catalog_deployment_resource",
             ),
             pytest.param(
                 Route,
+                1,
                 id="test_model_catalog_route_resource",
             ),
             pytest.param(
                 Service,
+                1,
                 id="test_model_catalog_service_resource",
             ),
             pytest.param(
                 Pod,
+                2,
                 id="test_model_catalog_pod_resource",
             ),
         ],
     )
     @pytest.mark.post_upgrade
     @pytest.mark.install
     def test_model_catalog_resources_exists(
-        self: Self, admin_client: DynamicClient, model_registry_namespace: str, resource_name: Any
+        self: Self,
+        admin_client: DynamicClient,
+        model_registry_namespace: str,
+        resource_name: Any,
+        expected_resource_count: int,
     ):
         validate_model_catalog_resource(
-            kind=resource_name, admin_client=admin_client, namespace=model_registry_namespace
+            kind=resource_name,
+            admin_client=admin_client,
+            namespace=model_registry_namespace,
+            expected_resource_count=expected_resource_count,
         )
 
     def test_operator_pod_enabled_model_catalog(self: Self, model_registry_operator_pod: Pod):

tests/model_registry/model_catalog/utils.py

@@ -84,10 +84,15 @@ def wait_for_model_catalog_pod_created(client: DynamicClient, model_registry_nam
     raise PodNotFound("Model catalog pod not found")
 
 
-def validate_model_catalog_resource(kind: Any, admin_client: DynamicClient, namespace: str) -> None:
+def validate_model_catalog_resource(
+    kind: Any, admin_client: DynamicClient, namespace: str, expected_resource_count: int
+) -> None:
     resource = list(kind.get(namespace=namespace, label_selector="component=model-catalog", dyn_client=admin_client))
     assert resource
-    assert len(resource) == 1, f"Unexpected number of {kind} resources found: {[res.name for res in resource]}"
+    LOGGER.info(f"Validating resource: {kind}: Found {len(resource)})")
+    assert len(resource) == expected_resource_count, (
+        f"Unexpected number of {kind} resources found: {[res.name for res in resource]}"
+    )
 
 
 def validate_default_catalog(default_catalog) -> None: