e2e: Support any storage class name

e2e/config.yaml

@@ -3,7 +3,11 @@ channelname: "ramen-gitops"
 channelnamespace: "ramen-samples"
 giturl: "https://github.com/RamenDR/ocm-ramen-samples.git"
 pvcspecs:
-  - storageclassname: rook-cephfs
-    accessmodes: ReadWriteMany
-  - storageclassname: rook-ceph-block
+  - name: rbd
+    storageclassname: rook-ceph-block
     accessmodes: ReadWriteOnce
+  - name: cephfs
+    storageclassname: rook-cephfs
+    accessmodes: ReadWriteMany
+    unsupportedDeployers:
+      - disapp

e2e/deployers/applicationset.go

@@ -80,17 +80,13 @@ func (a ApplicationSet) Undeploy(ctx types.Context) error {
 }
 
 func (a ApplicationSet) GetName() string {
-	return "Appset"
+	return "appset"
 }
 
 func (a ApplicationSet) GetNamespace() string {
 	return util.ArgocdNamespace
 }
 
-func (a ApplicationSet) IsWorkloadSupported(w types.Workload) bool {
-	return true
-}
-
 func (a ApplicationSet) IsDiscovered() bool {
 	return false
 }

e2e/deployers/discoveredapp.go

@@ -15,7 +15,7 @@ import (
 type DiscoveredApp struct{}
 
 func (d DiscoveredApp) GetName() string {
-	return "Disapp"
+	return "disapp"
 }
 
 func (d DiscoveredApp) GetNamespace() string {
@@ -114,10 +114,6 @@ func (d DiscoveredApp) Undeploy(ctx types.Context) error {
 	return nil
 }
 
-func (d DiscoveredApp) IsWorkloadSupported(w types.Workload) bool {
-	return w.GetName() != "Deploy-cephfs"
-}
-
 func (d DiscoveredApp) IsDiscovered() bool {
 	return true
 }

e2e/deployers/subscription.go

@@ -15,7 +15,7 @@ const McsbName = ClusterSetName
 type Subscription struct{}
 
 func (s Subscription) GetName() string {
-	return "Subscr"
+	return "subscr"
 }
 
 func (s Subscription) GetNamespace() string {
@@ -86,10 +86,6 @@ func (s Subscription) Undeploy(ctx types.Context) error {
 	return util.DeleteNamespace(util.Ctx.Hub.Client, namespace, log)
 }
 
-func (s Subscription) IsWorkloadSupported(w types.Workload) bool {
-	return true
-}
-
 func (s Subscription) IsDiscovered() bool {
 	return false
 }

e2e/exhaustive_suite_test.go

@@ -5,7 +5,6 @@ package e2e_test
 
 import (
 	"fmt"
-	"strings"
 	"testing"
 
 	"github.com/ramendr/ramen/e2e/deployers"
@@ -33,30 +32,15 @@ var (
 	Deployers      = []types.Deployer{subscription, appset, discoveredApps}
 )
 
-func generateSuffix(storageClassName string) string {
-	suffix := storageClassName
-
-	if strings.ToLower(storageClassName) == "rook-ceph-block" {
-		suffix = "rbd"
-	}
-
-	if strings.ToLower(storageClassName) == "rook-cephfs" {
-		suffix = "cephfs"
-	}
-
-	return suffix
-}
-
 func generateWorkloads([]types.Workload) {
 	pvcSpecs := util.GetPVCSpecs()
 	for _, pvcSpec := range pvcSpecs {
 		// add storageclass name to deployment name
-		suffix := generateSuffix(pvcSpec.StorageClassName)
 		deployment := &workloads.Deployment{
 			Path:     GITPATH,
 			Revision: GITREVISION,
 			AppName:  APPNAME,
-			Name:     fmt.Sprintf("Deploy-%s", suffix),
+			Name:     fmt.Sprintf("Deploy-%s", pvcSpec.Name),
 			PVCSpec:  pvcSpec,
 		}
 		Workloads = append(Workloads, deployment)

e2e/test/context.go

@@ -59,8 +59,8 @@ func (c *Context) Logger() *zap.SugaredLogger {
 // Validated return an error if the combination of deployer and workload is not supported.
 // TODO: validate that the workload is compatible with the clusters.
 func (c *Context) Validate() error {
-	if !c.deployer.IsWorkloadSupported(c.workload) {
-		return fmt.Errorf("workload %q not supported by deployer %q", c.workload.GetName(), c.deployer.GetName())
+	if !c.workload.SupportsDeployer(c.deployer) {
+		return fmt.Errorf("workload %q does not support deployer %q", c.workload.GetName(), c.deployer.GetName())
 	}
 
 	return nil

e2e/types/types.go

@@ -15,7 +15,6 @@ type Deployer interface {
 	GetName() string
 	// GetNamespace return the namespace for the ramen resources, or empty string if not using a special namespace.
 	GetNamespace() string
-	IsWorkloadSupported(Workload) bool
 	// Return true for OCM discovered application, false for OCM managed applications.
 	IsDiscovered() bool
 }
@@ -29,6 +28,9 @@ type Workload interface {
 	GetPath() string
 	GetRevision() string
 
+	// SupportsDeployer returns tue if this workload is compatible with deployer.
+	SupportsDeployer(Deployer) bool
+
 	// TODO: replace client with cluster.
 	Health(ctx Context, client client.Client, namespace string) error
 }

e2e/util/config.go

@@ -11,8 +11,10 @@ import (
 )
 
 type PVCSpec struct {
-	StorageClassName string
-	AccessModes      string
+	Name                 string
+	StorageClassName     string
+	AccessModes          string
+	UnsupportedDeployers []string
 }
 type TestConfig struct {
 	ChannelName      string

e2e/workloads/deployment.go

@@ -5,6 +5,8 @@ package workloads
 
 import (
 	"context"
+	"slices"
+	"strings"
 
 	"github.com/ramendr/ramen/e2e/types"
 	"github.com/ramendr/ramen/e2e/util"
@@ -37,6 +39,10 @@ func (w Deployment) GetRevision() string {
 	return w.Revision
 }
 
+func (w Deployment) SupportsDeployer(d types.Deployer) bool {
+	return !slices.Contains(w.PVCSpec.UnsupportedDeployers, strings.ToLower(d.GetName()))
+}
+
 func (w Deployment) Kustomize() string {
 	if w.PVCSpec.StorageClassName == "" && w.PVCSpec.AccessModes == "" {
 		return ""