RHOAIENG-16055: new(tests): test to start a Workbench, by creating the Notebook CR directly #94

jiridanek · 2025-01-15T17:04:03Z

Description

This is a port of

https://github.com/skodjob/odh-e2e/blob/main/src/test/java/io/odh/test/e2e/standard/NotebookST.java#L78-L125

How Has This Been Tested?

figure out when/how to use unprivileged k8s client

Merge criteria:

The commits are squashed in a cohesive manner and have meaningful messages.
Testing instructions have been added in the PR body (for PRs involving changes that are not immediately obvious).
The developer has manually tested the changes and verified that the changes work

github-actions · 2025-01-15T17:04:21Z

The following are automatically added/executed:

PR size label.
Run pre-commit
Run tox

Available user actions:

To mark a PR as WIP, add /wip in a comment. To remove it from the PR comment /wip cancel to the PR.
To block merging of a PR, add /hold in a comment. To un-block merging of PR comment /hold cancel.
To mark a PR as approved, add /lgtm in a comment. To remove, add /lgtm cancel.
lgtm label removed on each new commit push.
To mark PR as verified comment /verified to the PR, to un-verify comment /verified cancel to the PR.
verified label removed on each new commit push.

Supported labels

{'/hold', '/verified', '/lgtm', '/wip'}

rnetser · 2025-01-19T07:57:53Z

tests/workbenches/conftest.py

@@ -0,0 +1,309 @@
+from __future__ import annotations
+
+import logging


please use simple_logger

rnetser · 2025-01-19T08:00:37Z

tests/workbenches/conftest.py

+    resource_manager.destroy()
+
+
+class KubeResourceManager:


please use ocpenshift python wrapper to CRUD resources

rnetser · 2025-01-19T08:02:38Z

tests/workbenches/conftest.py

+    OPENSHIFT_DOMAIN = "openshift.io/"
+    ODH_DOMAIN = "opendatahub.io/"


used in other places as well, please place under https://github.com/opendatahub-io/opendatahub-tests/blob/main/utilities/constants.py and re-use

rnetser · 2025-01-19T08:03:04Z

tests/workbenches/conftest.py

+
+    LABEL_DASHBOARD = ODH_DOMAIN + "dashboard"
+    LABEL_ODH_MANAGED = ODH_DOMAIN + "odh-managed"
+    LABEL_SIDECAR_ISTIO_INJECT = "sidecar.istio.io/inject"


rnetser · 2025-01-19T08:04:13Z

tests/workbenches/conftest.py

+        self.privileged_client = privileged_client
+        self.resources: list[ocp_resources.resource.Resource] = []
+
+    def createResourceWithoutWait(self, client: DynamicClient, resource: ocp_resources.resource.Resource):


please use python naming conventions

rnetser · 2025-01-19T08:09:43Z

tests/workbenches/notebook-controller/test_spawning.py

+import kubernetes.client
+from kubernetes.dynamic import DynamicClient
+
+from tests.workbenches.conftest import OdhAnnotationsLabels, OdhConstants, PodUtils


under conftest place fixtures; functions and classes should be under utils.py in the relevant dir

rnetser · 2025-01-19T08:10:50Z

tests/workbenches/notebook-controller/test_spawning.py

+    @classmethod
+    @property
+    @functools.cache
+    def logger(cls):


please use simple_logger

rnetser · 2025-01-19T08:12:26Z

tests/workbenches/notebook-controller/test_spawning.py

+            ),
+        },
+    )
+    def testCreateSimpleNotebook(self, function_resource_manager, admin_client, unprivileged_client):


all setup steps (e.g namespace, pvc) should be done in fixtures
please check existing fixtures and re-use

rnetser · 2025-01-19T08:13:33Z

tests/workbenches/notebook-controller/test_spawning.py

+# }
+
+
+def loadDefaultNotebook(client: DynamicClient, namespace: str, name: str, image: str) -> Notebook:


functions should go under utils.py in the relevant dir

