Auto identify applications namespace and distribution

conftest.py

@@ -32,6 +32,7 @@ def pytest_addoption(parser: Parser) -> None:
     buckets_group = parser.getgroup(name="Buckets")
     runtime_group = parser.getgroup(name="Runtime details")
     upgrade_group = parser.getgroup(name="Upgrade options")
+    platform_group = parser.getgroup(name="Platform")
 
     # AWS config and credentials options
     aws_group.addoption(
@@ -113,6 +114,12 @@ def pytest_addoption(parser: Parser) -> None:
         "If not set, all will be tested.",
     )
 
+    # Platform options
+    platform_group.addoption(
+        "--applications-namespace",
+        help="RHOAI/ODH applications namespace",
+    )
+
 
 def pytest_cmdline_main(config: Any) -> None:
     config.option.basetemp = py_config["tmp_base_dir"] = f"{config.option.basetemp}-{shortuuid.uuid()}"
@@ -196,9 +203,6 @@ def pytest_sessionstart(session: Session) -> None:
         log_level=session.config.getoption("log_cli_level") or logging.INFO,
     )
 
-    if py_config.get("distribution") == "upstream":
-        py_config["applications_namespace"] = "opendatahub"
-
 
 def pytest_fixture_setup(fixturedef: FixtureDef[Any], request: FixtureRequest) -> None:
     LOGGER.info(f"Executing {fixturedef.scope} fixture: {fixturedef.argname}")

tests/conftest.py

@@ -21,7 +21,13 @@
 from simple_logger.logger import get_logger
 
 from utilities.data_science_cluster_utils import update_components_in_dsc
-from utilities.infra import create_ns, login_with_user_password, get_openshift_token
+from utilities.infra import (
+    create_ns,
+    get_dsci_applications_namespace,
+    get_operator_distribution,
+    login_with_user_password,
+    get_openshift_token,
+)
 from utilities.constants import AcceleratorType, DscComponents
 from utilities.infra import update_configmap_data
 
@@ -45,6 +51,21 @@ def tests_tmp_dir(request: FixtureRequest, tmp_path_factory: TempPathFactory) ->
     shutil.rmtree(path=str(tests_tmp_path), ignore_errors=True)
 
 
+@pytest.fixture(scope="session", autouse=True)
+def updated_global_config(request: FixtureRequest, admin_client: DynamicClient) -> None:
+    if get_operator_distribution(client=admin_client) == "Open Data Hub":
+        py_config["distribution"] = "upstream"
+
+    else:
+        py_config["distribution"] = "downstream"
+
+    if applications_namespace := request.config.getoption("applications_namespace"):
+        py_config["applications_namespace"] = applications_namespace
+
+    else:
+        py_config["applications_namespace"] = get_dsci_applications_namespace(client=admin_client)
+
+
 @pytest.fixture(scope="session")
 def current_client_token(admin_client: DynamicClient) -> str:
     return get_openshift_token()

utilities/exceptions.py

@@ -80,3 +80,7 @@ class InferenceCanaryTrafficError(Exception):
 
 class PodLogMissMatchError(Exception):
     pass
+
+
+class ResourceMismatch(Exception):
+    pass

utilities/infra.py

@@ -13,7 +13,9 @@
 from ocp_resources.catalog_source import CatalogSource
 from ocp_resources.cluster_service_version import ClusterServiceVersion
 from ocp_resources.config_map import ConfigMap
+from ocp_resources.data_science_cluster import DataScienceCluster
 from ocp_resources.deployment import Deployment
+from ocp_resources.dsc_initialization import DSCInitialization
 from ocp_resources.exceptions import MissingResourceError
 from ocp_resources.inference_service import InferenceService
 from ocp_resources.infrastructure import Infrastructure
@@ -616,3 +618,59 @@ def get_product_version(admin_client: DynamicClient) -> Version:
         raise MissingResourceError("Operator ClusterServiceVersion not found")
 
     return Version.parse(operator_version)
+
+
+def get_dsci_applications_namespace(client: DynamicClient, dsci_name: str = "default-dsci") -> str:
+    """
+    Get the namespace where DSCI applications are deployed.
+
+    Args:
+        client (DynamicClient): DynamicClient object
+        dsci_name (str): DSCI name
+
+    Returns:
+        str: Namespace where DSCI applications are deployed.
+
+    Raises:
+            ValueError: If DSCI applications namespace not found
+            MissingResourceError: If DSCI not found
+
+    """
+    dsci = DSCInitialization(client=client, name=dsci_name)
+
+    if dsci.exists:
+        if app_namespace := dsci.instance.spec.get("applicationsNamespace"):
+            return app_namespace
+
+        else:
+            raise ValueError("DSCI applications namespace not found in {dsci_name}")
+
+    raise MissingResourceError(f"DSCI {dsci_name} not found")
+
+
+def get_operator_distribution(client: DynamicClient, dsc_name: str = "default-dsc") -> str:
+    """
+    Get the operator distribution.
+
+    Args:
+        client (DynamicClient): DynamicClient object
+        dsc_name (str): DSC name
+
+    Returns:
+        str: Operator distribution.
+
+    Raises:
+            ValueError: If DSC release name not found
+            MissingResourceError: If DSC not found
+
+    """
+    dsc = DataScienceCluster(client=client, name=dsc_name)
+
+    if dsc.exists:
+        if dsc_release_name := dsc.instance.status.get("release", {}).get("name"):
+            return dsc_release_name
+
+        else:
+            raise ValueError("DSC release name not found in {dsc_name}")
+
+    raise MissingResourceError(f"DSC {dsc_name} not found")