Skip to content

Commit c981f80

Browse files
pre-commit-ci[bot]pre-commit-ci[bot]
committed
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent 301c1b5 commit c981f80

11 files changed

Lines changed: 75 additions & 49 deletions

‎tests/model_registry/conftest.py‎

Lines changed: 32 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@
3535
get_endpoint_from_mr_service,
3636
get_mr_service_by_label,
3737
wait_for_pods_running,
38-
get_model_registry_objects, get_model_registry_metadata_resources,
38+
get_model_registry_objects,
39+
get_model_registry_metadata_resources,
3940
)
4041
from utilities.constants import DscComponents
4142
from model_registry import ModelRegistry as ModelRegistryClient
@@ -71,10 +72,10 @@ def model_registry_instance(
7172
client=admin_client,
7273
namespace=model_registry_namespace,
7374
base_name=MR_INSTANCE_BASE_NAME,
74-
num= param.get("num_resources", 1),
75+
num=param.get("num_resources", 1),
7576
teardown_resources=teardown_resources,
7677
params=param,
77-
db_backend=param.get("db_backend", "mysql")
78+
db_backend=param.get("db_backend", "mysql"),
7879
)
7980
with ExitStack() as stack:
8081
mr_instances = [stack.enter_context(mr_obj) for mr_obj in mr_objects]
@@ -86,45 +87,57 @@ def model_registry_instance(
8687
)
8788
yield mr_instances
8889

90+
8991
@pytest.fixture(scope="class")
90-
def model_registry_metadata_db_resources(request: FixtureRequest, admin_client: DynamicClient,
91-
pytestconfig: Config,
92-
teardown_resources: bool,
93-
model_registry_namespace: str) -> Generator[dict[Any, Any], None, None]:
92+
def model_registry_metadata_db_resources(
93+
request: FixtureRequest,
94+
admin_client: DynamicClient,
95+
pytestconfig: Config,
96+
teardown_resources: bool,
97+
model_registry_namespace: str,
98+
) -> Generator[dict[Any, Any], None, None]:
9499
num_resources = getattr(request, "param", {}).get("num_resources", 1)
95100
db_backend = getattr(request, "param", {}).get("db_backend", "mysql")
96101

97102
if pytestconfig.option.post_upgrade:
98103
if pytestconfig.option.post_upgrade:
99104
resources = {
100105
Secret: [Secret(name=DB_RESOURCE_NAME, namespace=model_registry_namespace, ensure_exists=True)],
101-
PersistentVolumeClaim: [PersistentVolumeClaim(name=DB_RESOURCE_NAME, namespace=model_registry_namespace,
102-
ensure_exists=True)],
106+
PersistentVolumeClaim: [
107+
PersistentVolumeClaim(name=DB_RESOURCE_NAME, namespace=model_registry_namespace, ensure_exists=True)
108+
],
103109
Service: [Service(name=DB_RESOURCE_NAME, namespace=model_registry_namespace, ensure_exists=True)],
104-
ConfigMap: [ConfigMap(name=DB_RESOURCE_NAME, namespace=model_registry_namespace, ensure_exists=True)] if db_backend == [
105-
"mariadb"] else [],
106-
Deployment: [Deployment(name=DB_RESOURCE_NAME, namespace=model_registry_namespace, ensure_exists=True)]
110+
ConfigMap: [ConfigMap(name=DB_RESOURCE_NAME, namespace=model_registry_namespace, ensure_exists=True)]
111+
if db_backend == ["mariadb"]
112+
else [],
113+
Deployment: [Deployment(name=DB_RESOURCE_NAME, namespace=model_registry_namespace, ensure_exists=True)],
107114
}
108115
yield resources
109-
for kind in [Deployment, ConfigMap,Service, PersistentVolumeClaim, Secret]:
116+
for kind in [Deployment, ConfigMap, Service, PersistentVolumeClaim, Secret]:
110117
for resource in resources[kind]:
111118
resource.delete(wait=True)
112119
else:
113120
resources_instances = {}
114-
resources = get_model_registry_metadata_resources(base_name=DB_BASE_RESOURCES_NAME,
115-
namespace=model_registry_namespace,
116-
num_resources=num_resources, db_backend=db_backend,
117-
teardown_resources=teardown_resources, client=admin_client)
121+
resources = get_model_registry_metadata_resources(
122+
base_name=DB_BASE_RESOURCES_NAME,
123+
namespace=model_registry_namespace,
124+
num_resources=num_resources,
125+
db_backend=db_backend,
126+
teardown_resources=teardown_resources,
127+
client=admin_client,
128+
)
118129
with ExitStack() as stack:
119130
for kind_name in [Secret, PersistentVolumeClaim, Service, ConfigMap, Deployment]:
120131
if resources[kind_name]:
121-
122132
LOGGER.info(f"Creating {num_resources} {kind_name} resources")
123-
resources_instances[kind_name] = [stack.enter_context(resource_obj) for resource_obj in resources[kind_name]]
133+
resources_instances[kind_name] = [
134+
stack.enter_context(resource_obj) for resource_obj in resources[kind_name]
135+
]
124136
for deployment in resources_instances[Deployment]:
125137
deployment.wait_for_replicas(deployed=True)
126138
yield resources_instances
127139