rnetser · 2025-01-19T08:18:32Z

tests/workbenches/notebook-controller/test_data/notebook.yaml

@@ -0,0 +1,146 @@
+apiVersion: kubeflow.org/v1
+kind: Notebook


is there a template for this in the cluster?

no, we don't have template for notebooks, the only template we have is hardcoded in odh-dashboard

https://github.com/opendatahub-io/odh-dashboard/blob/eabd833b5f4b0508fe5b06235f4f670fc7e9a0db/backend/src/utils/notebookUtils.ts#L260-L280

Why do we need the yaml? Can't we pass the arguments like any other resource?

i like it this way, see no reason to rewrite it

lugi0 · 2025-01-20T08:47:01Z

tests/workbenches/notebook-controller/test_spawning.py

+
+        with allure.step("Create Notebook CR"):
+            # notebookImage: str = NotebookType.getNotebookImage(NotebookType.JUPYTER_MINIMAL_IMAGE, NotebookType.JUPYTER_MINIMAL_2023_2_TAG);
+            notebookImage: str = "quay.io/modh/odh-minimal-notebook-container@sha256:615af25cfd4f3f2981b173e1a5ab24cb79f268ee72dabbddb6867ee1082eb902"


Can this be fetched dinamically from the cluster?

yes, I changed the approach, thanks

lugi0 · 2025-01-20T08:47:35Z

tests/workbenches/notebook-controller/test_spawning.py

+    notebookString = pathlib.Path(
+        "/Users/jdanek/IdeaProjects/opendatahub-tests/tests/workbenches/notebook-controller/test_data/notebook.yaml"
+    ).read_text()


Pretty sure this won't work :)

ofc, fixed now

lugi0 · 2025-01-20T08:49:31Z

tests/workbenches/notebook-controller/test_spawning.py

+    afterTestSteps={
+        Step(
+            value="Delete ODH operator and all created resources",
+            expected="Operator is removed and all other resources as well",
+        )
+    },


I don't think this has been functionally implemented but FWIW we don't plan to remove the operator after the test run

fixed the doc comment, I never tried to implement operator removal here

lugi0 · 2025-01-20T08:52:58Z

tests/workbenches/docs.py

@@ -0,0 +1,39 @@
+from typing import Callable


What is this used for? does it just provide additional documentation for tests in e.g. https://github.com/opendatahub-io/opendatahub-tests/pull/94/files#diff-358f1122838e1ac22415822c5a85d419e2d111c64285e488695af1cf6f03d490R35 ?
IMHO if this is implemented we should use it across the repo to keep consistency, so this should go under a higher level directory, but it should probably be discussed beforehand. Can you attend the shift left wg meeting to do so?

I'm not sure how useful this docs is going to be. Yes, it is only for structured comments. The Java version was able to render markdown docs from this, but I did not implement this in Python here.

IMO it's fine for now to only have this in the workbenches tests, and we (in workbenches team) need to decide if this is what we want to promote, or if we decide to delete this eventually.

I would suggest using docstrings in general rather than trying to adapt to Java practices in this case: https://peps.python.org/pep-0257/
We haven't settled on a specific style and we're not yet rendering the documentation, but this seems to be the best bet to standardize across the repo

lugi0 · 2025-01-20T08:54:07Z

tests/workbenches/conftest.py

@@ -0,0 +1,309 @@
+from __future__ import annotations


I think the majority of these classes could be avoided if you instead used the wrapper library https://github.com/RedHatQE/openshift-python-wrapper

used ocp_resources more, thanks

lugi0 · 2025-02-07T10:56:35Z

tests/workbenches/docs.py

@@ -0,0 +1,39 @@
+from typing import Callable


I would suggest using docstrings in general rather than trying to adapt to Java practices in this case: https://peps.python.org/pep-0257/
We haven't settled on a specific style and we're not yet rendering the documentation, but this seems to be the best bet to standardize across the repo

lugi0 · 2025-02-07T11:21:39Z

tests/workbenches/resources.py

