make helpers more general for updating bd

Author: memalhot

batchtools/bd.py

@@ -70,13 +70,13 @@ def run(args: argparse.Namespace):
                     if name not in found:
                         print(f"{name} is not a GPU job and cannot be deleted.")
                         continue
-                    oc_delete(name)
+                    oc_delete("job", name)
             else:
                 # case where user does not provide jobs to delete, delete all
                 print("No job names provided -> deleting all GPU workloads:\n")
                 for job in gpu_jobs:
                     name = job.model.metadata.name
-                    oc_delete(name)
+                    oc_delete("job", name)
 
         except oc.OpenShiftPythonException as e:
             sys.exit(f"Error occurred while deleting jobs: {e}")

batchtools/br.py

@@ -268,7 +268,7 @@ def log_job_output(job_name: str, *, wait: bool, timeout: int | None) -> None:
             if timeout and (time.monotonic() - start) > timeout:
                 print(f"Timeout waiting for pod {pod_name} to complete")
                 print(f"Deleting pod {pod_name}")
-                oc_delete(job_name)
+                oc_delete("job", job_name)
                 return
 
             # sleep to avoid hammering the server

batchtools/helpers.py

@@ -21,9 +21,9 @@ def pretty_print(pod: oc.APIObject) -> str:
     return formatted_logs
 
 
-def oc_delete(job_name: str) -> None:
+def oc_delete(object: str, job_name: str) -> None:
     try:
         print(f"Deleting {job_name}")
-        oc.invoke("delete", ["job", job_name])
+        oc.invoke("delete", object, job_name)
     except oc.OpenShiftPythonException as e:
         print(f"Error occurred while deleting job: {e}")

tests/test_bd.py

@@ -70,17 +70,17 @@ def test_no_gpu_jobs(args: argparse.Namespace, ignored_jobs, capsys):
         assert "No GPU workloads to delete" in captured.out
 
 
-def test_delete_jobs(args: argparse.Namespace, jobs, capsys):
+def test_delete_obj(args: argparse.Namespace, jobs, capsys):
     args.job_names = []
     with (
         patch_jobs_selector(jobs),
         mock.patch("openshift_client.invoke") as mock_invoke,
     ):
         DeleteJobsCommand.run(args)
         captured = capsys.readouterr()
-        for job, ca in zip(jobs, mock_invoke.call_args_list):
-            assert f"Deleting {job.model.metadata.name}" in captured.out
-            assert ca.args == ("delete", ["job", job.model.metadata.name])
+        for obj, ca in zip(jobs, mock_invoke.call_args_list):
+            assert f"Deleting {obj.model.metadata.name}" in captured.out
+            assert ca.args == ("delete", "job", obj.model.metadata.name)
 
 
 def test_delete_jobs_fail(args: argparse.Namespace, failed_jobs, capsys):