Remove grpc as required param in local mr resource

tests/model_registry/async_job/conftest.py

@@ -25,7 +25,7 @@
 from ocp_resources.secret import Secret
 from ocp_resources.service import Service
 from ocp_resources.service_account import ServiceAccount
-from ocp_resources.model_registry_modelregistry_opendatahub_io import ModelRegistry
+from utilities.resources.model_registry_modelregistry_opendatahub_io import ModelRegistry
 from ocp_resources.config_map import ConfigMap
 from model_registry.types import RegisteredModel
 from model_registry import ModelRegistry as ModelRegistryClient

tests/model_registry/conftest.py

@@ -25,7 +25,7 @@
 from ocp_resources.deployment import Deployment
 
 
-from ocp_resources.model_registry_modelregistry_opendatahub_io import ModelRegistry
+from utilities.resources.model_registry_modelregistry_opendatahub_io import ModelRegistry
 from ocp_resources.resource import ResourceEditor
 
 from pytest import FixtureRequest
@@ -92,7 +92,6 @@ def model_registry_instance(
         yield [mr_instance]
         mr_instance.delete(wait=True)
     else:
-        LOGGER.warning("Requested Oauth Proxy configuration:")
         db_name = param.get("db_name", "mysql")
         mr_objects = get_model_registry_objects(
             client=admin_client,
@@ -111,6 +110,14 @@ def model_registry_instance(
                 wait_for_pods_running(
                     admin_client=admin_client, namespace_name=model_registry_namespace, number_of_consecutive_checks=6
                 )
+                if db_name == "default":
+                    # TODO: This is to give extra time to postgres pod due to RHOAIENG-40875. Remove when the Jira is
+                    # addressed
+                    wait_for_pods_running(
+                        admin_client=admin_client,
+                        namespace_name=model_registry_namespace,
+                        number_of_consecutive_checks=6,
+                    )
             yield mr_instances
         if db_name == "default":
             wait_for_default_resource_cleanedup(admin_client=admin_client, namespace_name=model_registry_namespace)

tests/model_registry/negative_tests/test_model_registry_creation_negative.py

@@ -3,7 +3,7 @@
 from simple_logger.logger import get_logger
 from ocp_resources.data_science_cluster import DataScienceCluster
 from ocp_resources.deployment import Deployment
-from ocp_resources.model_registry_modelregistry_opendatahub_io import ModelRegistry
+from utilities.resources.model_registry_modelregistry_opendatahub_io import ModelRegistry
 from pytest_testconfig import config as py_config
 from ocp_resources.namespace import Namespace
 from ocp_resources.secret import Secret

tests/model_registry/rbac/conftest.py

@@ -7,7 +7,7 @@
 from simple_logger.logger import get_logger
 
 from ocp_resources.deployment import Deployment
-from ocp_resources.model_registry_modelregistry_opendatahub_io import ModelRegistry
+from utilities.resources.model_registry_modelregistry_opendatahub_io import ModelRegistry
 from ocp_resources.persistent_volume_claim import PersistentVolumeClaim
 from ocp_resources.secret import Secret
 from ocp_resources.service import Service

tests/model_registry/rbac/test_mr_rbac.py

@@ -33,7 +33,7 @@
 from mr_openapi.exceptions import ForbiddenException
 from utilities.user_utils import UserTestSession
 from kubernetes.dynamic import DynamicClient
-from ocp_resources.model_registry_modelregistry_opendatahub_io import ModelRegistry
+from utilities.resources.model_registry_modelregistry_opendatahub_io import ModelRegistry
 from tests.model_registry.utils import get_mr_service_by_label, get_endpoint_from_mr_service, get_mr_user_token
 from tests.model_registry.rbac.utils import grant_mr_access, revoke_mr_access
 from utilities.constants import Protocols

tests/model_registry/rest_api/conftest.py

@@ -33,7 +33,7 @@
 from ocp_resources.secret import Secret
 from ocp_resources.config_map import ConfigMap
 from simple_logger.logger import get_logger
-from ocp_resources.model_registry_modelregistry_opendatahub_io import ModelRegistry
+from utilities.resources.model_registry_modelregistry_opendatahub_io import ModelRegistry
 from pytest_testconfig import config as py_config
 from utilities.exceptions import MissingParameter
 import tempfile

tests/model_registry/rest_api/test_model_registry_rest_api.py

@@ -2,7 +2,7 @@
 import pytest
 from kubernetes.dynamic import DynamicClient
 from ocp_resources.deployment import Deployment
-from ocp_resources.model_registry_modelregistry_opendatahub_io import ModelRegistry
+from utilities.resources.model_registry_modelregistry_opendatahub_io import ModelRegistry
 from ocp_resources.persistent_volume_claim import PersistentVolumeClaim
 from ocp_resources.pod import Pod
 from ocp_resources.secret import Secret

tests/model_registry/rest_api/test_model_registry_secure_db.py

@@ -5,7 +5,7 @@
 from tests.model_registry.utils import get_mr_service_by_label, get_endpoint_from_mr_service
 from kubernetes.dynamic import DynamicClient
 from utilities.constants import Protocols
-from ocp_resources.model_registry_modelregistry_opendatahub_io import ModelRegistry
+from utilities.resources.model_registry_modelregistry_opendatahub_io import ModelRegistry
 
 from simple_logger.logger import get_logger
 

tests/model_registry/rest_api/test_multiple_mr.py

@@ -3,7 +3,7 @@
 from kubernetes.dynamic import DynamicClient
 
 from ocp_resources.config_map import ConfigMap
-from ocp_resources.model_registry_modelregistry_opendatahub_io import ModelRegistry
+from utilities.resources.model_registry_modelregistry_opendatahub_io import ModelRegistry
 from ocp_resources.pod import Pod
 
 from tests.model_registry.constants import (

tests/model_registry/upgrade/model_registry/test_model_registry_upgrade.py

@@ -7,7 +7,7 @@
 from tests.model_registry.constants import MODEL_NAME, MODEL_DICT
 from model_registry.types import RegisteredModel
 from model_registry import ModelRegistry as ModelRegistryClient
-from ocp_resources.model_registry_modelregistry_opendatahub_io import ModelRegistry
+from utilities.resources.model_registry_modelregistry_opendatahub_io import ModelRegistry
 from ocp_resources.custom_resource_definition import CustomResourceDefinition
 from simple_logger.logger import get_logger
 from tests.model_registry.utils import (

tests/model_registry/utils.py

@@ -12,7 +12,7 @@
 from ocp_resources.pod import Pod
 from ocp_resources.secret import Secret
 from ocp_resources.service import Service
-from ocp_resources.model_registry_modelregistry_opendatahub_io import ModelRegistry
+from utilities.resources.model_registry_modelregistry_opendatahub_io import ModelRegistry
 from kubernetes.dynamic.exceptions import ResourceNotFoundError
 from simple_logger.logger import get_logger
 from timeout_sampler import retry
@@ -560,7 +560,6 @@ def get_model_registry_objects(
                 name=name,
                 namespace=namespace,
                 label=get_mr_standard_labels(resource_name=name),
-                grpc={},
                 rest={},
                 oauth_proxy=OAUTH_PROXY_CONFIG_DICT,
                 mysql=mysql if mysql else None,

utilities/resources/model_registry_modelregistry_opendatahub_io.py

@@ -0,0 +1,94 @@
+# Generated using https://github.com/RedHatQE/openshift-python-wrapper/blob/main/scripts/resource/README.md
+
+from typing import Any
+
+from ocp_resources.exceptions import MissingRequiredArgumentError
+from ocp_resources.resource import NamespacedResource
+
+
+class ModelRegistry(NamespacedResource):
+    """
+    ModelRegistry is the Schema for the modelregistries API
+    """
+
+    api_group: str = NamespacedResource.ApiGroup.MODELREGISTRY_OPENDATAHUB_IO
+
+    def __init__(
+        self,
+        downgrade_db_schema_version: int | None = None,
+        enable_database_upgrade: bool | None = None,
+        grpc: dict[str, Any] | None = None,
+        kube_rbac_proxy: dict[str, Any] | None = None,
+        mysql: dict[str, Any] | None = None,
+        oauth_proxy: dict[str, Any] | None = None,
+        postgres: dict[str, Any] | None = None,
+        rest: dict[str, Any] | None = None,
+        **kwargs: Any,
+    ) -> None:
+        r"""
+        Args:
+            downgrade_db_schema_version (int): Database downgrade schema version value. If set the database schema
+              version is downgraded to the set value during initialization
+              (Optional Parameter)
+
+            enable_database_upgrade (bool): Flag specifying database upgrade option. If set to true, it enables
+              database migration during initialization (Optional parameter)
+
+            grpc (dict[str, Any]): Deprecated: Configuration for gRPC endpoint is deprecated and will be
+              removed in a future release
+
+            kube_rbac_proxy (dict[str, Any]): kube-rbac-proxy configuration options
+
+            mysql (dict[str, Any]): MySQL configuration options
+
+            oauth_proxy (dict[str, Any]): OpenShift OAuth proxy configuration options
+
+            postgres (dict[str, Any]): PostgreSQL configuration options
+
+            rest (dict[str, Any]): Configuration for REST endpoint
+
+        """
+        super().__init__(**kwargs)
+
+        self.downgrade_db_schema_version = downgrade_db_schema_version
+        self.enable_database_upgrade = enable_database_upgrade
+        self.grpc = grpc
+        self.kube_rbac_proxy = kube_rbac_proxy
+        self.mysql = mysql
+        self.oauth_proxy = oauth_proxy
+        self.postgres = postgres
+        self.rest = rest
+
+    def to_dict(self) -> None:
+
+        super().to_dict()
+
+        if not self.kind_dict and not self.yaml_file:
+            if self.rest is None:
+                raise MissingRequiredArgumentError(argument="self.rest")
+
+            self.res["spec"] = {}
+            _spec = self.res["spec"]
+
+            _spec["grpc"] = self.grpc
+            _spec["rest"] = self.rest
+
+            if self.downgrade_db_schema_version is not None:
+                _spec["downgrade_db_schema_version"] = self.downgrade_db_schema_version
+
+            if self.enable_database_upgrade is not None:
+                _spec["enable_database_upgrade"] = self.enable_database_upgrade
+
+            if self.kube_rbac_proxy is not None:
+                _spec["kubeRBACProxy"] = self.kube_rbac_proxy
+
+            if self.mysql is not None:
+                _spec["mysql"] = self.mysql
+
+            if self.oauth_proxy is not None:
+                _spec["oauthProxy"] = self.oauth_proxy
+
+            if self.postgres is not None:
+                _spec["postgres"] = self.postgres
+
+    # End of generated code