Merge pull request #5589 from sergiordlr/migrate_machineconfignode_tests

MCO-2059: migrate machineconfignodes from private repo

Author: openshift-merge-bot[bot]

test/extended-priv/const.go

@@ -33,6 +33,9 @@ const (
 	// GenericMCTemplate is the name of a MachineConfig template that can be fully configured by parameters
 	GenericMCTemplate = "generic-machine-config-template.yml"
 
+	// NodeAnnotationState state of the mc
+	NodeAnnotationState = "machineconfiguration.openshift.io/state"
+
 	// AWSPlatform value used to identify aws infrastructure
 	AWSPlatform = "aws"
 	// GCPPlatform value used to identify gcp infrastructure
@@ -45,6 +48,9 @@ const (
 	// ExpirationDockerfileLabel Expiration label in Dockerfile
 	ExpirationDockerfileLabel = `LABEL maintainer="mco-qe-team" quay.expires-after=24h`
 
+	// DefaultExpectTimeout is the default timeout for expect operations
+	DefaultExpectTimeout = 10 * time.Second
+
 	// DefaultMinutesWaitingPerNode is the  number of minutes per node that the MCPs will wait to become updated
 	DefaultMinutesWaitingPerNode = 13
 
@@ -54,17 +60,13 @@ const (
 	// ExtensionsChangeIncWait extra minutes that MCPs will wait per node if we change the extensions in a configuration
 	ExtensionsChangeIncWait = 5
 
-	// TrueString string for true value
-	TrueString = "True"
-	// FalseString string for false value
-	FalseString = "False"
-
-	// DefaultExpectTimeout is the default timeout for expect operations
-	DefaultExpectTimeout = 10 * time.Second
-
 	// MachineAPINamespace is the MachineAPI namespace
 	MachineAPINamespace = "openshift-machine-api"
 
+	// Machine phase Provisioning
+	MachinePhaseProvisioning = "Provisioning"
+	// Machine phase Deleting
+	MachinePhaseDeleting = "Deleting"
 	// We use full name to get machineset/machine xref: https://access.redhat.com/solutions/7040368
 	// MachineSetFullName is the machineset fully qualified name
 	MachineSetFullName = "machineset.machine.openshift.io"
@@ -76,6 +78,11 @@ const (
 	// ControlPlaneMachineSetResource is the resource name for controlplanemachinesets
 	ControlPlaneMachineSetResource = "controlplanemachinesets"
 
+	// TrueString string for true value
+	TrueString = "True"
+	// FalseString string for false value
+	FalseString = "False"
+
 	// BusyBoxImage the multiplatform busybox image stored in openshifttest
 	BusyBoxImage = "quay.io/openshifttest/busybox@sha256:c5439d7db88ab5423999530349d327b04279ad3161d7596d2126dfb5b02bfd1f"
 	// AlpineImage the multiplatform alpine image stored in openshifttest

test/extended-priv/gomega_matchers.go

@@ -4,11 +4,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	logger "github.com/openshift/machine-config-operator/test/extended-priv/util/logext"
-
 	g "github.com/onsi/ginkgo/v2"
 	gomegamatchers "github.com/onsi/gomega/matchers"
 	"github.com/onsi/gomega/types"
+	logger "github.com/openshift/machine-config-operator/test/extended-priv/util/logext"
 )
 
 // struct implementing gomaega matcher interface
@@ -94,11 +93,21 @@ func HaveConditionField(conditionType, conditionField string, expected interface
 	return &conditionMatcher{conditionType: conditionType, field: conditionField, expected: expected}
 }
 
-// HaveDegradedMessage returns the gomega matcher to check if a resource is reporting the given degraded message
+// HaveNodeDegradedMessage returns the gomega matcher to check if a resource is reporting the given degraded message
+func HaveNodeDegradedMessage(expected interface{}) types.GomegaMatcher {
+	return &conditionMatcher{conditionType: "NodeDegraded", field: "message", expected: expected}
+}
+
+// HaveDegradedMessage returns the gomega matcher to check if a resource is reporting the given node degraded message
 func HaveDegradedMessage(expected interface{}) types.GomegaMatcher {
 	return &conditionMatcher{conditionType: "Degraded", field: "message", expected: expected}
 }
 
+// HaveAvailableMessage returns the gomega matcher to check if a resource is reporting the given node available message
+func HaveAvailableMessage(expected interface{}) types.GomegaMatcher {
+	return &conditionMatcher{conditionType: "Available", field: "message", expected: expected}
+}
+
 // DegradedMatcher struct implementing gomaega matcher interface to check Degraded condition
 type DegradedMatcher struct {
 	*conditionMatcher

test/extended-priv/machineconfig.go

@@ -9,7 +9,6 @@ import (
 	o "github.com/onsi/gomega"
 	exutil "github.com/openshift/machine-config-operator/test/extended-priv/util"
 	logger "github.com/openshift/machine-config-operator/test/extended-priv/util/logext"
-
 	"k8s.io/apimachinery/pkg/util/wait"
 )
 
@@ -39,6 +38,20 @@ func (mc *MachineConfig) SetTemplate(template Template) *MachineConfig {
 	return mc
 }
 
+// SetMCOTemplate set a template defined in the MCO testdata folder
+func (mc *MachineConfig) SetMCOTemplate(templateName string) *MachineConfig {
+	mc.Template = *NewMCOTemplate(mc.oc, templateName)
+	return mc
+}
+
+// SetParams set parameters defined in template
+func (mc *MachineConfig) SetParams(params ...string) *MachineConfig {
+	if len(params) > 0 {
+		mc.parameters = append(mc.parameters, params...)
+	}
+	return mc
+}
+
 func (mc *MachineConfig) create() {
 	mc.name = mc.name + "-" + exutil.GetRandomString()
 	params := []string{"-p", "NAME=" + mc.name, "POOL=" + mc.pool}

test/extended-priv/machineconfignode.go

@@ -9,22 +9,150 @@ type MachineConfigNode struct {
 	Resource
 }
 
+// MachineConfigNodeList resource type declaration
+type MachineConfigNodeList struct {
+	ResourceList
+}
+
 // NewMachineConfigNode constructor to get MCN resource
 func NewMachineConfigNode(oc *exutil.CLI, node string) *MachineConfigNode {
 	return &MachineConfigNode{Resource: *NewResource(oc, "machineconfignode", node)}
 }
 
-// IsPinnedImageSetsDegraded returns true if the PinnedImageSetsDegraded condition is true
+// NewMachineConfigNodeList constructor to get MCN list
+func NewMachineConfigNodeList(oc *exutil.CLI) *MachineConfigNodeList {
+	return &MachineConfigNodeList{ResourceList: *NewResourceList(oc, "machineconfignodes")}
+}
+
+// GetAll get list of MachineConfigNode
+func (mcnl *MachineConfigNodeList) GetAll() ([]*MachineConfigNode, error) {
+	resources, err := mcnl.ResourceList.GetAll()
+	if err != nil {
+		return nil, err
+	}
+
+	allMCNs := make([]*MachineConfigNode, 0, len(resources))
+	for _, mcn := range resources {
+		allMCNs = append(allMCNs, NewMachineConfigNode(mcnl.oc, mcn.GetName()))
+	}
+
+	return allMCNs, nil
+}
+
+// GetDesiredMachineConfigOfSpec get value of `.spec.configVersion.desired`
+func (mcn *MachineConfigNode) GetDesiredMachineConfigOfSpec() string {
+	return mcn.GetOrFail(`{.spec.configVersion.desired}`)
+}
+
+// GetDesiredMachineConfigOfStatus get value of `.status.configVersion.desired`
+func (mcn *MachineConfigNode) GetDesiredMachineConfigOfStatus() string {
+	return mcn.GetOrFail(`{.status.configVersion.desired}`)
+}
+
+// GetCurrentMachineConfigOfStatus get value of `.status.configVersion.current`
+func (mcn *MachineConfigNode) GetCurrentMachineConfigOfStatus() string {
+	return mcn.GetOrFail(`{.status.configVersion.current}`)
+}
+
+// GetPool get value of `.spec.pool.name`
+func (mcn *MachineConfigNode) GetPoolName() (string, error) {
+	return mcn.Get(`{.spec.pool.name}`)
+}
+
+// GetNode get value of `.spec.node.name`
+func (mcn *MachineConfigNode) GetNode() string {
+	return mcn.GetOrFail(`{.spec.node.name}`)
+}
+
+// GetUpdated get condition status of `Updated`
+func (mcn *MachineConfigNode) GetUpdated() string {
+	return mcn.GetConditionStatusByType("Updated")
+}
+
+// GetUpdatePrepared get condition status of `UpdatePrepared`
+func (mcn *MachineConfigNode) GetUpdatePrepared() string {
+	return mcn.GetConditionStatusByType("UpdatePrepared")
+}
+
+// GetUpdateExecuted get condition status of `UpdateExecuted`
+func (mcn *MachineConfigNode) GetUpdateExecuted() string {
+	return mcn.GetConditionStatusByType("UpdateExecuted")
+}
+
+// GetUpdatePostActionComplete get condition status of `UpdatePostActionComplete`
+func (mcn *MachineConfigNode) GetUpdatePostActionComplete() string {
+	return mcn.GetConditionStatusByType("UpdatePostActionComplete")
+}
+
+// GetUpdateComplete get condition status of `UpdateComplete`
+func (mcn *MachineConfigNode) GetUpdateComplete() string {
+	return mcn.GetConditionStatusByType("UpdateComplete")
+}
+
+// GetResumed get condition status of `Resumed`
+func (mcn *MachineConfigNode) GetResumed() string {
+	return mcn.GetConditionStatusByType("Resumed")
+}
+
+// GetUpdateCompatible get condition status of `UpdateCompatible`
+func (mcn *MachineConfigNode) GetUpdateCompatible() string {
+	return mcn.GetConditionStatusByType("UpdateCompatible")
+}
+
+// GetAppliedFilesAndOS get condition status of `AppliedFilesAndOS`
+func (mcn *MachineConfigNode) GetAppliedFilesAndOS() string {
+	return mcn.GetConditionStatusByType("AppliedFilesAndOS")
+}
+
+// GetCordoned get condition status of `Cordoned`
+func (mcn *MachineConfigNode) GetCordoned() string {
+	return mcn.GetConditionStatusByType("Cordoned")
+}
+
+// GetUncordoned get condition status of `Uncordoned`
+func (mcn *MachineConfigNode) GetUncordoned() string {
+	return mcn.GetConditionStatusByType("Uncordoned")
+}
+
+// GetDrained get condition status of `Drained`
+func (mcn *MachineConfigNode) GetDrained() string {
+	return mcn.GetConditionStatusByType("Drained")
+}
+
+// GetRebootedNode get condition status of `RebootedNode`
+func (mcn *MachineConfigNode) GetRebootedNode() string {
+	return mcn.GetConditionStatusByType("RebootedNode")
+}
+
+// GetReloadedCRIO get condition status of `ReloadedCRIO`
+func (mcn *MachineConfigNode) GetReloadedCRIO() string {
+	return mcn.GetConditionStatusByType("ReloadedCRIO")
+}
+
 func (mcn *MachineConfigNode) IsPinnedImageSetsDegraded() bool {
 	return mcn.IsConditionStatusTrue("PinnedImageSetsDegraded")
 }
 
-// IsPinnedImageSetsProgressing returns true if the PinnedImageSetsProgressing condition is true
 func (mcn *MachineConfigNode) IsPinnedImageSetsProgressing() bool {
 	return mcn.IsConditionStatusTrue("PinnedImageSetsProgressing")
 }
 
-// GetPinnedImageSetLastFailedError returns the last failed generation error for pinned image sets
+// GetDesiredMachineConfigOfSpec get value of `.spec.configVersion.desired`
 func (mcn *MachineConfigNode) GetPinnedImageSetLastFailedError() string {
 	return mcn.GetOrFail(`{.status.pinnedImageSets[*].lastFailedGenerationError}`)
 }
+
+// GetDesiredImage get value of `.spec.configImage.desiredImage`
+func (mcn *MachineConfigNode) GetSpecDesiredImage() (string, error) {
+	return mcn.Get(`{.spec.configImage.desiredImage}`)
+}
+
+// GetStatusDesiredImage get value of `.status.configImage.desiredImage`
+func (mcn *MachineConfigNode) GetStatusDesiredImage() (string, error) {
+	return mcn.Get(`{.status.configImage.desiredImage}`)
+}
+
+// GetStatusCurrentImage get value of `.status.configImage.currentImage`
+func (mcn *MachineConfigNode) GetStatusCurrentImage() (string, error) {
+	return mcn.Get(`{.status.configImage.currentImage}`)
+}