OCM-15511 | ci: Use cluster spec to check the ready and waiting status in the Day1Readiness step

Author: yuwang-RH

tests/utils/exec/rosacli/cluster_service.go

@@ -506,11 +506,11 @@ func (c *clusterService) WaitForClusterPassUninstalled(clusterID string, interva
 func (c *clusterService) WaitForClusterPassWaiting(clusterID string, interval int, timeoutMin int) error {
 	endTime := time.Now().Add(time.Duration(timeoutMin) * time.Minute)
 	for time.Now().Before(endTime) {
-		output, err := c.DescribeClusterAndReflect(clusterID)
+		clusterJsonData, err := c.GetJSONClusterDescription(clusterID)
 		if err != nil {
 			return err
 		}
-		if !strings.Contains(output.State, constants.Waiting) {
+		if clusterJsonData.DigString("state") != constants.Waiting {
 			log.Logger.Infof("Cluster %s is not in waiting state anymore", clusterID)
 			return nil
 		}

tests/utils/handler/cluster_handler.go

@@ -878,6 +878,11 @@ func (ch *clusterHandler) WaitForClusterReady(timeoutMin int) error {
 	endTime := time.Now().Add(time.Duration(timeoutMin) * time.Minute)
 	sleepTime := 0
 	for time.Now().Before(endTime) {
+		clusterJsonData, _ := clusterService.GetJSONClusterDescription(clusterID)
+		if clusterJsonData.DigString("state") == constants.Ready {
+			log.Logger.Infof("Cluster %s is ready now.", clusterID)
+			return nil
+		}
 		description, err := clusterService.DescribeClusterAndReflect(clusterID)
 		if err != nil {
 			return err
@@ -886,9 +891,6 @@ func (ch *clusterHandler) WaitForClusterReady(timeoutMin int) error {
 		ch.clusterDetail.ConsoleURL = description.ConsoleURL
 		ch.clusterDetail.InfraID = description.InfraID
 		switch description.State {
-		case constants.Ready:
-			log.Logger.Infof("Cluster %s is ready now.", clusterID)
-			return nil
 		case constants.Uninstalling:
 			return fmt.Errorf("cluster %s is %s now. Cannot wait for it ready",
 				clusterID, constants.Uninstalling)