Move OSD cluster ID into codeflare.go

Author: sutaakar

test/support/clusterpools.go

@@ -1,24 +1,18 @@
 package support
 
 import (
-	"context"
-	"fmt"
-	"os"
-	"strings"
-
 	"github.com/onsi/gomega"
+
 	ocmsdk "github.com/openshift-online/ocm-sdk-go"
 	cmv1 "github.com/openshift-online/ocm-sdk-go/clustersmgmt/v1"
 )
 
-var (
-	ClusterID string = os.Getenv("CLUSTERID")
-	TestName  string = "test-instascale"
-)
-
 func MachinePools(t Test, connection *ocmsdk.Connection) func(g gomega.Gomega) []*cmv1.MachinePool {
+	osdClusterId, found := GetOsdClusterId()
+	t.Expect(found).To(gomega.BeTrue(), "OSD cluster id not found, please configure environment properly")
+
 	return func(g gomega.Gomega) []*cmv1.MachinePool {
-		machinePoolsListResponse, err := connection.ClustersMgmt().V1().Clusters().Cluster(ClusterID).MachinePools().List().Send()
+		machinePoolsListResponse, err := connection.ClustersMgmt().V1().Clusters().Cluster(osdClusterId).MachinePools().List().Send()
 		g.Expect(err).NotTo(gomega.HaveOccurred())
 		return machinePoolsListResponse.Items().Slice()
 	}
@@ -32,21 +26,3 @@ func GetMachinePools(t Test, connection *ocmsdk.Connection) []*cmv1.MachinePool
 func MachinePoolId(machinePool *cmv1.MachinePool) string {
 	return machinePool.ID()
 }
-
-func CheckNodePools(connection *ocmsdk.Connection, awName string) (foundNodePool bool, err error) {
-	nodePoolsConnection := connection.ClustersMgmt().V1().Clusters().Cluster(ClusterID).NodePools().List()
-	nodePoolsListResponse, err := nodePoolsConnection.SendContext(context.Background())
-	if err != nil {
-		return false, fmt.Errorf("unable to send request, error: %v", err)
-	}
-	nodePoolsList := nodePoolsListResponse.Items()
-	nodePoolsList.Range(func(index int, item *cmv1.NodePool) bool {
-		instanceName, _ := item.GetID()
-		if strings.Contains(instanceName, awName) {
-			foundNodePool = true
-		}
-		return true
-	})
-
-	return foundNodePool, err
-}

test/support/codeflare.go

@@ -36,6 +36,8 @@ const (
 	InstaScaleOcmSecretName = "INSTASCALE_OCM_SECRET_NAME"
 	// The namespace where a secret containing InstaScale OCM token is stored.
 	InstaScaleOcmSecretNamespace = "INSTASCALE_OCM_SECRET_NAMESPACE"
+	// Cluster ID for OSD cluster used in tests, used for testing InstaScale
+	OsdClusterID = "CLUSTERID"
 )
 
 func GetCodeFlareSDKVersion() string {
@@ -62,6 +64,10 @@ func GetInstaScaleOcmSecretNamespace() string {
 	return lookupEnvOrDefault(InstaScaleOcmSecretNamespace, "default")
 }
 
+func GetOsdClusterId() (string, bool) {
+	return os.LookupEnv(OsdClusterID)
+}
+
 func lookupEnvOrDefault(key, value string) string {
 	if v, ok := os.LookupEnv(key); ok {
 		return v

test/support/config_map.go

@@ -18,6 +18,7 @@ package support
 
 import (
 	"github.com/onsi/gomega"
+
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )

test/support/ocm.go

@@ -21,8 +21,10 @@ import (
 	"os"
 
 	"github.com/onsi/gomega"
-	ocmsdk "github.com/openshift-online/ocm-sdk-go"
+
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	ocmsdk "github.com/openshift-online/ocm-sdk-go"
 )
 
 func CreateOCMConnection(test Test) *ocmsdk.Connection {