From 819df69f2f14d98db94cadc360340cb23d72b20e Mon Sep 17 00:00:00 2001
From: mittachaitu <sai.chaithanya@mayadata.io>
Date: Fri, 9 Oct 2020 13:58:55 +0530
Subject: [PATCH] fix(backup, restore): create backup and restore in
 cstor.openebs.io/v1 group

Signed-off-by: mittachaitu <sai.chaithanya@mayadata.io>
---
 .../cstorvolumeconfig/backup_endpoint.go      |  3 +-
 pkg/server/cstorvolumeconfig/https_test.go    | 55 +++++++++++++++++++
 .../cstorvolumeconfig/restore_endpoint.go     |  2 +-
 3 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/pkg/server/cstorvolumeconfig/backup_endpoint.go b/pkg/server/cstorvolumeconfig/backup_endpoint.go
index 145f105f..a4864a66 100644
--- a/pkg/server/cstorvolumeconfig/backup_endpoint.go
+++ b/pkg/server/cstorvolumeconfig/backup_endpoint.go
@@ -381,7 +381,8 @@ func (bOps *backupAPIOps) getBackupInterfaceFromPoolVersion(
 	poolVersion string, backup *cstorapis.CStorBackup) (backupHelper, error) {
 	// error will be reported when version doesn't contain any valid version pattern
 	// Ex: dev, ci, master
-	currentVersion, err := version.NewVersion(poolVersion)
+	// Spliting required if version contains RC1, RC2 to make comparisions
+	currentVersion, err := version.NewVersion(strings.Split(poolVersion, "-")[0])
 	if err != nil {
 		// We need to support backup for ci images also
 		if strings.TrimSpace(poolVersion) != "" && !strings.Contains(poolVersion, "dev") {
diff --git a/pkg/server/cstorvolumeconfig/https_test.go b/pkg/server/cstorvolumeconfig/https_test.go
index 7ea3eff9..c626467e 100644
--- a/pkg/server/cstorvolumeconfig/https_test.go
+++ b/pkg/server/cstorvolumeconfig/https_test.go
@@ -508,6 +508,27 @@ func TestBackupPostEndPoint(t *testing.T) {
 			checkExistenceOfCStorCompletedBackup: true,
 			isV1Version:                          true,
 		},
+		"test backup when pool is in RC versions": {
+			cspcName:    "cspc-disk-pool7",
+			poolVersion: "2.2.0-RC2",
+			cstorBackup: &openebsapis.CStorBackup{
+				ObjectMeta: metav1.ObjectMeta{
+					Namespace: namespace,
+				},
+				Spec: openebsapis.CStorBackupSpec{
+					BackupName: "backup7",
+					VolumeName: "volume7",
+					BackupDest: "172.102.29.12:3234",
+					SnapName:   "snapshot7",
+				},
+			},
+			snapshotter:                          &snapshot.FakeSnapshotter{},
+			cvrStatus:                            cstorapis.CVRStatusOnline,
+			expectedResponseCode:                 http.StatusOK,
+			verifyBackUpStatus:                   verifyExistenceOfPendingV1Backup,
+			checkExistenceOfCStorCompletedBackup: true,
+			isV1Version:                          true,
+		},
 	}
 	os.Setenv(util.OpenEBSNamespace, "openebs")
 	for name, test := range tests {
@@ -1251,6 +1272,40 @@ func TestRestoreEndPoint(t *testing.T) {
 			verifyCStorRestoreCount: true,
 			isV1Version:             true,
 		},
+		"When restore is triggered for pools on v1 supported RC version": {
+			cspcName:    "cspc-cstor-pool9",
+			poolVersion: "2.2.0-RC3",
+			cstorRestore: &openebsapis.CStorRestore{
+				ObjectMeta: metav1.ObjectMeta{
+					Namespace: namespace,
+				},
+				Spec: openebsapis.CStorRestoreSpec{
+					RestoreName: "restore9",
+					VolumeName:  "volume9",
+					RestoreSrc:  "127.0.0.1:3422",
+				},
+			},
+			cvcObj: &cstorapis.CStorVolumeConfig{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "volume9",
+					Namespace: namespace,
+					Labels: map[string]string{
+						openebstypes.CStorPoolClusterLabelKey: "cspc-cstor-pool9",
+					},
+				},
+				Spec: cstorapis.CStorVolumeConfigSpec{
+					Provision: cstorapis.VolumeProvision{
+						ReplicaCount: 3,
+					},
+				},
+				Status: cstorapis.CStorVolumeConfigStatus{
+					Phase: cstorapis.CStorVolumeConfigPhasePending,
+				},
+			},
+			expectedResponseCode:    http.StatusOK,
+			verifyCStorRestoreCount: true,
+			isV1Version:             true,
+		},
 	}
 	start := make(chan int, 1)
 	defer close(start)
diff --git a/pkg/server/cstorvolumeconfig/restore_endpoint.go b/pkg/server/cstorvolumeconfig/restore_endpoint.go
index 8ede5c18..7f451c57 100644
--- a/pkg/server/cstorvolumeconfig/restore_endpoint.go
+++ b/pkg/server/cstorvolumeconfig/restore_endpoint.go
@@ -262,7 +262,7 @@ func createRestore(openebsClient clientset.Interface, restoreObj *cstorapis.CSto
 		if _, ok := cspiToCVRMap[cspi.Name]; !ok {
 			continue
 		}
-		poolVersion, err := version.NewVersion(cspiVersion)
+		poolVersion, err := version.NewVersion(strings.Split(cspiVersion, "-")[0])
 		// If Current version is empty treat it as a ci
 		if err != nil && (cspiVersion != "" && !strings.Contains(cspiVersion, "dev")) {
 			return nil, CodedError(500,