updating machine sets functionality

Author: Fiona-Waters

test/e2e/instascale_test.go

@@ -65,17 +65,18 @@ func TestInstascale(t *testing.T) {
 
 	if machinePoolsExist {
 		// look for machine pool with aw name - expect not to find it
-		foundMachinePool, err := CheckMachinePools(connection, "test-instascale")
+		foundMachinePool, err := CheckMachinePools(connection, TestName)
 		test.Expect(err).NotTo(HaveOccurred())
 		test.Expect(foundMachinePool).To(BeFalse())
 	} else if nodePoolsExist {
 		// look for node pool with aw name - expect not to find it
-		foundNodePool, err := CheckNodePools(connection, "test-instascale")
+		foundNodePool, err := CheckNodePools(connection, TestName)
 		test.Expect(err).NotTo(HaveOccurred())
 		test.Expect(foundNodePool).To(BeFalse())
 	} else {
-		// TODO update to foundMachineSet
-		
+		foundMachineSet, err := CheckMachineSets(TestName)
+		test.Expect(err).NotTo(HaveOccurred())
+		test.Expect(foundMachineSet).To(BeFalse())
 	}
 
 	// Batch Job
@@ -197,17 +198,18 @@ func TestInstascale(t *testing.T) {
 
 	if machinePoolsExist {
 		// look for machine pool with aw name - expect to find it
-		foundMachinePool, err := CheckMachinePools(connection, "test-instascale")
+		foundMachinePool, err := CheckMachinePools(connection, TestName)
 		test.Expect(err).NotTo(HaveOccurred())
 		test.Expect(foundMachinePool).To(BeTrue())
 	} else if nodePoolsExist {
 		// look for node pool with aw name - expect to find it
-		foundNodePool, err := CheckNodePools(connection, "test-instascale")
+		foundNodePool, err := CheckNodePools(connection, TestName)
 		test.Expect(err).NotTo(HaveOccurred())
 		test.Expect(foundNodePool).To(BeTrue())
 	} else {
-		// TODO update to foundMachineSet
-		
+		foundMachineSet, err := CheckMachineSets(TestName)
+		test.Expect(err).NotTo(HaveOccurred())
+		test.Expect(foundMachineSet).To(BeTrue())
 	}
 
 	// Assert that the job has completed
@@ -230,16 +232,17 @@ func TestInstascale(t *testing.T) {
 
 	if machinePoolsExist {
 		// look for machine pool with aw name - expect to find it
-		foundMachinePool, err := CheckMachinePools(connection, "test-instascale")
+		foundMachinePool, err := CheckMachinePools(connection, TestName)
 		test.Expect(err).NotTo(HaveOccurred())
 		test.Expect(foundMachinePool).To(BeFalse())
 	} else if nodePoolsExist {
 		// look for node pool with aw name - expect to find it
-		foundNodePool, err := CheckNodePools(connection, "test-instascale")
+		foundNodePool, err := CheckNodePools(connection, TestName)
 		test.Expect(err).NotTo(HaveOccurred())
 		test.Expect(foundNodePool).To(BeFalse())
 	} else {
-		// TODO update to foundMachineSet
-		
+		foundMachineSet, err := CheckMachineSets(TestName)
+		test.Expect(err).NotTo(HaveOccurred())
+		test.Expect(foundMachineSet).To(BeFalse())
 	}
 }

test/support/clusterpools.go

@@ -9,12 +9,16 @@ import (
 	ocmsdk "github.com/openshift-online/ocm-sdk-go"
 	cmv1 "github.com/openshift-online/ocm-sdk-go/clustersmgmt/v1"
 	mapiclientset "github.com/openshift/client-go/machine/clientset/versioned"
+	"github.com/openshift/client-go/machine/listers/machine/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/labels"
 )
 
 var (
 	ClusterID     string = os.Getenv("CLUSTERID")
 	machineClient mapiclientset.Interface
+	msLister      v1beta1.MachineSetLister
+	TestName      string = "test-instascale"
 )
 
 const (
@@ -96,3 +100,16 @@ func MachineSetsCount() (numMachineSets int, err error) {
 
 	return machineSetsSize, nil
 }
+
+func CheckMachineSets(awName string) (foundMachineSet bool, err error) {
+	machineSets, err := msLister.MachineSets("").List(labels.Everything())
+	if err != nil {
+		return false, fmt.Errorf("error listing machine sets, error: %v", err)
+	}
+	for _, machineSet := range machineSets {
+		if strings.Contains(machineSet.Name, awName) {
+			foundMachineSet = true
+		}
+	}
+	return foundMachineSet, err
+}