Updated unit tests

Author: Bobbins228

tests/unit_test.py

@@ -197,8 +197,13 @@ def test_config_creation():
     return config
 
 
-def test_cluster_creation():
+def test_cluster_creation(mocker):
+    mocker.patch(
+        "kubernetes.client.CustomObjectsApi.get_cluster_custom_object",
+        return_value={"spec": {"domain": ""}},
+    )
     cluster = Cluster(test_config_creation())
+    mocker.patch("kubernetes.config.load_kube_config", return_value="ignore")
     assert cluster.app_wrapper_yaml == "unit-test-cluster.yaml"
     assert cluster.app_wrapper_name == "unit-test-cluster"
     assert filecmp.cmp(
@@ -212,6 +217,10 @@ def test_default_cluster_creation(mocker):
         "codeflare_sdk.cluster.cluster.get_current_namespace",
         return_value="opendatahub",
     )
+    mocker.patch(
+        "kubernetes.client.CustomObjectsApi.get_cluster_custom_object",
+        return_value={"spec": {"domain": ""}},
+    )
     default_config = ClusterConfiguration(
         name="unit-test-default-cluster",
     )
@@ -254,7 +263,11 @@ def test_cluster_up_down(mocker):
         "kubernetes.client.CustomObjectsApi.delete_namespaced_custom_object",
         side_effect=arg_check_del_effect,
     )
-    cluster = test_cluster_creation()
+    mocker.patch(
+        "kubernetes.client.CustomObjectsApi.get_cluster_custom_object",
+        return_value={"spec": {"domain": ""}},
+    )
+    cluster = test_cluster_creation(mocker)
     cluster.up()
     cluster.down()
 
@@ -318,11 +331,15 @@ def uri_retreival(group, version, namespace, plural, *args):
 def test_cluster_uris(mocker):
     mocker.patch("kubernetes.config.load_kube_config", return_value="ignore")
     mocker.patch(
-        "kubernetes.client.CustomObjectsApi.list_namespaced_custom_object",
-        side_effect=uri_retreival,
+        "kubernetes.client.CustomObjectsApi.get_cluster_custom_object",
+        return_value={"spec": {"domain": ""}},
+    )
+    mocker.patch(
+        "kubernetes.client.NetworkingV1Api.list_namespaced_ingress",
+        return_value=ingress_retrieval(),
     )
 
