Merge pull request #6081 from ptalgulk01/migrate-mco-layering

MCO-2275: Migrate OS layering tests from openshift-tests-private

Author: openshift-merge-bot[bot]

test/extended-priv/const.go

@@ -39,6 +39,10 @@ const (
 	LayeringBaseImageReleaseInfo = "rhel-coreos"
 	// LayeringBaseImageReleaseInfoRhel10 is the name of the RHEL10 layering base image in release info
 	LayeringBaseImageReleaseInfoRhel10 = "rhel-coreos-10"
+	// CoreExtensionsImageReleaseInfo is the name of the core extensions image in release info
+	CoreExtensionsImageReleaseInfo = "rhel-coreos-extensions"
+	// CoreExtensionsImageReleaseInfoRhel10 is the name of the RHEL10 core extensions image in release info
+	CoreExtensionsImageReleaseInfoRhel10 = "rhel-coreos-10-extensions"
 	// GenericMCTemplate is the name of a MachineConfig template that can be fully configured by parameters
 	GenericMCTemplate = "generic-machine-config-template.yml"
 

test/extended-priv/jsondata.go

@@ -116,9 +116,24 @@ func (jd *JSONData) ItemSafe(index int) (*JSONData, error) {
 	if !ok {
 		return nil, fmt.Errorf("data is not a list: %v", jd.data)
 	}
+
+	if index < 0 || index >= len(listData) {
+		return nil, fmt.Errorf("Index %d out of range for list of length %d", index, len(listData))
+	}
+
 	return &JSONData{listData[index]}, nil
 }
 
+// Item returns the value of a given item in a list, in case of error it fails the test
+func (jd *JSONData) Item(index int) *JSONData {
+	value, err := jd.ItemSafe(index)
+	if err != nil {
+		e2e.Failf("Could not get item [%d]. Error: %v", index, err)
+	}
+
+	return value
+}
+
 // Get returns the value of a key in the data, in case of error the returned value is nil
 func (jd *JSONData) Get(key string) *JSONData {
 	value, err := jd.GetSafe(key)

test/extended-priv/machineconfigpool.go

@@ -851,6 +851,38 @@ func (mcp *MachineConfigPool) waitForPinComplete(timeToWait time.Duration) error
 	return err
 }
 
+// GetReportedOsImageOverrideValue gets the os_image_url_override metric value for this MCP
+func (mcp *MachineConfigPool) GetReportedOsImageOverrideValue() (string, error) {
+	query := fmt.Sprintf(`os_image_url_override{pool="%s"}`, strings.ToLower(mcp.GetName()))
+
+	mon, err := exutil.NewMonitor(mcp.oc.AsAdmin())
+	if err != nil {
+		return "", err
+	}
+
+	osImageOverride, err := mon.SimpleQuery(query)
+	if err != nil {
+		return "", err
+	}
+
+	jsonOsImageOverride := JSON(osImageOverride)
+	status := jsonOsImageOverride.Get("status").ToString()
+	if status != "success" {
+		return "", fmt.Errorf("Query %s execution failed: %s", query, osImageOverride)
+	}
+
+	logger.Infof("%s metric is:%s", query, osImageOverride)
+
+	results := jsonOsImageOverride.Get("data").Get("result")
+	resultList := results.ToList()
+	if len(resultList) == 0 {
+		return "", fmt.Errorf("Query %s returned no results", query)
+	}
+
+	metricValue := results.Item(0).Get("value").Item(1).ToString()
+	return metricValue, nil
+}
+
 // RecoverFromDegraded updates the current and desired machine configs so that the pool can recover from degraded state once the offending MC is deleted
 func (mcp *MachineConfigPool) RecoverFromDegraded() error {
 	logger.Infof("Recovering %s pool from degraded status", mcp.GetName())