e2e: update e2e test for topologysc

Signed-off-by: parth-gr <[email protected]>
ceph · Mar 19, 2024 · 7c7d493 · 7c7d493
1 parent 7a2be75
commit 7c7d493
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/e2e/rbd_helper.go b/e2e/rbd_helper.go
@@ -126,7 +126,10 @@ func createRBDStorageClass(
 	if name != "" {
 		sc.Name = name
 	}
-	sc.Parameters["pool"] = defaultRBDPool
+	// add pool only if topologyConstrainedPools is not present
+	if _, ok := parameters["topologyConstrainedPools"]; !ok {
+		sc.Parameters["pool"] = defaultRBDPool
+	}
 	sc.Parameters["csi.storage.k8s.io/provisioner-secret-namespace"] = cephCSINamespace
 	sc.Parameters["csi.storage.k8s.io/provisioner-secret-name"] = rbdProvisionerSecretName
 

diff --git a/internal/rbd/controllerserver.go b/internal/rbd/controllerserver.go
@@ -259,6 +259,7 @@ func buildCreateVolumeResponse(req *csi.CreateVolumeRequest, rbdVol *rbdVolume)
 			},
 		}
 	}
+
 	return &csi.CreateVolumeResponse{Volume: volume}
 }
 

diff --git a/internal/rbd/rbd_util.go b/internal/rbd/rbd_util.go
@@ -1270,9 +1270,12 @@ func genVolFromVolumeOptions(
 	)
 
 	rbdVol := &rbdVolume{}
+
 	rbdVol.Pool, ok = volOptions["pool"]
 	if !ok {
-		return nil, errors.New("missing required parameter pool")
+		if _, ok = volOptions["topologyConstrainedPools"]; !ok {
+			return nil, errors.New("empty pool name or topologyConstrainedPools to provision volume")
+		}
 	}
 
 	rbdVol.DataPool = volOptions["dataPool"]
-Original file line number
+Diff line change
@@ Expand Up @@
     			},
     		}
     	}
     	return &csi.CreateVolumeResponse{Volume: volume}
     }
@@ Expand Down @@