Merge pull request #2903 from rewantsoni/replicationID

provider: update replicationID to be storageClass name
red-hat-storage · Nov 21, 2024 · b0323a9 · b0323a9
2 parents 2e7cf01 + 68a4570
commit b0323a9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/services/provider/server/server.go b/services/provider/server/server.go
@@ -729,10 +729,7 @@ func (s *OCSProviderServer) GetStorageClaimConfig(ctx context.Context, req *pb.S
 		return nil, status.Errorf(codes.Internal, "failed to get StorageClusterPeerList. %v", err)
 	}
 	replicationEnabled := len(scp.Items) > 0
-	var replicationID string
-	if replicationEnabled {
-		replicationID = util.CalculateMD5Hash(req.StorageClaimName)
-	}
+	replicationID := req.StorageClaimName
 
 	var extR []*pb.ExternalResource
 

diff --git a/services/provider/server/server_test.go b/services/provider/server/server_test.go
@@ -666,7 +666,7 @@ func TestOCSProviderServerGetStorageClaimConfig(t *testing.T) {
 					"mirroringMode": "snapshot",
 				},
 				Labels: map[string]string{
-					"ramendr.openshift.io/replicationid": "",
+					"ramendr.openshift.io/replicationid": "block-pool-claim",
 					"ramendr.openshift.io/storageID":     "8d40b6be71600457b5dec219d2ce2d4c",
 				},
 				Annotations: map[string]string{
@@ -683,7 +683,7 @@ func TestOCSProviderServerGetStorageClaimConfig(t *testing.T) {
 				},
 				Labels: map[string]string{
 					"replication.storage.openshift.io/flatten-mode": "force",
-					"ramendr.openshift.io/replicationid":            "",
+					"ramendr.openshift.io/replicationid":            "block-pool-claim",
 					"ramendr.openshift.io/storageID":                "8d40b6be71600457b5dec219d2ce2d4c",
 				},
 				Annotations: map[string]string{},