-    cluster = test_cluster_creation()
+    cluster = test_cluster_creation(mocker)
     assert cluster.cluster_uri() == "ray://unit-test-cluster-head-svc.ns.svc:10001"
     assert (
         cluster.cluster_dashboard_uri()
@@ -363,13 +380,38 @@ def ray_addr(self, *args):
     return self._address
 
 
+def ingress_retrieval():
+    mock_ingress = client.V1Ingress(
+        metadata={"name": "mock-ingress-1"},
+        spec={
+            "rules": [
+                {
+                    "host": "ray-dashboard-unit-test-cluster-ns.apps.cluster.awsroute.org",
+                    "http": {
+                        "paths": [
+                            {
+                                "path": "/",
+                                "backend": {
+                                    "service_name": "unit-test-cluster-head-svc"
+                                },
+                            }
+                        ]
+                    },
+                }
+            ]
+        },
+    )
+    mock_ingress_list = client.V1IngressList(items=[mock_ingress])
+    return mock_ingress_list
+
+
 def test_ray_job_wrapping(mocker):
     mocker.patch("kubernetes.config.load_kube_config", return_value="ignore")
     mocker.patch(
-        "kubernetes.client.CustomObjectsApi.list_namespaced_custom_object",
-        side_effect=uri_retreival,
+        "kubernetes.client.CustomObjectsApi.get_cluster_custom_object",
+        return_value={"spec": {"domain": ""}},
     )
-    cluster = test_cluster_creation()
+    cluster = test_cluster_creation(mocker)
 
     mocker.patch(
         "ray.job_submission.JobSubmissionClient._check_connection_and_version_with_url",
@@ -455,6 +497,10 @@ def test_print_appwrappers(capsys):
 
 
 def test_ray_details(mocker, capsys):
+    mocker.patch(
+        "kubernetes.client.CustomObjectsApi.get_cluster_custom_object",
+        return_value={"spec": {"domain": ""}},
+    )
     ray1 = RayCluster(
         name="raytest1",
         status=RayClusterStatus.READY,
@@ -1512,6 +1558,10 @@ def get_aw_obj(group, version, namespace, plural):
 
 def test_get_cluster(mocker):
     mocker.patch("kubernetes.config.load_kube_config", return_value="ignore")
+    mocker.patch(
+        "kubernetes.client.CustomObjectsApi.get_cluster_custom_object",
+        return_value={"spec": {"domain": ""}},
+    )
     mocker.patch(
         "kubernetes.client.CustomObjectsApi.list_namespaced_custom_object",
         side_effect=get_ray_obj,
@@ -1540,6 +1590,9 @@ def test_list_clusters(mocker, capsys):
         "kubernetes.client.CustomObjectsApi.list_namespaced_custom_object",
         side_effect=get_obj_none,
     )
+    mocker.patch(
+        "kubernetes.client.NetworkingV1Api.list_namespaced_ingress",
+    )
     list_all_clusters("ns")
     captured = capsys.readouterr()
     assert captured.out == (
@@ -1612,6 +1665,10 @@ def test_list_queue(mocker, capsys):
 
 def test_cluster_status(mocker):
     mocker.patch("kubernetes.config.load_kube_config", return_value="ignore")
+    mocker.patch(
+        "kubernetes.client.CustomObjectsApi.get_cluster_custom_object",
+        return_value={"spec": {"domain": ""}},
+    )
     fake_aw = AppWrapper(
         "test", AppWrapperStatus.FAILED, can_run=True, job_state="unused"
     )
@@ -1690,6 +1747,10 @@ def test_cluster_status(mocker):
 
 
 def test_wait_ready(mocker, capsys):
+    mocker.patch(
+        "kubernetes.client.CustomObjectsApi.get_cluster_custom_object",
+        return_value={"spec": {"domain": ""}},
+    )
     mocker.patch("kubernetes.config.load_kube_config", return_value="ignore")
     mocker.patch("codeflare_sdk.cluster.cluster._app_wrapper_status", return_value=None)
     mocker.patch("codeflare_sdk.cluster.cluster._ray_cluster_status", return_value=None)
@@ -1717,7 +1778,11 @@ def test_wait_ready(mocker, capsys):
     )
 
 
-def test_jobdefinition_coverage():
+def test_jobdefinition_coverage(mocker):
+    mocker.patch(
+        "kubernetes.client.CustomObjectsApi.get_cluster_custom_object",
+        return_value={"spec": {"domain": ""}},
+    )
     abstract = JobDefinition()
     cluster = Cluster(test_config_creation())
     abstract._dry_run(cluster)
@@ -1730,7 +1795,11 @@ def test_job_coverage():
     abstract.logs()
 
 
-def test_DDPJobDefinition_creation():
+def test_DDPJobDefinition_creation(mocker):
+    mocker.patch(
+        "kubernetes.client.CustomObjectsApi.get_cluster_custom_object",
+        return_value={"spec": {"domain": ""}},
+    )
     ddp = DDPJobDefinition(
         script="test.py",
         m=None,
@@ -1775,7 +1844,7 @@ def test_DDPJobDefinition_dry_run(mocker):
         "codeflare_sdk.cluster.cluster.Cluster.cluster_dashboard_uri",
         return_value="",
     )
-    ddp = test_DDPJobDefinition_creation()
+    ddp = test_DDPJobDefinition_creation(mocker)
     cluster = Cluster(test_config_creation())
     ddp_job = ddp._dry_run(cluster)
     assert type(ddp_job) == AppDryRunInfo
@@ -1811,7 +1880,7 @@ def test_DDPJobDefinition_dry_run_no_cluster(mocker):
         return_value="opendatahub",
     )
 
-    ddp = test_DDPJobDefinition_creation()
+    ddp = test_DDPJobDefinition_creation(mocker)
     ddp.image = "fake-image"
     ddp_job = ddp._dry_run_no_cluster()
     assert type(ddp_job) == AppDryRunInfo
@@ -1844,6 +1913,10 @@ def test_DDPJobDefinition_dry_run_no_resource_args(mocker):
     Test that the dry run correctly gets resources from the cluster object
     when the job definition does not specify resources.
     """
+    mocker.patch(
+        "kubernetes.client.CustomObjectsApi.get_cluster_custom_object",
+        return_value={"spec": {"domain": ""}},
+    )
     mocker.patch(
         "codeflare_sdk.cluster.cluster.Cluster.cluster_dashboard_uri",
         return_value="",
@@ -1884,7 +1957,7 @@ def test_DDPJobDefinition_dry_run_no_cluster_no_resource_args(mocker):
         return_value="opendatahub",
     )
 
-    ddp = test_DDPJobDefinition_creation()
+    ddp = test_DDPJobDefinition_creation(mocker)
     try:
         ddp._dry_run_no_cluster()
         assert 0 == 1
@@ -1936,7 +2009,7 @@ def test_DDPJobDefinition_submit(mocker):
         "codeflare_sdk.cluster.cluster.Cluster.cluster_dashboard_uri",
         return_value="fake-dashboard-uri",
     )
-    ddp_def = test_DDPJobDefinition_creation()
+    ddp_def = test_DDPJobDefinition_creation(mocker)
     cluster = Cluster(test_config_creation())
     mocker.patch(
         "codeflare_sdk.job.jobs.get_current_namespace",
@@ -1967,7 +2040,7 @@ def test_DDPJob_creation(mocker):
         "codeflare_sdk.cluster.cluster.Cluster.cluster_dashboard_uri",
         return_value="fake-dashboard-uri",
     )
-    ddp_def = test_DDPJobDefinition_creation()
+    ddp_def = test_DDPJobDefinition_creation(mocker)
     cluster = Cluster(test_config_creation())
     mocker.patch(
         "codeflare_sdk.job.jobs.torchx_runner.schedule",
@@ -1990,7 +2063,7 @@ def test_DDPJob_creation(mocker):
 
 
 def test_DDPJob_creation_no_cluster(mocker):
-    ddp_def = test_DDPJobDefinition_creation()
+    ddp_def = test_DDPJobDefinition_creation(mocker)
     ddp_def.image = "fake-image"
     mocker.patch(
         "codeflare_sdk.job.jobs.get_current_namespace",