140+
128141
@pytest.fixture(scope="class")
129142
def model_registry_instance_rest_endpoint(admin_client: DynamicClient, model_registry_instance) -> list[str]:
130143
"""

‎tests/model_registry/negative_tests/conftest.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@
1717

1818
from tests.model_registry.constants import (
1919
MODEL_REGISTRY_DB_SECRET_STR_DATA,
20-
MODEL_REGISTRY_DB_SECRET_ANNOTATIONS, DB_RESOURCE_NAME, MR_INSTANCE_NAME,
20+
MODEL_REGISTRY_DB_SECRET_ANNOTATIONS,
21+
DB_RESOURCE_NAME,
22+
MR_INSTANCE_NAME,
2123
)
2224
from tests.model_registry.utils import get_model_registry_deployment_template_dict, get_model_registry_db_label_dict
2325
from utilities.constants import MODEL_REGISTRY_CUSTOM_NAMESPACE
@@ -124,7 +126,9 @@ def model_registry_db_deployment_negative_test(
124126
selector={"matchLabels": {"name": DB_RESOURCES_NAME_NEGATIVE}},
125127
strategy={"type": "Recreate"},
126128
template=get_model_registry_deployment_template_dict(
127-
secret_name=model_registry_db_secret_negative_test.name, resource_name=DB_RESOURCES_NAME_NEGATIVE, db_backend="mysql"
129+
secret_name=model_registry_db_secret_negative_test.name,
130+
resource_name=DB_RESOURCES_NAME_NEGATIVE,
131+
db_backend="mysql",
128132
),
129133
wait_for_resource=True,
130134
) as mr_db_deployment:

‎tests/model_registry/negative_tests/test_model_registry_creation_negative.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def test_registering_model_negative(
3232
self: Self,
3333
current_client_token: str,
3434
model_registry_namespace_for_negative_tests: Namespace,
35-
updated_dsc_component_state_scope_session: DataScienceCluster,
35+
updated_dsc_component_state_scope_session: DataScienceCluster,
3636
model_registry_db_secret_negative_test: Secret,
3737
model_registry_db_deployment_negative_test: Deployment,
3838
):

‎tests/model_registry/rbac/conftest.py‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@
77
from typing import Generator, List, Dict, Any
88

99
from _pytest.fixtures import FixtureRequest
10-
from pytest_testconfig import py_config
1110
from simple_logger.logger import get_logger
1211

13-
from ocp_resources.data_science_cluster import DataScienceCluster
1412
from ocp_resources.deployment import Deployment
1513
from ocp_resources.infrastructure import Infrastructure
1614
from ocp_resources.model_registry_modelregistry_opendatahub_io import ModelRegistry
@@ -29,11 +27,9 @@
2927
from pyhelper_utils.shell import run_command
3028

3129
from tests.model_registry.rbac.utils import wait_for_oauth_openshift_deployment, create_role_binding
32-
from utilities.constants import DscComponents
3330
from utilities.general import generate_random_name
3431
from tests.model_registry.utils import (
3532
generate_namespace_name,
36-
wait_for_pods_running,
3733
)
3834
from utilities.infra import login_with_user_password
3935
from utilities.user_utils import UserTestSession, create_htpasswd_file, wait_for_user_creation

‎tests/model_registry/rbac/multiple_instance_utils.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,9 @@
6767
"label": get_model_registry_db_label_dict(db_resource_name=resource_name),
6868
"selector": {"matchLabels": {"name": resource_name}},
6969
"strategy": {"type": "Recreate"},
70-
"template": get_model_registry_deployment_template_dict(secret_name=resource_name, resource_name=resource_name, db_backend="mysql"),
70+
"template": get_model_registry_deployment_template_dict(
71+
secret_name=resource_name, resource_name=resource_name, db_backend="mysql"
72+
),
7173
"wait_for_resource": True,
7274
}
7375
for resource_name in resource_names

‎tests/model_registry/rbac/test_mr_rbac.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ def test_user_permission_multi_project_parametrized(
151151
test_idp_user: UserTestSession,
152152
admin_client: DynamicClient,
153153
updated_dsc_component_state_scope_session: DataScienceCluster,
154-
model_registry_namespace: str,
154+
model_registry_namespace: str,
155155
db_secret_parametrized: List[Secret],
156156
db_pvc_parametrized: List[PersistentVolumeClaim],
157157
db_service_parametrized: List[Service],

‎tests/model_registry/rest_api/conftest.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,8 @@ def mysql_template_with_ca(model_registry_metadata_db_resources: dict[Any, Any])
126126
"""
127127
mysql_template = get_model_registry_deployment_template_dict(
128128
secret_name=model_registry_metadata_db_resources[Secret][0].name,
129-
resource_name=DB_RESOURCE_NAME, db_backend="mysql"
129+
resource_name=DB_RESOURCE_NAME,
130+
db_backend="mysql",
130131
)
131132
mysql_template["spec"]["containers"][0]["args"].append(f"--ssl-ca={CA_FILE_PATH}")
132133
mysql_template["spec"]["containers"][0]["volumeMounts"].append({

‎tests/model_registry/rest_api/test_model_registry_rest_api.py‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,13 @@
2727
"model_registry_metadata_db_resources, model_registry_instance, registered_model_rest_api",
2828
[
2929
pytest.param(
30-
{},{},
30+
{},
31+
{},
3132
MODEL_REGISTER_DATA,
32-
),pytest.param(
33-
{"db_name": "mariadb"},{"db_name": "mariadb"},
33+
),
34+
pytest.param(
35+
{"db_name": "mariadb"},
36+
{"db_name": "mariadb"},
3437
MODEL_REGISTER_DATA,
3538
),
3639
],
@@ -84,7 +87,7 @@ def test_validate_model_registry_resource(
8487

8588
def test_model_registry_validate_api_version(
8689
self: Self,
87-
model_registry_instance,
90+
model_registry_instance,
8891
# registered_model_rest_api: dict[str, Any],
8992
):
9093
api_version = ModelRegistry(
@@ -98,7 +101,7 @@ def test_model_registry_validate_api_version(
98101

99102
def test_model_registry_validate_oauthproxy_enabled(
100103
self: Self,
101-
model_registry_instance,
104+
model_registry_instance,
102105
# registered_model_rest_api: dict[str, Any],
103106
):
104107
model_registry_instance_spec = model_registry_instance[0].instance.spec

‎tests/model_registry/rest_api/test_multiple_mr.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from typing import Self, Any
1+
from typing import Self
22
import pytest
33
from ocp_resources.model_registry_modelregistry_opendatahub_io import ModelRegistry
44

@@ -29,9 +29,7 @@
2929
"model_registry_instance",
3030
)
3131
class TestModelRegistryMultipleInstances:
32-
def test_validate_multiple_model_registry(
33-
self: Self, model_registry_instance, model_registry_namespace: str
34-
):
32+
def test_validate_multiple_model_registry(self: Self, model_registry_instance, model_registry_namespace: str):
3533
for num in range(0, NUM_RESOURCES["num_resources"]):
3634
mr = ModelRegistry(
3735
name=f"{MR_INSTANCE_BASE_NAME}{num}", namespace=model_registry_namespace, ensure_exists=True

‎tests/model_registry/upgrade/test_model_registry_upgrade.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class TestPostUpgradeModelRegistry:
4949
def test_retrieving_model_post_upgrade(
5050
self: Self,
5151
model_registry_client: list[ModelRegistryClient],
52-
model_registry_instance,
52+
model_registry_instance,
5353
):
5454
errors = get_and_validate_registered_model(
5555
model_registry_client=model_registry_client[0],
@@ -61,7 +61,7 @@ def test_retrieving_model_post_upgrade(
6161
@pytest.mark.post_upgrade
6262
def test_model_registry_instance_api_version_post_upgrade(
6363
self: Self,
64-
model_registry_instance,
64+
model_registry_instance,
6565
):
6666
# the following is valid for 2.22+
6767
api_version = model_registry_instance[0].instance.apiVersion
@@ -71,7 +71,7 @@ def test_model_registry_instance_api_version_post_upgrade(
7171
@pytest.mark.post_upgrade
7272
def test_model_registry_instance_spec_post_upgrade(
7373
self: Self,
74-
model_registry_instance,
74+
model_registry_instance,
7575
):
7676
model_registry_instance_spec = model_registry_instance[0].instance.spec
7777
assert not model_registry_instance_spec.istio

0 commit comments

Comments
 (0)