hanged backup suite to be more generic & changed mssql app to mysql

openshift · Feb 15, 2022 · 6054ad9 · 6054ad9
1 parent 82f5cce
commit 6054ad9
Show file tree

Hide file tree

Showing 15 changed files with 717 additions and 135 deletions.
diff --git a/Makefile b/Makefile
@@ -331,7 +331,7 @@ SETTINGS_TMP=/tmp/test-settings
 
 test-e2e-setup:
 	mkdir -p $(SETTINGS_TMP)
-	PROVIDER="$(CLUSTER_TYPE)" BUCKET="$(OADP_BUCKET)" BSL_REGION="$(BSL_REGION)" SECRET="$(CREDS_SECRET_REF)" TMP_DIR=$(SETTINGS_TMP) \
+	NAMESPACE="$(OADP_TEST_NAMESPACE)" PROVIDER="$(CLUSTER_TYPE)" BUCKET="$(OADP_BUCKET)" BSL_REGION="$(BSL_REGION)" SECRET="$(CREDS_SECRET_REF)" TMP_DIR=$(SETTINGS_TMP) \
 	VSL_REGION="$(VSL_REGION)" BSL_AWS_PROFILE="$(BSL_AWS_PROFILE)" BSL_REGION="$(BSL_REGION)" /bin/bash "tests/e2e/scripts/$(CLUSTER_TYPE)_settings.sh"
 
 test-e2e: test-e2e-setup

