Adding coverage for the case of an openshift cluster

Author: akram

.coveragerc

@@ -0,0 +1,7 @@
+[run]
+omit =
+    src/**/test_*.py,,src/codeflare_sdk/common/utils/unit_test_support.py
+
+[report]
+exclude_lines =
+    pragma: no cover

src/codeflare_sdk/ray/cluster/cluster.py

@@ -228,7 +228,7 @@ def apply(self, force=False):
                 print(f"AppWrapper: '{self.config.name}' has successfully been created")
             else:
                 api_instance = crds.get(api_version="ray.io/v1", kind="RayCluster")
-                self._component_resources_apply(namespace, api_instance, force)
+                self._component_resources_apply(namespace, api_instance)
                 print(
                     f"Ray Cluster: '{self.config.name}' has successfully been applied"
                 )

src/codeflare_sdk/ray/cluster/test_cluster.py

@@ -30,6 +30,7 @@
     get_ray_obj_with_status,
     get_aw_obj_with_status,
     patch_cluster_with_dynamic_client,
+    route_list_retrieval,
 )
 from codeflare_sdk.ray.cluster.cluster import _is_openshift_cluster
 from pathlib import Path
@@ -148,6 +149,39 @@ def test_cluster_apply_with_file(mocker):
     cluster.down()
 
 
+def test_cluster_apply_without_appwrapper(mocker):
+    # Mock Kubernetes client and dynamic client methods
+    mocker.patch("kubernetes.client.ApisApi.get_api_versions")
+    mocker.patch("kubernetes.config.load_kube_config", return_value="ignore")
+    mock_dynamic_client = mocker.Mock()
+    mocker.patch("codeflare_sdk.ray.cluster.cluster.Cluster._throw_for_no_raycluster")
+    mocker.patch(
+        "kubernetes.dynamic.DynamicClient.resources", new_callable=mocker.PropertyMock
+    )
+    mocker.patch(
+        "codeflare_sdk.ray.cluster.cluster.Cluster.create_resource",
+        return_value="./tests/test_cluster_yamls/ray/default-ray-cluster.yaml",
+    )
+    mocker.patch("kubernetes.config.load_kube_config", return_value="ignore")
+
+    # Create a cluster configuration with appwrapper set to False
+    cluster = create_cluster(mocker, 1, write_to_file=False)
+    cluster.config.appwrapper = None
+    patch_cluster_with_dynamic_client(mocker, cluster, mock_dynamic_client)
+
+    # Mock listing RayCluster to simulate it doesn't exist
+    mocker.patch(
+        "kubernetes.client.CustomObjectsApi.list_namespaced_custom_object",
+        return_value=get_obj_none("ray.io", "v1", "ns", "rayclusters"),
+    )
+
+    # Call the apply method
+    cluster.apply()
+
+    # Assertions
+    print("Cluster applied without AppWrapper.")
+
+
 def test_cluster_up_down_no_mcad(mocker):
     mocker.patch("codeflare_sdk.ray.cluster.cluster.Cluster._throw_for_no_raycluster")
     mocker.patch("kubernetes.config.load_kube_config", return_value="ignore")
@@ -223,6 +257,52 @@ def test_cluster_uris(mocker):
         == "Dashboard not available yet, have you run cluster.up()?"
     )
 
+    mocker.patch(
+        "codeflare_sdk.ray.cluster.cluster._is_openshift_cluster", return_value=True
+    )
+    mocker.patch(
+        "kubernetes.client.CustomObjectsApi.list_namespaced_custom_object",
+        return_value={
+            "items": [
+                {
+                    "metadata": {
+                        "name": "ray-dashboard-unit-test-cluster",
+                    },
+                    "spec": {
+                        "host": "ray-dashboard-unit-test-cluster-ns.apps.cluster.awsroute.org",
+                        "tls": {},  # Indicating HTTPS
+                    },
+                }
+            ]
+        },
+    )
+    cluster = create_cluster(mocker)
+    assert (
+        cluster.cluster_dashboard_uri()
+        == "http://ray-dashboard-unit-test-cluster-ns.apps.cluster.awsroute.org"
+    )
+    mocker.patch(
+        "kubernetes.client.CustomObjectsApi.list_namespaced_custom_object",
+        return_value={
+            "items": [
+                {
+                    "metadata": {
+                        "name": "ray-dashboard-unit-test-cluster",
+                    },
+                    "spec": {
+                        "host": "ray-dashboard-unit-test-cluster-ns.apps.cluster.awsroute.org",
+                        "tls": {"termination": "passthrough"},  # Indicating HTTPS
+                    },
+                }
+            ]
+        },
+    )
+    cluster = create_cluster(mocker)
+    assert (
+        cluster.cluster_dashboard_uri()
+        == "https://ray-dashboard-unit-test-cluster-ns.apps.cluster.awsroute.org"
+    )
+
 
 def test_ray_job_wrapping(mocker):
     import ray