Replace model fixture with the standard one (#169)

Same issue as with experiments, that is, the `make_model` fixture is
missing.

---------

Co-authored-by: Serge Smertin <[email protected]>
Co-authored-by: Serge Smertin <[email protected]>

Author: larsgeorge-db

src/databricks/labs/ucx/providers/mixins/fixtures.py

@@ -474,6 +474,23 @@ def create(**kwargs):
     yield from factory("job", create, lambda item: ws.jobs.delete(item.job_id))
 
 
+@pytest.fixture
+def make_model(ws, make_random):
+    def create(
+        *,
+        model_name: str | None = None,
+        **kwargs,
+    ):
+        if model_name is None:
+            model_name = f"sdk-{make_random(4)}"
+
+        return ws.model_registry.get_model(
+            ws.model_registry.create_model(model_name, **kwargs).registered_model.name
+        ).registered_model_databricks
+
+    yield from factory("model", create, lambda item: ws.model_registry.delete_model(item.id))
+
+
 @pytest.fixture
 def make_pipeline(ws, make_random, make_notebook):
     def create(**kwargs) -> pipelines.CreatePipelineResponse:

tests/integration/conftest.py

@@ -11,8 +11,6 @@
 from databricks.sdk.core import Config
 from databricks.sdk.service.compute import CreatePolicyResponse
 from databricks.sdk.service.iam import AccessControlRequest, PermissionLevel
-from databricks.sdk.service.ml import ModelDatabricks
-from databricks.sdk.service.ml import PermissionLevel as ModelPermissionLevel
 from databricks.sdk.service.workspace import ObjectInfo, ObjectType
 
 from databricks.labs.ucx.config import InventoryTable
@@ -36,7 +34,6 @@
 NUM_TEST_GROUPS = int(os.environ.get("NUM_TEST_GROUPS", 5))
 NUM_TEST_INSTANCE_PROFILES = int(os.environ.get("NUM_TEST_INSTANCE_PROFILES", 3))
 NUM_TEST_CLUSTER_POLICIES = int(os.environ.get("NUM_TEST_CLUSTER_POLICIES", 3))
-NUM_TEST_MODELS = int(os.environ.get("NUM_TEST_MODELS", 3))
 NUM_TEST_TOKENS = int(os.environ.get("NUM_TEST_TOKENS", 3))
 
 NUM_THREADS = int(os.environ.get("NUM_TEST_THREADS", 20))
@@ -280,39 +277,6 @@ def cluster_policies(env: EnvironmentInfo, ws: WorkspaceClient) -> list[CreatePo
     Threader(executables).run()
 
 
-@pytest.fixture
-def models(ws: WorkspaceClient, env: EnvironmentInfo) -> list[ModelDatabricks]:
-    logger.debug("Creating models")
-
-    test_models: list[ModelDatabricks] = [
-        ws.model_registry.get_model(
-            ws.model_registry.create_model(f"{env.test_uid}-test-{i}").registered_model.name
-        ).registered_model_databricks
-        for i in range(NUM_TEST_MODELS)
-    ]
-
-    _set_random_permissions(
-        test_models,
-        "id",
-        RequestObjectType.REGISTERED_MODELS,
-        env,
-        ws,
-        permission_levels=[
-            ModelPermissionLevel.CAN_READ,
-            ModelPermissionLevel.CAN_MANAGE,
-            ModelPermissionLevel.CAN_MANAGE_PRODUCTION_VERSIONS,
-            ModelPermissionLevel.CAN_MANAGE_STAGING_VERSIONS,
-        ],
-    )
-
-    yield test_models
-
-    logger.debug("Deleting test models")
-    executables = [partial(ws.model_registry.delete_model, m.name) for m in test_models]
-    Threader(executables).run()
-    logger.debug("Test models deleted")
-
-
 @pytest.fixture
 def tokens(ws: WorkspaceClient, env: EnvironmentInfo) -> list[AccessControlRequest]:
     logger.debug("Adding token-level permissions to groups")
@@ -389,15 +353,13 @@ def workspace_objects(ws: WorkspaceClient, env: EnvironmentInfo) -> WorkspaceObj
 @pytest.fixture
 def verifiable_objects(
     cluster_policies,
-    models,
     tokens,
     workspace_objects,
 ) -> list[tuple[list, str, RequestObjectType | None]]:
     _verifiable_objects = [
         (workspace_objects, "workspace_objects", None),
         (tokens, "tokens", RequestObjectType.AUTHORIZATION),
         (cluster_policies, "policy_id", RequestObjectType.CLUSTER_POLICIES),
-        (models, "id", RequestObjectType.REGISTERED_MODELS),
     ]
     yield _verifiable_objects
 

tests/integration/test_e2e.py

@@ -134,6 +134,8 @@ def test_e2e(
     make_instance_pool_permissions,
     make_cluster,
     make_cluster_permissions,
+    make_model,
+    make_registered_model_permissions,
     make_experiment,
     make_experiment_permissions,
     make_job,
@@ -168,6 +170,23 @@ def test_e2e(
         ([cluster], "cluster_id", RequestObjectType.CLUSTERS),
     )
 
+    model = make_model()
+    make_registered_model_permissions(
+        object_id=model.id,
+        permission_level=random.choice(
+            [
+                PermissionLevel.CAN_READ,
+                PermissionLevel.CAN_MANAGE,
+                PermissionLevel.CAN_MANAGE_PRODUCTION_VERSIONS,
+                PermissionLevel.CAN_MANAGE_STAGING_VERSIONS,
+            ]
+        ),
+        group_name=ws_group.display_name,
+    )
+    verifiable_objects.append(
+        ([model], "experiment_id", RequestObjectType.EXPERIMENTS),
+    )
+
     experiment = make_experiment()
     make_experiment_permissions(
         object_id=experiment.experiment_id,