diff --git a/go.mod b/go.mod
@@ -6,9 +6,10 @@ require (
 	github.com/aws/aws-sdk-go v1.28.2
 	github.com/go-logr/logr v0.4.0
 	github.com/google/uuid v1.1.2
-	github.com/onsi/ginkgo v1.16.4
+	github.com/kubernetes-csi/external-snapshotter/client/v4 v4.0.0
+	github.com/onsi/ginkgo v1.16.5
 	github.com/onsi/ginkgo/v2 v2.1.1
-	github.com/onsi/gomega v1.17.0
+	github.com/onsi/gomega v1.18.1
 	github.com/openshift/api v0.0.0-20210805075156-d8fab4513288
 	github.com/operator-framework/api v0.10.7
 	github.com/operator-framework/operator-lib v0.9.0

diff --git a/go.sum b/go.sum
@@ -485,6 +485,7 @@ github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/kubernetes-csi/external-snapshotter/client/v4 v4.0.0 h1:ipLtV9ubLEYx42YvwDa12eVPQvjuGZoPdbCozGzVNRc=
 github.com/kubernetes-csi/external-snapshotter/client/v4 v4.0.0/go.mod h1:YBCo4DoEeDndqvAn6eeu0vWM7QdXmHEeI9cFWplmBys=
 github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
@@ -570,8 +571,10 @@ github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108
 github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
 github.com/onsi/ginkgo v1.14.1/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
 github.com/onsi/ginkgo v1.16.2/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E=
-github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc=
 github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
+github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
+github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
+github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
 github.com/onsi/ginkgo/v2 v2.1.1 h1:LCnPB85AvFNr91s0B2aDzEiiIg6MUwLYbryC1NSlWi8=
 github.com/onsi/ginkgo/v2 v2.1.1/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
 github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
@@ -583,8 +586,9 @@ github.com/onsi/gomega v1.10.2/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1y
 github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY=
 github.com/onsi/gomega v1.14.0/go.mod h1:cIuvLEne0aoVhAgh/O6ac0Op8WWw9H6eYCriF+tEHG0=
 github.com/onsi/gomega v1.15.0/go.mod h1:cIuvLEne0aoVhAgh/O6ac0Op8WWw9H6eYCriF+tEHG0=
-github.com/onsi/gomega v1.17.0 h1:9Luw4uT5HTjHTN8+aNcSThgH1vdXnmdJ8xIfZ4wyTRE=
 github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
+github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE=
+github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs=
 github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
 github.com/openshift/api v0.0.0-20210805075156-d8fab4513288 h1:Yw96Z8gygCXxjeMTm55gGsTNxwnJkr6L2Baf3NsUQFU=
@@ -991,8 +995,9 @@ golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 h1:c8PlLMqBbOHoqtjteWm5/kbe6rNY2pbRfbIMVnepueo=
 golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM=
+golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d h1:SZxvLBoTP5yHO3Frd4z4vrF+DBX9vMVanchswa69toE=

diff --git a/tests/e2e/backup_restore_suite_test.go b/tests/e2e/backup_restore_suite_test.go
@@ -6,22 +6,37 @@ import (
 	"log"
 	"time"
 
-	"github.com/google/uuid"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	. "github.com/openshift/oadp-operator/tests/e2e/lib"
 	utils "github.com/openshift/oadp-operator/tests/e2e/utils"
+	velero "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
+	v1storage "k8s.io/api/storage/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
 type VerificationFunction func(client.Client, string) error
 
 var _ = Describe("AWS backup restore tests", func() {
+	var currentBackup BackupInterface
+	var dsc *v1storage.StorageClass
 
 	var _ = BeforeEach(func() {
 		testSuiteInstanceName := "ts-" + instanceName
-		dpaCR.Name = testSuiteInstanceName
 
+		dpaCR.Name = testSuiteInstanceName
+		var err error
+		dsc, err = GetDefaultStorageClass()
+		Expect(err).NotTo(HaveOccurred())
+		if dsc == nil {
+			log.Printf("No default StorageClass; Setting")
+			sc, err := GetStorageClassByProvisioner(fmt.Sprintf("kubernetes.io/%v-.*", bsl_profile))
+			Expect(err).NotTo(HaveOccurred())
+			Expect(sc).NotTo(BeNil())
+			log.Printf("No default StorageClass; Setting %s to default StorageClass", sc.Name)
+			err = SetNewDefaultStorageClass(sc.Name)
+			Expect(err).NotTo(HaveOccurred())
+		}
 		credData, err := utils.ReadFile(credFile)
 		Expect(err).NotTo(HaveOccurred())
 		err = CreateCredentialsSecret(credData, namespace, GetSecretRef(credSecretRef))
@@ -31,42 +46,45 @@ var _ = Describe("AWS backup restore tests", func() {
 	var _ = AfterEach(func() {
 		err := dpaCR.Delete()
 		Expect(err).ToNot(HaveOccurred())
+		if currentBackup != nil {
+			err = currentBackup.CleanBackup()
+			SetNewDefaultStorageClass("")
+		}
 
 	})
 
 	type BackupRestoreCase struct {
-		ApplicationTemplate  string
-		ApplicationNamespace string
-		Name                 string
-		BackupRestoreType    BackupRestoreType
-		PreBackupVerify      VerificationFunction
-		PostRestoreVerify    VerificationFunction
-		MaxK8SVersion        *K8sVersion
-		MinK8SVersion        *K8sVersion
+		ApplicationTemplate string
+		BackupSpec          velero.BackupSpec
+		Name                string
+		PreBackupVerify     VerificationFunction
+		PostRestoreVerify   VerificationFunction
+		MaxK8SVersion       *K8sVersion
+		MinK8SVersion       *K8sVersion
 	}
 
 	parksAppReady := VerificationFunction(func(ocClient client.Client, namespace string) error {
 		Eventually(IsDCReady(ocClient, "parks-app", "restify"), timeoutMultiplier*time.Minute*10, time.Second*10).Should(BeTrue())
 		return nil
 	})
-	mssqlReady := VerificationFunction(func(ocClient client.Client, namespace string) error {
+	mysqlReady := VerificationFunction(func(ocClient client.Client, namespace string) error {
 		// This test confirms that SCC restore logic in our plugin is working
-		Eventually(IsDCReady(ocClient, "mssql-persistent", "mssql-deployment"), timeoutMultiplier*time.Minute*10, time.Second*10).Should(BeTrue())
-		Eventually(IsDeploymentReady(ocClient, "mssql-persistent", "mssql-app-deployment"), timeoutMultiplier*time.Minute*10, time.Second*10).Should(BeTrue())
-		exists, err := DoesSCCExist(ocClient, "mssql-persistent-scc")
+		//Eventually(IsDCReady(ocClient, "mssql-persistent", "mysql"), timeoutMultiplier*time.Minute*10, time.Second*10).Should(BeTrue())
+		Eventually(IsDeploymentReady(ocClient, "mysql-persistent", "mysql"), timeoutMultiplier*time.Minute*10, time.Second*10).Should(BeTrue())
+		exists, err := DoesSCCExist(ocClient, "mysql-persistent-scc")
 		if err != nil {
 			return err
 		}
 		if !exists {
-			return errors.New("did not find MSSQL scc")
+			return errors.New("did not find MYSQL scc")
 		}
 		return nil
 	})
 
 	DescribeTable("backup and restore applications",
-		func(brCase BackupRestoreCase, expectedErr error) {
+		func(brCase BackupRestoreCase, backup BackupInterface, expectedErr error) {
 
-			err := dpaCR.Build(brCase.BackupRestoreType)
+			err := dpaCR.Build(backup.GetType())
 			Expect(err).NotTo(HaveOccurred())
 
 			err = dpaCR.CreateOrUpdate(&dpaCR.CustomResource.Spec)
@@ -75,132 +93,126 @@ var _ = Describe("AWS backup restore tests", func() {
 			log.Printf("Waiting for velero pod to be running")
 			Eventually(AreVeleroPodsRunning(namespace), timeoutMultiplier*time.Minute*3, time.Second*5).Should(BeTrue())
 
-			if brCase.BackupRestoreType == RESTIC {
-				log.Printf("Waiting for restic pods to be running")
-				Eventually(AreResticPodsRunning(namespace), timeoutMultiplier*time.Minute*3, time.Second*5).Should(BeTrue())
-			}
-
-			if brCase.BackupRestoreType == CSI {
-				log.Printf("Creating VolumeSnapshot for CSI backuprestore of %s", brCase.Name)
-				err = InstallApplication(dpaCR.Client, "./sample-applications/gp2-csi/volumeSnapshotClass.yaml")
-				Expect(err).ToNot(HaveOccurred())
-			}
-
 			if dpaCR.CustomResource.Spec.BackupImages == nil || *dpaCR.CustomResource.Spec.BackupImages {
 				log.Printf("Waiting for registry pods to be running")
 				Eventually(AreRegistryDeploymentsAvailable(namespace), timeoutMultiplier*time.Minute*3, time.Second*5).Should(BeTrue())
 			}
 			if notVersionTarget, reason := NotServerVersionTarget(brCase.MinK8SVersion, brCase.MaxK8SVersion); notVersionTarget {
 				Skip(reason)
 			}
-			backupUid, _ := uuid.NewUUID()
-			restoreUid, _ := uuid.NewUUID()
-			backupName := fmt.Sprintf("%s-%s", brCase.Name, backupUid.String())
-			restoreName := fmt.Sprintf("%s-%s", brCase.Name, restoreUid.String())
+
+			brCaseName := brCase.Name
+			backup.NewBackup(dpaCR.Client, brCaseName, &brCase.BackupSpec)
+			backupRestoreName := backup.GetBackupSpec().Name
+			currentBackup = backup
+			err = backup.PrepareBackup()
+			Expect(err).ToNot(HaveOccurred())
 
 			// install app
-			log.Printf("Installing application for case %s", brCase.Name)
+			log.Printf("Installing application for case %s", brCaseName)
 			err = InstallApplication(dpaCR.Client, brCase.ApplicationTemplate)
 			Expect(err).ToNot(HaveOccurred())
 			// wait for pods to be running
-			Eventually(AreApplicationPodsRunning(brCase.ApplicationNamespace), timeoutMultiplier*time.Minute*9, time.Second*5).Should(BeTrue())
+			Eventually(AreApplicationPodsRunning(brCaseName), timeoutMultiplier*time.Minute*9, time.Second*5).Should(BeTrue())
 
 			// Run optional custom verification
-			log.Printf("Running pre-backup function for case %s", brCase.Name)
-			err = brCase.PreBackupVerify(dpaCR.Client, brCase.ApplicationNamespace)
+			log.Printf("Running pre-backup function for case %s", brCaseName)
+			err = brCase.PreBackupVerify(dpaCR.Client, brCaseName)
 			Expect(err).ToNot(HaveOccurred())
 
 			// create backup
-			log.Printf("Creating backup %s for case %s", backupName, brCase.Name)
-			err = CreateBackupForNamespaces(dpaCR.Client, namespace, backupName, []string{brCase.ApplicationNamespace})
+			log.Printf("Creating backup %s for case %s", backupRestoreName, brCaseName)
+			err = backup.CreateBackup()
 			Expect(err).ToNot(HaveOccurred())
 
 			// wait for backup to not be running
-			Eventually(IsBackupDone(dpaCR.Client, namespace, backupName), timeoutMultiplier*time.Minute*4, time.Second*10).Should(BeTrue())
+			Eventually(backup.IsBackupDone(), timeoutMultiplier*time.Minute*4, time.Second*10).Should(BeTrue())
 			Expect(GetVeleroContainerFailureLogs(dpaCR.Namespace)).To(Equal([]string{}))
 
 			// check if backup succeeded
-			succeeded, err := IsBackupCompletedSuccessfully(dpaCR.Client, namespace, backupName)
+			succeeded, err := backup.IsBackupCompletedSuccessfully()
 			Expect(err).ToNot(HaveOccurred())
 			Expect(succeeded).To(Equal(true))
-			log.Printf("Backup for case %s succeeded", brCase.Name)
+			log.Printf("Backup for case %s succeeded", brCaseName)
 
 			// uninstall app
-			log.Printf("Uninstalling app for case %s", brCase.Name)
+			log.Printf("Uninstalling app for case %s", brCaseName)
 			err = UninstallApplication(dpaCR.Client, brCase.ApplicationTemplate)
 			Expect(err).ToNot(HaveOccurred())
 
 			// Wait for namespace to be deleted
-			Eventually(IsNamespaceDeleted(brCase.ApplicationNamespace), timeoutMultiplier*time.Minute*2, time.Second*5).Should(BeTrue())
+			Eventually(IsNamespaceDeleted(brCaseName), timeoutMultiplier*time.Minute*2, time.Second*5).Should(BeTrue())
 
 			// run restore
-			log.Printf("Creating restore %s for case %s", restoreName, brCase.Name)
-			err = CreateRestoreFromBackup(dpaCR.Client, namespace, backupName, restoreName)
+			log.Printf("Creating restore %s for case %s", backupRestoreName, brCaseName)
+			err = CreateRestoreFromBackup(dpaCR.Client, namespace, backupRestoreName, backupRestoreName)
 			Expect(err).ToNot(HaveOccurred())
-			Eventually(IsRestoreDone(dpaCR.Client, namespace, restoreName), timeoutMultiplier*time.Minute*4, time.Second*10).Should(BeTrue())
+			Eventually(IsRestoreDone(dpaCR.Client, namespace, backupRestoreName), timeoutMultiplier*time.Minute*4, time.Second*10).Should(BeTrue())
 			Expect(GetVeleroContainerFailureLogs(dpaCR.Namespace)).To(Equal([]string{}))
 
 			// Check if restore succeeded
-			succeeded, err = IsRestoreCompletedSuccessfully(dpaCR.Client, namespace, restoreName)
+			succeeded, err = IsRestoreCompletedSuccessfully(dpaCR.Client, namespace, backupRestoreName)
 			Expect(err).ToNot(HaveOccurred())
 			Expect(succeeded).To(Equal(true))
 
 			// verify app is running
-			Eventually(AreApplicationPodsRunning(brCase.ApplicationNamespace), timeoutMultiplier*time.Minute*9, time.Second*5).Should(BeTrue())
+			Eventually(AreApplicationPodsRunning(brCaseName), timeoutMultiplier*time.Minute*9, time.Second*5).Should(BeTrue())
 
 			// Run optional custom verification
-			log.Printf("Running post-restore function for case %s", brCase.Name)
-			err = brCase.PostRestoreVerify(dpaCR.Client, brCase.ApplicationNamespace)
+			log.Printf("Running post-restore function for case %s", brCaseName)
+			err = brCase.PostRestoreVerify(dpaCR.Client, brCaseName)
 			Expect(err).ToNot(HaveOccurred())
 
 			// Test is successful, clean up everything
-			log.Printf("Uninstalling application for case %s", brCase.Name)
+			log.Printf("Uninstalling application for case %s", brCaseName)
 			err = UninstallApplication(dpaCR.Client, brCase.ApplicationTemplate)
 			Expect(err).ToNot(HaveOccurred())
 
 			// Wait for namespace to be deleted
-			Eventually(IsNamespaceDeleted(brCase.ApplicationNamespace), timeoutMultiplier*time.Minute*2, time.Second*5).Should(BeTrue())
-
-			if brCase.BackupRestoreType == CSI {
-				log.Printf("Deleting VolumeSnapshot for CSI backuprestore of %s", brCase.Name)
-				err = UninstallApplication(dpaCR.Client, "./sample-applications/gp2-csi/volumeSnapshotClass.yaml")
-				Expect(err).ToNot(HaveOccurred())
-			}
+			Eventually(IsNamespaceDeleted(brCaseName), timeoutMultiplier*time.Minute*2, time.Second*5).Should(BeTrue())
 
 		},
-		Entry("MSSQL application CSI", Label("aws"), BackupRestoreCase{
-			ApplicationTemplate:  "./sample-applications/mssql-persistent/mssql-persistent-csi-template.yaml",
-			ApplicationNamespace: "mssql-persistent",
-			Name:                 "mssql-e2e",
-			BackupRestoreType:    CSI,
-			PreBackupVerify:      mssqlReady,
-			PostRestoreVerify:    mssqlReady,
-		}, nil),
+		Entry("MySQL application CSI", Label("aws"), BackupRestoreCase{
+
+			ApplicationTemplate: "./sample-applications/mysql-persistent/mysql-persistent-template.yaml",
+			Name:                "mysql-persistent",
+			BackupSpec: velero.BackupSpec{
+				IncludedNamespaces: []string{"mysql-persistent"},
+			},
+			PreBackupVerify:   mysqlReady,
+			PostRestoreVerify: mysqlReady,
+		}, &BackupCsi{}, nil),
 		Entry("Parks application <4.8.0", BackupRestoreCase{
-			ApplicationTemplate:  "./sample-applications/parks-app/manifest.yaml",
-			ApplicationNamespace: "parks-app",
-			Name:                 "parks-e2e",
-			BackupRestoreType:    RESTIC,
-			PreBackupVerify:      parksAppReady,
-			PostRestoreVerify:    parksAppReady,
-			MaxK8SVersion:        &K8sVersionOcp47,
-		}, nil),
-		Entry("MSSQL application", BackupRestoreCase{
-			ApplicationTemplate:  "./sample-applications/mssql-persistent/mssql-persistent-template.yaml",
-			ApplicationNamespace: "mssql-persistent",
-			Name:                 "mssql-e2e",
-			BackupRestoreType:    RESTIC,
-			PreBackupVerify:      mssqlReady,
-			PostRestoreVerify:    mssqlReady,
-		}, nil),
+			ApplicationTemplate: "./sample-applications/parks-app/manifest.yaml",
+			Name:                "parks-app",
+			BackupSpec: velero.BackupSpec{
+				IncludedNamespaces: []string{"parks-app"},
+			},
+			PreBackupVerify:   parksAppReady,
+			PostRestoreVerify: parksAppReady,
+			MaxK8SVersion:     &K8sVersionOcp47,
+		}, &BackupVsl{CreateFromDpa: false},
+			nil),
+		Entry("MySQL application", BackupRestoreCase{
+			ApplicationTemplate: "./sample-applications/mysql-persistent/mysql-persistent-template.yaml",
+			Name:                "mysql-persistent",
+			PreBackupVerify:     mysqlReady,
+			PostRestoreVerify:   mysqlReady,
+			BackupSpec: velero.BackupSpec{
+				IncludedNamespaces: []string{"mysql-persistent"},
+			},
+		}, &BackupRestic{}, nil),
 		Entry("Parks application >=4.8.0", BackupRestoreCase{
-			ApplicationTemplate:  "./sample-applications/parks-app/manifest4.8.yaml",
-			ApplicationNamespace: "parks-app",
-			Name:                 "parks-e2e",
-			BackupRestoreType:    RESTIC,
-			PreBackupVerify:      parksAppReady,
-			PostRestoreVerify:    parksAppReady,
-			MinK8SVersion:        &K8sVersionOcp48,
+			ApplicationTemplate: "./sample-applications/parks-app/manifest4.8.yaml",
+			Name:                "parks-app",
+			BackupSpec: velero.BackupSpec{
+				IncludedNamespaces: []string{"parks-app"},
+			},
+			PreBackupVerify:   parksAppReady,
+			PostRestoreVerify: parksAppReady,
+			MinK8SVersion:     &K8sVersionOcp48,
+		}, &BackupVsl{
+			CreateFromDpa: true,
 		}, nil),
 	)
 })