Use generic function to retrieve machines

Author: sutaakar

test/e2e/instascale_machineset_test.go

@@ -32,9 +32,9 @@ func TestInstascaleMachineSet(t *testing.T) {
 	})
 
 	// look for machine set with aw name - expect to find it
-	test.Expect(MachineSets(test)).Should(ContainElement(WithTransform(MachineSetId, Equal("test-instascale"))))
-	// look for machine set replica - expect not to find it
-	test.Expect(MachineExists(test)).Should(BeFalse())
+	test.Expect(GetMachineSets(test)).Should(ContainElement(WithTransform(MachineSetId, Equal("test-instascale"))))
+	// look for machine belonging to the machine set, there should be none
+	test.Expect(GetMachines(test, "test-instascale")).Should(BeEmpty())
 
 	// // Setup batch job and AppWrapper
 	_, aw, err := createInstaScaleJobAppWrapper(test, namespace, cm)
@@ -44,14 +44,14 @@ func TestInstascaleMachineSet(t *testing.T) {
 	test.Eventually(AppWrapper(test, namespace, aw.Name), TestTimeoutGpuProvisioning).
 		Should(WithTransform(AppWrapperState, Equal(mcadv1beta1.AppWrapperStateActive)))
 
-	//look for machine set replica - expect to find it
-	test.Eventually(MachineExists(test), TestTimeoutLong).Should(BeTrue())
+	// look for machine belonging to the machine set - expect to find it
+	test.Eventually(Machines(test, "test-instascale"), TestTimeoutLong).Should(HaveLen(1))
 
 	// assert that the AppWrapper goes to "Completed" state
-	test.Eventually(AppWrapper(test, namespace, aw.Name), TestTimeoutShort).
+	test.Eventually(AppWrapper(test, namespace, aw.Name), TestTimeoutMedium).
 		Should(WithTransform(AppWrapperState, Equal(mcadv1beta1.AppWrapperStateCompleted)))
 
-	// look for machine set replica - expect not to find it
-	test.Eventually(MachineExists(test), TestTimeoutLong).Should(BeFalse())
+	// look for machine belonging to the machine set - there should be none
+	test.Eventually(Machines(test, "test-instascale"), TestTimeoutLong).Should(BeEmpty())
 
 }

test/support/machine.go

@@ -0,0 +1,42 @@
+package support
+
+import (
+	"github.com/onsi/gomega"
+
+	"k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	machinev1beta1 "github.com/openshift/api/machine/v1beta1"
+)
+
+func GetMachineSets(t Test) ([]machinev1beta1.MachineSet, error) {
+	ms, err := t.Client().Machine().MachineV1beta1().MachineSets("openshift-machine-api").List(t.Ctx(), metav1.ListOptions{})
+	t.Expect(err).NotTo(gomega.HaveOccurred())
+	return ms.Items, err
+}
+
+func Machines(t Test, machineSetName string) func(g gomega.Gomega) []machinev1beta1.Machine {
+	return func(g gomega.Gomega) []machinev1beta1.Machine {
+		machine, err := t.Client().Machine().MachineV1beta1().Machines("openshift-machine-api").List(t.Ctx(), metav1.ListOptions{LabelSelector: "machine.openshift.io/cluster-api-machineset=" + machineSetName})
+		g.Expect(err).NotTo(gomega.HaveOccurred())
+		return machine.Items
+	}
+}
+
+func GetMachines(t Test, machineSetName string) []machinev1beta1.Machine {
+	t.T().Helper()
+	return Machines(t, machineSetName)(t)
+}
+
+func MachineSetId(machineSet machinev1beta1.MachineSet) string {
+	return machineSet.Name
+}
+
+func MachineSetsExist(t Test) (bool, error) {
+	ms, err := GetMachineSets(t)
+	if err != nil && errors.IsNotFound(err) {
+		return false, err
+	}
+	t.Expect(err).NotTo(gomega.HaveOccurred())
+	return ms != nil, err
+}