OCPCLOUD-1401: refactor to run same test against both mapi and capi

.gitignore

@@ -3,3 +3,6 @@
 .cache
 
 _out/
+
+# Test binaries
+*.test

Makefile

@@ -93,6 +93,21 @@ test-e2e-autoscaler: ## Run openshift specific e2e test including autoscaler
 test-e2e-periodic-autoscaler: ## Run openshift specific periodic e2e test including autoscaler
 	hack/ci-integration.sh $(GINKGO_ARGS) --label-filter='periodic&&autoscaler' -p
 
+.PHONY: test-mapi
+test-mapi: ## Run MAPI authoritative testing (MAPI auth, CAPI mirrors)
+	TEST_BACKEND_TYPE=MAPI TEST_AUTHORITATIVE_API=MAPI hack/ci-integration.sh $(GINKGO_ARGS) --label-filter='unified||mapi'
+
+.PHONY: test-capi
+test-capi: ## Run pure CAPI testing (no MAPI involvement)
+	TEST_BACKEND_TYPE=CAPI TEST_AUTHORITATIVE_API=CAPI hack/ci-integration.sh $(GINKGO_ARGS) --label-filter='unified'
+
+.PHONY: test-mapi-with-capi-auth
+test-mapi-with-capi-auth: ## Run tests with MAPI backend and CAPI authority (conversion layer)
+	TEST_BACKEND_TYPE=MAPI TEST_AUTHORITATIVE_API=CAPI hack/ci-integration.sh $(GINKGO_ARGS) --label-filter='unified'
+
+.PHONY: test-all
+test-all: test-mapi test-capi test-mapi-with-capi-auth ## Run all unified framework test scenarios
+
 .PHONY: help
 help:
 	@grep -E '^[a-zA-Z/0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'

pkg/e2e_test.go

@@ -9,6 +9,7 @@ import (
 
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/klog"
+	"sigs.k8s.io/controller-runtime/pkg/envtest/komega"
 
 	osconfigv1 "github.com/openshift/api/config/v1"
 	machinev1 "github.com/openshift/api/machine/v1beta1"
@@ -27,6 +28,7 @@ import (
 	_ "github.com/openshift/cluster-api-actuator-pkg/pkg/mapi"
 	_ "github.com/openshift/cluster-api-actuator-pkg/pkg/operators"
 	_ "github.com/openshift/cluster-api-actuator-pkg/pkg/providers"
+	_ "github.com/openshift/cluster-api-actuator-pkg/pkg/unified/e2e"
 )
 
 func init() {
@@ -75,6 +77,9 @@ var _ = BeforeSuite(func() {
 	client, err := framework.LoadClient()
 	Expect(err).ToNot(HaveOccurred())
 
+	// Set komega client for all tests
+	komega.SetClient(client)
+
 	ctx := framework.GetContext()
 
 	platform, err := framework.GetPlatform(ctx, client)

pkg/framework/ginkgo-labels.go

@@ -38,4 +38,7 @@ var (
 
 	// LabelConnectedOnly indicates that the test can run in a connection cluster only.
 	LabelConnectedOnly = ginkgo.Label("connected-only")
+
+	// LabelUnified applies to tests using the unified MAPI/CAPI testing framework.
+	LabelUnified = ginkgo.Label("unified")
 )

pkg/framework/utils.go

@@ -113,3 +113,17 @@ func GetControlPlaneHostAndPort(ctx context.Context, cl client.Client) (string,
 
 	return apiURL.Hostname(), int32(port), nil
 }
+
+// MergeLabels merges multiple label mappings into a single map.
+// Later maps override earlier ones for conflicting keys.
+func MergeLabels(labelMaps ...map[string]string) map[string]string {
+	result := make(map[string]string)
+
+	for _, labels := range labelMaps {
+		for k, v := range labels {
+			result[k] = v
+		}
+	}
+
+	return result
+}

pkg/unified/backends/backend_interface.go

@@ -0,0 +1,75 @@
+package backends
+
+import (
+	"context"
+	"fmt"
+
+	configv1 "github.com/openshift/api/config/v1"
+	corev1 "k8s.io/api/core/v1"
+	runtimeclient "sigs.k8s.io/controller-runtime/pkg/client"
+
+	"github.com/openshift/cluster-api-actuator-pkg/pkg/unified/config"
+)
+
+// MachineBackend defines the abstract interface for machine backends.
+type MachineBackend interface {
+	GetBackendType() config.BackendType
+	GetAuthoritativeAPI() config.BackendType
+	CreateMachineTemplate(ctx context.Context, client runtimeclient.Client, platform configv1.PlatformType, params BackendMachineTemplateParams) (interface{}, error)
+	DeleteMachineTemplate(ctx context.Context, client runtimeclient.Client, template interface{}) error
+	CreateMachineSet(ctx context.Context, client runtimeclient.Client, params BackendMachineSetParams) (interface{}, error)
+	DeleteMachineSet(ctx context.Context, client runtimeclient.Client, machineSet interface{}) error
+	WaitForMachineSetDeleted(ctx context.Context, client runtimeclient.Client, machineSet interface{}) error
+	WaitForMachinesRunning(ctx context.Context, client runtimeclient.Client, machineSet interface{}) error
+	GetMachineSetStatus(ctx context.Context, client runtimeclient.Client, machineSet interface{}) (*MachineSetStatus, error)
+	GetNodesFromMachineSet(ctx context.Context, client runtimeclient.Client, machineSet interface{}) ([]corev1.Node, error)
+}
+
+// BackendMachineSetParams defines common parameters for creating machine sets.
+type BackendMachineSetParams struct {
+	Name          string
+	Replicas      int32
+	Labels        map[string]string
+	Annotations   map[string]string
+	Template      interface{}
+	FailureDomain string
+	// AuthoritativeAPI specifies which API should be authoritative for this MachineSet
+	AuthoritativeAPI config.BackendType
+}
+
+// BackendMachineTemplateParams defines common parameters for creating machine templates.
+type BackendMachineTemplateParams struct {
+	Name     string
+	Platform configv1.PlatformType
+	Spec     interface{}
+}
+
+// MachineSetStatus defines common structure for machine set status.
+type MachineSetStatus struct {
+	Replicas          int32
+	AvailableReplicas int32
+	ReadyReplicas     int32
+	AuthoritativeAPI  string
+}
+
+// NewBackend creates appropriate backend instance based on configuration.
+func NewBackend(backendType config.BackendType, authoritativeAPI config.BackendType) (MachineBackend, error) {
+	switch backendType {
+	case config.BackendTypeMAPI:
+		return NewMAPIBackend(authoritativeAPI), nil
+	case config.BackendTypeCAPI:
+		return NewCAPIBackend(authoritativeAPI), nil
+	default:
+		return nil, fmt.Errorf("unsupported backend type: %s", backendType)
+	}
+}
+
+// NewMAPIBackend creates a new MAPI backend instance.
+func NewMAPIBackend(authoritativeAPI config.BackendType) MachineBackend {
+	return &mapiBackend{backendType: config.BackendTypeMAPI, authoritativeAPI: authoritativeAPI}
+}
+
+// NewCAPIBackend creates a new CAPI backend instance.
+func NewCAPIBackend(authoritativeAPI config.BackendType) MachineBackend {
+	return &capiBackend{backendType: config.BackendTypeCAPI, authoritativeAPI: authoritativeAPI}
+}