e2e: update e2e test for topologysc

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

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/e2e/rbd.go b/e2e/rbd.go
@@ -3014,7 +3014,7 @@ var _ = Describe("RBD", func() {
 					"{\"domainLabel\":\"zone\",\"value\":\"" + zoneValue + "\"}]}]"
 				err = createRBDStorageClass(f.ClientSet, f, defaultSCName,
 					map[string]string{"volumeBindingMode": "WaitForFirstConsumer"},
-					map[string]string{"topologyConstrainedPools": topologyConstraint}, deletePolicy)
+					map[string]string{"topologyConstrainedPools": topologyConstraint, "pool": ""}, deletePolicy)
 				if err != nil {
 					framework.Failf("failed to create storageclass: %v", err)
 				}

diff --git a/internal/rbd/rbd_util.go b/internal/rbd/rbd_util.go
@@ -1271,8 +1271,8 @@ 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"]