fix: address review comments

Signed-off-by: Debarati Basu-Nag <[email protected]>

Author: dbasunag

tests/model_registry/mcp_servers/config/test_source_label.py

@@ -1,13 +1,13 @@
 from typing import Self
 
 import pytest
-from simple_logger.logger import get_logger
 
 from tests.model_registry.mcp_servers.constants import (
     MCP_CATALOG_SOURCE2_NAME,
     MCP_CATALOG_SOURCE_NAME,
 )
 from tests.model_registry.utils import execute_get_command
+from utilities.opendatahub_logger import get_logger
 
 LOGGER = get_logger(name=__name__)
 

tests/model_registry/model_catalog/catalog_config/test_catalog_source_merge.py

@@ -1,7 +1,7 @@
 import pytest
 
 from tests.model_registry.model_catalog.constants import REDHAT_AI_CATALOG_ID
-from tests.model_registry.model_catalog.utils import execute_get_command
+from tests.model_registry.utils import execute_get_command
 from utilities.opendatahub_logger import get_logger
 
 LOGGER = get_logger(name=__name__)

tests/model_registry/model_catalog/catalog_config/test_default_model_catalog.py

@@ -22,8 +22,7 @@
     validate_model_catalog_resource,
 )
 from tests.model_registry.model_catalog.constants import CATALOG_CONTAINER, DEFAULT_CATALOGS, REDHAT_AI_CATALOG_ID
-from tests.model_registry.model_catalog.utils import execute_get_command
-from tests.model_registry.utils import get_model_catalog_pod, get_rest_headers
+from tests.model_registry.utils import execute_get_command, get_model_catalog_pod, get_rest_headers
 from utilities.opendatahub_logger import get_logger
 from utilities.user_utils import UserTestSession
 

tests/model_registry/model_catalog/huggingface/test_huggingface_source_error_validation.py

@@ -6,7 +6,7 @@
 from ocp_resources.config_map import ConfigMap
 
 from tests.model_registry.model_catalog.huggingface.utils import assert_accessible_models_via_catalog_api
-from tests.model_registry.model_catalog.utils import execute_get_command
+from tests.model_registry.utils import execute_get_command
 from utilities.opendatahub_logger import get_logger
 
 LOGGER = get_logger(name=__name__)

tests/model_registry/model_catalog/huggingface/utils.py

@@ -6,8 +6,8 @@
 from timeout_sampler import retry
 
 from tests.model_registry.model_catalog.constants import HF_SOURCE_ID
-from tests.model_registry.model_catalog.utils import execute_get_command, get_models_from_catalog_api
-from tests.model_registry.utils import get_model_catalog_pod
+from tests.model_registry.model_catalog.utils import get_models_from_catalog_api
+from tests.model_registry.utils import execute_get_command, get_model_catalog_pod
 from utilities.opendatahub_logger import get_logger
 
 LOGGER = get_logger(name=__name__)

tests/model_registry/model_catalog/metadata/test_custom_properties.py

@@ -9,8 +9,7 @@
     get_metadata_from_catalog_pod,
     validate_custom_properties_match_metadata,
 )
-from tests.model_registry.model_catalog.utils import execute_get_command
-from tests.model_registry.utils import get_model_catalog_pod
+from tests.model_registry.utils import execute_get_command, get_model_catalog_pod
 from utilities.opendatahub_logger import get_logger
 
 LOGGER = get_logger(name=__name__)

tests/model_registry/model_catalog/metadata/test_sources_endpoint.py

@@ -8,7 +8,7 @@
     REDHAT_AI_CATALOG_ID,
     VALIDATED_CATALOG_ID,
 )
-from tests.model_registry.model_catalog.utils import execute_get_command
+from tests.model_registry.utils import execute_get_command
 from utilities.opendatahub_logger import get_logger
 
 pytestmark = [pytest.mark.usefixtures("updated_dsc_component_state_scope_session", "model_registry_namespace")]

tests/model_registry/model_catalog/metadata/utils.py

@@ -9,8 +9,7 @@
 from ocp_resources.pod import Pod
 
 from tests.model_registry.constants import DEFAULT_CUSTOM_MODEL_CATALOG, DEFAULT_MODEL_CATALOG_CM
-from tests.model_registry.model_catalog.utils import execute_get_command
-from tests.model_registry.utils import get_rest_headers
+from tests.model_registry.utils import execute_get_command, get_rest_headers
 from utilities.opendatahub_logger import get_logger
 
 LOGGER = get_logger(name=__name__)

tests/model_registry/model_catalog/search/utils.py

@@ -19,7 +19,8 @@
     SEARCH_MODELS_DB_QUERY,
     SEARCH_MODELS_WITH_SOURCE_ID_DB_QUERY,
 )
-from tests.model_registry.model_catalog.utils import execute_database_query, execute_get_command, parse_psql_output
+from tests.model_registry.model_catalog.utils import execute_database_query, parse_psql_output
+from tests.model_registry.utils import execute_get_command
 from utilities.opendatahub_logger import get_logger
 
 LOGGER = get_logger(name=__name__)

tests/model_serving/maas_billing/maas_subscription/test_api_key_bulk_operations.py

@@ -2,14 +2,14 @@
 
 import pytest
 import requests
-from simple_logger.logger import get_logger
 
 from tests.model_serving.maas_billing.maas_subscription.utils import (
     assert_bulk_revoke_success,
     bulk_revoke_api_keys,
     get_api_key,
     resolve_api_key_username,
 )
+from utilities.opendatahub_logger import get_logger
 
 LOGGER = get_logger(name=__name__)