+class Notebook(NamespacedResource):
+    api_group: str = "kubeflow.org"


IMHO this should be a class in ocp_resources itself

allright, maybe if I start contributing to ocp_resources, I can try to do the work

There is a tool that will auto-generate the class for ocp_resources, https://github.com/RedHatQE/openshift-python-wrapper/blob/main/class_generator/README.md
If you need any help with it feel free to ask any of us!

Add Kubeflow Notebook CR RedHatQE/openshift-python-wrapper#2331

lugi0 · 2025-02-07T11:23:05Z

tests/workbenches/utils.py

+    GLOBAL_POLL_INTERVAL_MEDIUM = 10
+
+
+class OcpResourceManager:


What is the specific goal you have with this class? if you use resources as classes from ocp_resources you will have their lifecycle handled by the wrapper library directly

removed OcpResourceManager

lugi0 · 2025-02-07T11:23:40Z

tests/workbenches/utils.py

+            raise RuntimeError(f"Exceptions during cleanup: {exceptions}")
+
+
+class PodUtils:


Same as above, if you use the Pod class you can already handle this without having to reimplement these checks

lugi0 · 2025-02-07T11:26:32Z

utilities/infra.py

@@ -44,6 +44,7 @@ def create_ns(
    teardown: bool = True,
    delete_timeout: int = 4 * 60,
    labels: Optional[dict[str, str]] = None,
+    annotations: Optional[dict[str, str]] = None,


I think we want to move away from option and use the xx | yy syntax by importing from future, see https://docs.python.org/3/library/stdtypes.html#types-union

adolfo-ab · 2025-02-07T15:10:15Z

tests/workbenches/notebook-controller/test_data/notebook.yaml

@@ -0,0 +1,146 @@
+apiVersion: kubeflow.org/v1
+kind: Notebook


Why do we need the yaml? Can't we pass the arguments like any other resource?

adolfo-ab · 2025-02-07T15:11:39Z

tests/workbenches/notebook-controller/test_spawning.py

+        image_dict = {"jupyter-minimal-notebook": "jupyter-minimal-notebook"}
+    else:
+        image_dict = {"jupyter-minimal-notebook": "s2i-minimal-notebook"}
+    return registry_path + "/" + controllers_namespace + "/" + image_dict[image_name] + ":" + image_tag


can we use fstring for better readability?

adolfo-ab · 2025-02-07T15:13:02Z

tests/workbenches/notebook-controller/test_spawning.py

+    @TestDoc(
+        description=Desc("Create simple Notebook with all needed resources and see if Operator creates it properly"),
+        contact=Contact(name="Jakub Stejskal", email="[email protected]"),
+        steps={
+            Step(
+                value="Create namespace for Notebook resources with proper name, labels and annotations",
+                expected="Namespace is created",
+            ),
+            Step(value="Create PVC with proper labels and data for Notebook", expected="PVC is created"),
+            Step(
+                value="Create Notebook resource with Jupyter Minimal image in pre-defined namespace",
+                expected="Notebook resource is created",
+            ),
+            Step(
+                value="Wait for Notebook pods readiness",
+                expected="Notebook pods are up and running, Notebook is in ready state",
+            ),
+        },
+    )


I find this excessively verbose, but I'm open to use this format if we all agree.

adolfo-ab · 2025-02-07T15:14:17Z

tests/workbenches/notebook-controller/test_spawning.py

+
+    nb = Notebook(yaml_file=io.StringIO(notebook_string))
+
+    return nb


no need to have nb variable, just return Notebook(yaml_file=io.StringIO(notebook_string))

it's convenient to place breakpoint, if I ever wanted to do that, and look what's in nb

fixed now

adolfo-ab · 2025-02-07T15:14:28Z

tests/workbenches/resources.py

+class Notebook(NamespacedResource):
+    api_group: str = "kubeflow.org"


rnetser · 2025-02-10T14:46:13Z

tests/workbenches/conftest.py

+        name=request.param["name"],
+        namespace=request.param["namespace"],
+        label={constants.Dashboard.label: "true"},
+        accessmodes="ReadWriteOnce",


Suggested change

accessmodes="ReadWriteOnce",

accessmodes=PersistentVolumeClaim.AccessMode.RWO,

rnetser · 2025-02-10T14:48:57Z

tests/workbenches/notebook-controller/test_spawning.py

+from utilities import constants
+
+
+@SuiteDoc(


please see @lugi0 comment above on dosctrings

rnetser · 2025-02-10T14:51:43Z

tests/workbenches/notebook-controller/test_spawning.py

+    @pytest.mark.parametrize(
+        "users_namespace",
+        [
+            pytest.param(
+                {"name": NTB_NAMESPACE},
+            )
+        ],
+        indirect=True,
+    )
+    @pytest.mark.parametrize(
+        "users_persistent_volume_claim",
+        [
+            pytest.param(
+                {"name": NTB_NAME, "namespace": NTB_NAMESPACE},
+            )
+        ],
+        indirect=True,
+    )


iiuc all resources should be created together, so please use 1 set of parameters,
e,g

@pytest.mark.parametrize( "users_namespace, users_persistent_volume_claim", [ pytest.param( {"name": NTB_NAMESPACE}, {"name": "xxx"}, ) ], indirect=True, )

rnetser · 2025-02-10T14:52:32Z

tests/workbenches/conftest.py

+
+
+@pytest.fixture(scope="function")
+def users_persistent_volume_claim(


call users_namespace and then you can use it's attributes. e.g users_namespace.name to set the namespace

rnetser · 2025-02-10T14:55:18Z

tests/workbenches/notebook-controller/test_spawning.py

+
+
+def _get_notebook_image(image_name: str, image_tag: str) -> str:
+    registry_path = "image-registry.openshift-image-registry.svc:5000"


can we get it from the cluster?

ended up following advice from @mwaykole and defined this as a constant

RHOAIENG-16055: new(tests): test to start a Workbench, by creating the Notebook CR directly #94 (review)

rnetser · 2025-02-10T14:55:57Z

tests/workbenches/notebook-controller/test_spawning.py

+                )
+
+
+def _get_notebook_image(image_name: str, image_tag: str) -> str:


please place functions under utils.py file to keep the tests file only for tests

rnetser · 2025-02-10T14:56:56Z

tests/workbenches/notebook-controller/test_spawning.py

+    notebook_string = notebook_string.replace("my-project", namespace).replace("my-workbench", name)
+    # Set new Route url
+    route_host: str = list(
+        Route.get(client=client, name=constants.Dashboard.route_name, namespace=py_config["applications_namespace"])


i think that client=client should be dyn_client=....

rnetser · 2025-02-10T14:58:17Z

tests/workbenches/utils.py

+#
+from __future__ import annotations
+
+import logging


please use get_logger from simple_logger

rnetser · 2025-02-10T14:58:54Z

tests/workbenches/utils.py

+import kubernetes.dynamic
+from kubernetes.dynamic import DynamicClient, ResourceField
+
+import ocp_resources.pod


when possible, please use explicit imports (i.e of only what is needed)

from before I'm used to import packages, not individual names, as described for example in https://google.github.io/styleguide/pyguide.html#22-imports

ok, fixed

rnetser · 2025-02-10T15:01:03Z

utilities/constants.py

@@ -109,6 +112,19 @@ class StorageClassName:
    NFS: str = "nfs"


+class Dashboard:
+    route_name = "odh-dashboard" if py_config.get("distribution") == "upstream" else "rhods-dashboard"
+    label = OPENDATAHUB_IO + "/dashboard"


arg name should represent what it contains; please place under labels class

mwaykole · 2025-02-24T10:42:33Z

tests/workbenches/notebook-controller/test_spawning.py

+from tests.workbenches.utils import step
+
+
+class TestNotebookST:


what is ST?

I don't rightly know, that's how it was called in https://github.com/skodjob/odh-e2e/blob/main/src/test/java/io/odh/test/e2e/standard/NotebookST.java

will remove that suffix

mwaykole · 2025-02-24T10:43:26Z

tests/workbenches/notebook-controller/test_spawning.py

+
+
+def _get_notebook_image(image_name: str, image_tag: str) -> str:
+    registry_path = "image-registry.openshift-image-registry.svc:5000"


This can be added in constant files

… Notebook CR directly

myakove · 2025-02-25T10:19:38Z

tests/workbenches/notebook-controller/test_spawning.py

+            ),
+        """
+        with step("Create Notebook CR"):
+            notebook_image: str = get_notebook_image("jupyter-minimal-notebook", "2024.2")


notebook_image: str there is no need to declare type here when you call typed function get_notebook_image

Nit: It's better to call functions with arg=value, if for some reason get_notebook_image need to be refactored you will not be bound to positional arguments.

well, https://github.com/RedHatQE/openshift-python-wrapper/pull/2331/files#diff-326458d10fbb8ff9e3b95dfec81f67dc7349f85a51d7539fa6c985072e4f9ab3R348-R351 has the types explicitly there too...

changed to use named parameter

myakove · 2025-02-25T10:22:01Z

tests/workbenches/notebook-controller/test_spawning.py

+
+        with step("Wait for Notebook pod readiness"):
+            with notebook:
+                pods = Pod.get(


pods can be empty list and your test will pass without test anything, please assert if not pods

myakove · 2025-02-25T10:24:39Z

tests/workbenches/notebook-controller/test_spawning.py

+                    dyn_client=unprivileged_client, namespace=self.NTB_NAMESPACE, label_selector=f"app={self.NTB_NAME}"
+                )
+                for pod in pods:
+                    pod.wait_for_condition(condition="Ready", status="True")


All resources have condition and status please use them.

pod.wait_for_condition(condition=pod.Condition.READY, status=pod.Condition.Status.TRUE)

myakove · 2025-02-25T10:28:22Z

tests/workbenches/utils.py

+
+
+def get_notebook_image(image_name: str, image_tag: str) -> str:
+    controllers_namespace = py_config["applications_namespace"]


Simple way to do this will be:

image_name = "jupyter-minimal-notebook" if py_config.get("distribution") == "upstream" else "s2i-minimal-notebook" return f"{INTERNAL_IMAGE_REGISTRY_PATH}/{py_config["applications_namespace"]}/{image_name}:{image_tag}"

And you can drop image_name from the function args

I'm not bothered by the extra argument, and i think that at callsite

notebook_image: str = get_notebook_image(image_name="jupyter-minimal-notebook", image_tag="2024.2")

makes more sense than if image_name parameter was omitted.

I could (eventually) have enum for the possible image names...

Up to you, I would remove this function and just set the path in the test where it's needed. (only used in one place) and introduce more complicity without any reason.

+1 to that; used once and should be set where used

myakove · 2025-02-25T10:30:52Z

tests/workbenches/utils.py

+    # Replace image
+    notebook_string = notebook_string.replace("notebook_image_placeholder", image)
+
+    return Notebook(yaml_file=io.StringIO(notebook_string))


Resource accept kind_dict, it's better to work with dict then with string.
You can load the YAML file with yaml, change the needed values inside the dict and use it to create your resource.

At that point I can just as well follow other recommendations here to have the file content be a python literal in code...

I guess I'll do that.

went with the kind_dict, but kept using the yaml text file for the initial data

and kept using string replacement, because modifying the dict selectively is way more work; I need to also update values inside long strings such as container args in the pod

changed to using dict

myakove · 2025-02-25T10:44:53Z

tests/workbenches/utils.py

+    notebook_string = notebook_string.replace("my-project", namespace).replace("my-workbench", name)
+    # Set new Route url
+    route_name = "odh-dashboard" if py_config.get("distribution") == "upstream" else "rhods-dashboard"
+    route_host: str = list(


For better error handeling I think you should do:

route = Route(client=dyn_client, name=route_name, namespace=py_config["applications_namespace"]) if not route.exists: assert .......

with the current code you will get IndexError: list index out of range which say nothing.

myakove · 2025-02-26T11:48:25Z

tests/workbenches/notebook-controller/test_spawning.py

+                )
+                assert pods, "The expected notebook pods were not found"
+                for pod in pods:
+                    pod.wait_for_condition(condition=pod.Condition.READY, status=pod.Condition.Status.TRUE)


right now you will fail of the first pod in wait_for_condition, depends on what you want to test maybe it's better to collect the failed pods and assert once with all of them.

thanks for the note; failing fast is what I want

myakove · 2025-02-26T11:51:16Z

tests/workbenches/utils.py

+
+
+def get_notebook_image(image_name: str, image_tag: str) -> str:
+    controllers_namespace = py_config["applications_namespace"]


Up to you, I would remove this function and just set the path in the test where it's needed. (only used in one place) and introduce more complicity without any reason.

myakove · 2025-02-26T11:52:57Z

tests/workbenches/utils.py

+
+
+def load_default_notebook(dyn_client: DynamicClient, namespace: str, name: str, image: str) -> Notebook:
+    notebook_string = (pathlib.Path(__file__).parent / "notebook-controller/test_data/notebook.yaml").read_text()


I think it's better to load the YAML here and work with dict which is python object and not with strings.

ack, will see if I can get approvals from rhoai people without making the change; personally I don't want to make it

please work with a dict; it is more readable and pythonic

rnetser · 2025-02-27T14:34:27Z

tests/workbenches/conftest.py

+
+
+@pytest.fixture(scope="class")
+def users_namespace(


you can use unprivileged_model_namespace https://github.com/opendatahub-io/opendatahub-tests/blob/main/tests/model_serving/model_server/authentication/conftest.py#L334 fixture; move it to upper conftest.
you can also add to create_ns an new bool arg - add_dashboard_label and apply the logic there

rnetser · 2025-02-27T14:36:18Z

tests/workbenches/notebook-controller/test_spawning.py

+#
+# Copyright Skodjob authors.
+# License: Apache License 2.0 (see the file LICENSE or http://apache.org/licenses/LICENSE-2.0.html).
+#


we currently do not have license info in our files; any reason to add it?

saw no reason to remove it, more like; the code originally comes from odh-e2e repo

guess the world will not end in fire if I delete the header; deleted it now

rnetser · 2025-02-27T14:39:45Z

tests/workbenches/notebook-controller/test_spawning.py

+    # before_test_steps
+        1. Step(value="Deploy Pipelines Operator", expected="Pipelines operator is available on the cluster"),
+        2. Step(value="Deploy ServiceMesh Operator", expected="ServiceMesh operator is available on the cluster"),
+        3. Step(value="Deploy Serverless Operator", expected="Serverless operator is available on the cluster"),
+        4. Step(value="Install ODH operator", expected="Operator is up and running and is able to serve it's operands"),
+        5. Step(value="Deploy DSCI", expected="DSCI is created and ready"),
+        6. Step(value="Deploy DSC", expected="DSC is created and ready"),
+
+    # after_test_steps
+        1. Step(value="Delete all created resources", expected="All created resources are removed"),


this is not done in the tests so i am not sure why we need to include it here.
you can call skip_if_no_deployed_openshift_serverless and skip_if_no_deployed_openshift_service_mesh to skip the tests if these are not deployed or create new fixtures to fail if these are mandaotry

rnetser · 2025-02-27T14:43:39Z

tests/workbenches/notebook-controller/test_spawning.py

+                expected="Notebook pods are up and running, Notebook is in ready state",
+            ),
+        """
+        with step("Create Notebook CR"):


can you please explain what is the value of using with step..?

just fancy documentation; deleted that part

rnetser · 2025-02-27T14:44:29Z

tests/workbenches/notebook-controller/test_spawning.py

+                expected="Notebook pods are up and running, Notebook is in ready state",
+            ),
+        """
+        with step("Create Notebook CR"):


each step should either be a fixture (i.e setup for a test) or a test by itself. tests should verify one thing

removed with step()

rnetser · 2025-02-27T14:49:43Z

tests/workbenches/utils.py

+
+
+def get_notebook_image(image_name: str, image_tag: str) -> str:
+    controllers_namespace = py_config["applications_namespace"]


+1 to that; used once and should be set where used

rnetser · 2025-02-27T14:50:41Z

tests/workbenches/utils.py

+
+
+def load_default_notebook(dyn_client: DynamicClient, namespace: str, name: str, image: str) -> Notebook:
+    notebook_string = (pathlib.Path(__file__).parent / "notebook-controller/test_data/notebook.yaml").read_text()


please work with a dict; it is more readable and pythonic

rnetser · 2025-02-27T14:53:36Z

tests/workbenches/utils.py

+    """Gets the username for the client (see kubectl -v8 auth whoami)"""
+    self_subject_review_resource: Resource = dyn_client.resources.get(
+        api_version="authentication.k8s.io/v1", kind="SelfSubjectReview"
+    )
+    self_subject_review: ResourceInstance = dyn_client.create(self_subject_review_resource)
+    username: str = self_subject_review.status.userInfo.username
+    return username


wouldn'r running oc whoami with run_command be easier?

I don't think so, this way I should be able to use the same function with unpriviliged_client in some future test

rnetser · 2025-02-27T14:53:52Z

tests/workbenches/utils.py

+@contextmanager
+def step(description: str) -> Generator[None, None, None]:
+    yield


can you please explain why this is needed?

so that with step() that I had in the test does not throw exception that step() is not defined

I've removed the definition and all usages now

rnetser · 2025-02-27T14:54:21Z

utilities/constants.py

@@ -107,6 +107,7 @@ class KserveAuth:

    class OpenDataHubIo:
        MANAGED: str = "opendatahub.io/managed"
+        SERVICE_MESH: str = "opendatahub.io/service-mesh"


please save opendatahub.io and re-use

…e test where it's needed

jiridanek marked this pull request as draft January 15, 2025 17:04

github-actions bot added size/xl size/xxl and removed size/xl labels Jan 15, 2025

jiridanek marked this pull request as ready for review January 17, 2025 09:27

jiridanek force-pushed the jd_notebooks_first branch from 330e5e2 to 92744bb Compare January 17, 2025 09:30

github-actions bot added size/xl and removed size/xxl labels Jan 17, 2025

jiridanek force-pushed the jd_notebooks_first branch 2 times, most recently from f5edaa0 to c1eddd8 Compare January 17, 2025 09:49

rnetser requested changes Jan 19, 2025

View reviewed changes

lugi0 reviewed Jan 20, 2025

View reviewed changes

jiridanek force-pushed the jd_notebooks_first branch 3 times, most recently from b956376 to bf53997 Compare February 4, 2025 08:57

jiridanek requested a review from rnetser February 4, 2025 08:58

github-actions bot added the commented-by-jiridanek label Feb 4, 2025

jiridanek force-pushed the jd_notebooks_first branch 3 times, most recently from 12f966f to 21ee191 Compare February 4, 2025 09:24

lugi0 reviewed Feb 7, 2025

View reviewed changes

adolfo-ab reviewed Feb 7, 2025

View reviewed changes

rnetser requested changes Feb 10, 2025

View reviewed changes

jiridanek requested a review from a team as a code owner February 24, 2025 10:25

mwaykole reviewed Feb 24, 2025

View reviewed changes

jiridanek added 3 commits February 24, 2025 13:00

RHOAIENG-16055: new(tests): test to start a Workbench by creating the…

7e88b6e

… Notebook CR directly

fixup, address review comments

802a63b

fixup, address readiness check comments

30dafc5

jiridanek force-pushed the jd_notebooks_first branch from c4cfa99 to f404037 Compare February 24, 2025 12:11

fixup, rename OpenDataHub to OpenDataHubIo

6e68377

jiridanek force-pushed the jd_notebooks_first branch from f404037 to 6e68377 Compare February 24, 2025 12:16

jiridanek added 3 commits February 24, 2025 13:25

fixup, move helper functions from test_spawning.py into utils.py

4efb397

fixup, inline local variable

e79ba63

fixup, dyn_client

60c1c27

jiridanek requested a review from rnetser February 24, 2025 12:32

fixup, use privileged client for load_default_notebook

0fea8dc

jiridanek mentioned this pull request Feb 25, 2025

Add Kubeflow Notebook CR RedHatQE/openshift-python-wrapper#2331

Merged

jiridanek added 2 commits February 25, 2025 10:49

fixup, use Notebook resource from ocp_resources

bbb7135

fixup, single @pytest.mark.parametrize

422a5ae

myakove reviewed Feb 25, 2025

View reviewed changes

jiridanek added 4 commits February 25, 2025 12:37

fixup, named args

2d6361b

fixup, use kind_dict

417b86e

fixup, check resources were found

752b8f1

fixup, reformat

4c11ed8

jiridanek force-pushed the jd_notebooks_first branch from dbf7920 to 4c11ed8 Compare February 25, 2025 11:45

jiridanek added 3 commits February 25, 2025 12:49

fixup, uv lock --upgrade-package openshift-python-wrapper

e141558

fixup, wait for condition

6739627

fixup, undo useless reorder

2055dc3

myakove reviewed Feb 26, 2025

View reviewed changes

rnetser requested changes Feb 27, 2025

View reviewed changes

jiridanek added 7 commits February 27, 2025 19:59

fixup, remove license header

f46021f

fixup, remove step contextmanager

107a3be

fixup, please save opendatahub.io and re-use

f068cef

fixup, use fixture value instead of string constants

dccc67b

fixup, reformat

27585b9

fixup, work with a dict; it is more readable and pythonic

7de662a

fixup, remove get_notebook_image function and just set the path in th…

c0d608e

…e test where it's needed

		@@ -0,0 +1,309 @@
		from __future__ import annotations

		import logging

		OPENSHIFT_DOMAIN = "openshift.io/"
		ODH_DOMAIN = "opendatahub.io/"

		# }


		def loadDefaultNotebook(client: DynamicClient, namespace: str, name: str, image: str) -> Notebook:

		class Notebook(NamespacedResource):
		api_group: str = "kubeflow.org"

		raise RuntimeError(f"Exceptions during cleanup: {exceptions}")


		class PodUtils:


		nb = Notebook(yaml_file=io.StringIO(notebook_string))

		return nb

	accessmodes="ReadWriteOnce",
	accessmodes=PersistentVolumeClaim.AccessMode.RWO,



		@pytest.fixture(scope="function")
		def users_persistent_volume_claim(



		def _get_notebook_image(image_name: str, image_tag: str) -> str:
		registry_path = "image-registry.openshift-image-registry.svc:5000"

		from tests.workbenches.utils import step


		class TestNotebookST:



		def get_notebook_image(image_name: str, image_tag: str) -> str:
		controllers_namespace = py_config["applications_namespace"]



		def load_default_notebook(dyn_client: DynamicClient, namespace: str, name: str, image: str) -> Notebook:
		notebook_string = (pathlib.Path(__file__).parent / "notebook-controller/test_data/notebook.yaml").read_text()

RHOAIENG-16055: new(tests): test to start a Workbench, by creating the Notebook CR directly #94

Are you sure you want to change the base?

RHOAIENG-16055: new(tests): test to start a Workbench, by creating the Notebook CR directly #94

Conversation

jiridanek commented Jan 15, 2025 • edited Loading

Description

How Has This Been Tested?

Merge criteria:

github-actions bot commented Jan 15, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jiridanek Feb 24, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jiridanek commented Jan 15, 2025 •

edited

Loading

jiridanek Feb 24, 2025 •

edited

Loading