Final Commit for PR Merge

Author: Raghul-M

go.mod

@@ -9,6 +9,7 @@ require (
 	github.com/openshift/client-go v0.0.0-20221019143426-16aed247da5c
 	github.com/project-codeflare/multi-cluster-app-dispatcher v1.37.0
 	github.com/ray-project/kuberay/ray-operator v0.0.0-20231016183545-097828931d15
+	github.com/stretchr/testify v1.8.4
 	k8s.io/api v0.26.3
 	k8s.io/apimachinery v0.26.3
 	k8s.io/client-go v0.26.3
@@ -47,12 +48,13 @@ require (
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/prometheus/client_golang v1.14.0 // indirect
 	github.com/prometheus/client_model v0.3.0 // indirect
 	github.com/prometheus/common v0.37.0 // indirect
 	github.com/prometheus/procfs v0.8.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/stretchr/testify v1.8.4 // indirect
+	github.com/stretchr/objx v0.5.0 // indirect
 	golang.org/x/net v0.12.0 // indirect
 	golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
 	golang.org/x/sys v0.10.0 // indirect

go.sum

@@ -381,6 +381,7 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=

support/batch_test.go

@@ -29,7 +29,7 @@ import (
 func TestGetJob(t *testing.T) {
 
 	g := gomega.NewGomegaWithT(t)
-	// Create a fake client that returns different Job objects.
+
 	fakeJobs := []runtime.Object{
 		&batchv1.Job{
 			ObjectMeta: metav1.ObjectMeta{
@@ -49,7 +49,6 @@ func TestGetJob(t *testing.T) {
 	jobFunc := Job(test, "my-namespace", "my-job-1")
 	job := jobFunc(g)
 
-	// Assertions
 	g.Expect(job.Name).To(gomega.Equal("my-job-1"))
 	g.Expect(job.Namespace).To(gomega.Equal("my-namespace"))
 

support/environment_test.go

@@ -123,7 +123,7 @@ func TestGetClusterType(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			os.Setenv(ClusterTypeEnvVar, tt.envVarValue)
-			actual := GetClusterType(ttt) // Pass tt as an argument to GetClusterType
+			actual := GetClusterType(ttt)
 			if actual != tt.expected {
 				gomega.Expect(actual).To(
 					gomega.Equal(tt.expected),

support/image_test.go

@@ -33,7 +33,6 @@ func TestGetImageStream(t *testing.T) {
 
 	err := fakeClient.Get(context.TODO(), client.ObjectKey{Name: "my-imagestream-1", Namespace: "my-namespace"}, image)
 	g.Expect(err).ToNot(gomega.HaveOccurred())
-	// Assertions
 	g.Expect(image.Name).To(gomega.Equal("my-imagestream-1"))
 	g.Expect(image.Namespace).To(gomega.Equal("my-namespace"))
 }

support/ingress_test.go

@@ -13,7 +13,7 @@ import (
 func TestGetIngress(t *testing.T) {
 
 	g := gomega.NewGomegaWithT(t)
-	// Create a fake client that returns different Ingress objects.
+	// Create a fake client that returns Ingress objects.
 	fakeIngress := []runtime.Object{
 		&networkingv1.Ingress{
 			ObjectMeta: metav1.ObjectMeta{
@@ -33,9 +33,6 @@ func TestGetIngress(t *testing.T) {
 	ingressFunc := Ingress(test, "my-namespace", "my-ingress-1")
 	ingress := ingressFunc(g)
 
-	//fmt.Printf("Retrieved ingress object: %+v\n", ingress)
-
-	// Assertions
 	g.Expect(ingress.Name).To(gomega.Equal("my-ingress-1"))
 	g.Expect(ingress.Namespace).To(gomega.Equal("my-namespace"))
 }

support/machine_test.go

@@ -38,124 +38,3 @@ func TestGetMachineSets(t *testing.T) {
 	g.Expect(machine.Namespace).To(gomega.Equal("openshift-machine-api"))
 
 }
-
-/*
-import (
-
-	"testing"
-
-	"github.com/onsi/gomega"
-	machinev1beta1 "github.com/openshift/api/machine/v1beta1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/client-go/kubernetes/fake"
-
-	"sigs.k8s.io/controller-runtime/pkg/client"
-
-    "k8s.io/client-go/kubernetes"
-
-)
-
-func TestGetMachines(t *testing.T) {
-	g := gomega.NewWithT(t)
-
-	// Create a fake client with test data
-	scheme := runtime.NewScheme()
-	_ = machinev1beta1.AddToScheme(scheme)
-	testmachines := []client.Object{
-		&machinev1beta1.Machine{
-			ObjectMeta: metav1.ObjectMeta{
-				Name:      "machine-1",
-				Namespace: "default",
-			},
-			// ...
-		},
-		&machinev1beta1.Machine{
-			ObjectMeta: metav1.ObjectMeta{
-				Name:      "machine-2",
-				Namespace: "default",
-			},
-			// ...
-		},
-	}
-	fakeClient := fake.NewSimpleClientset(testmachines...)
-
-	// Define the machine set name to use in the test
-	machineSetName := "my-machine-set"
-
-	// Create a fake test object with the fake client
-	test := fakeTest{t, fakeClient}
-
-	// Call the GetMachines function and assert the result
-	result := GetMachines(test, machineSetName)
-	g.Expect(result).To(gomega.HaveLen(2))
-	g.Expect(result[0].Name).To(gomega.Equal("machine-1"))
-	g.Expect(result[1].Name).To(gomega.Equal("machine-2"))
-}
-
-// Define a fake test object that implements the Test interface
-type fakeTest struct {
-	*testing.T
-	client kubernetes.Interface
-}
-
-// Implement the Test interface for the fakeTest object
-func (f fakeTest) Client() kubernetes.Interface {
-	return f.client
-}
-*/
-/*
-
-func TestGetMachines(t *testing.T) {
-	g := gomega.NewWithT(t)
-
-	scheme := runtime.NewScheme()
-	_ = machinev1beta1.AddToScheme(scheme)
-	// Create a fake client and add some test data
-	testmachines := []client.Object{
-		&machinev1beta1.Machine{
-			ObjectMeta: metav1.ObjectMeta{
-				Name:      "machine-1",
-				Namespace: "default",
-			},
-			// ...
-		},
-		&machinev1beta1.Machine{
-			ObjectMeta: metav1.ObjectMeta{
-				Name:      "machine-2",
-				Namespace: "default",
-			},
-			// ...
-		},
-	}
-	_ = NewFakeKubeClientWithMachines(scheme, testmachines...)
-	// Define the machine set name to use in the test
-	machineSetName := "my-machine-set"
-
-	test := With(t).(*T)
-
-
-
-	// Call the GetMachines function and assert the result
-	result := GetMachines(test, machineSetName)
-	g.Expect(result).To(gomega.HaveLen(3))
-	g.Expect(result[0].Name).To(gomega.Equal("machine-1"))
-	g.Expect(result[1].Name).To(gomega.Equal("machine-2"))
-	}
-
-*/
-/*
-import (
-    "testing"
-	"github.com/stretchr/testify/assert"
-)
-func TestGetMachines(t *testing.T) {
-	t.Run("GetMachines returns machines for a given machine set", func(t *testing.T) {
-		machineSetName := "test-machine-set"
-		test := With(t).(*T)
-		machines := GetMachines(test, machineSetName)
-		assert.Len(t, machines, 1)
-		assert.Equal(t, machines[0].Name, "test-machine")
-	})
-}
-*/

support/ocm_test.go

@@ -1,5 +1,7 @@
 package support
 
+// Need to MOck OCM COnnection
+
 /*
 import (
 	"testing"
@@ -13,7 +15,7 @@ import (
 func TestGetMachinePools(t *testing.T) {
 	// Create a fake OpenShift client for testing
 	fakeClient := fake.NewSimpleClientset(machinePool{
-		MachinePool: &cmv1.MachinePool{
+		 &cmv1.MachinePool{
 			ObjectMeta: metav1.ObjectMeta{
 				Name:      "test-machinepool",
 				Namespace: "test-namespace",

support/ray_test.go

@@ -33,8 +33,6 @@ func TestGetRayJob(t *testing.T) {
 	err := fakeClient.Get(context.TODO(), client.ObjectKey{Name: "my-job-1", Namespace: "my-namespace"}, rayJob)
 	g.Expect(err).ToNot(gomega.HaveOccurred())
 
-	//fmt.Printf("Retrieved job object: %+v\n", rayJob)
-
 	g.Expect(rayJob.Name).To(gomega.Equal("my-job-1"))
 	g.Expect(rayJob.Namespace).To(gomega.Equal("my-namespace"))
 }
@@ -60,8 +58,6 @@ func TestGetRayCluster(t *testing.T) {
 	err := fakeClient.Get(context.TODO(), client.ObjectKey{Name: "my-cluster-1", Namespace: "my-namespace"}, raycluster)
 	g.Expect(err).ToNot(gomega.HaveOccurred())
 
-	//fmt.Printf("Retrieved job object: %+v\n", rayJob)
-
 	g.Expect(raycluster.Name).To(gomega.Equal("my-cluster-1"))
 	g.Expect(raycluster.Namespace).To(gomega.Equal("my-namespace"))
 }

support/route_test.go

@@ -34,7 +34,6 @@ func TestGetRoute(t *testing.T) {
 	err := fakeClient.Get(context.TODO(), client.ObjectKey{Name: "test-1", Namespace: "my-namespace"}, route)
 	g.Expect(err).ToNot(gomega.HaveOccurred())
 
-	// Assertions
 	g.Expect(route.Name).To(gomega.Equal("test-1"))
 	g.Expect(route.Namespace).To(gomega.Equal("my-namespace"))