Skip to content

Commit b46d3e7

Browse files
committed
test step fix
1 parent 96b270d commit b46d3e7

File tree

1 file changed

+1
-18
lines changed

1 file changed

+1
-18
lines changed

tests/e2e/multiSvc/multi_svc_test.go

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -443,22 +443,6 @@ var _ = ginkgo.Describe("[csi-multi-svc-refactor] Multi-SVC", func() {
443443
for _, datastorePath := range datastores {
444444
// roleForUser array to store roles for both svc account user based on datastore
445445
var roleForUser []string
446-
447-
// cluster1Group := []string{"vsanDatastore (2)"}
448-
// cluster2Group := []string{"vsanDatastore (1)"}
449-
// mixedGroup := []string{"nfs0-1", "sharedVmfs_0"}
450-
// // remainGroup := []string{"local-0 (8)", "local-0 (9)", "local-0 (10)", "local-0 (11)", "local-0 (12)", "local-0 (13)", "vsanDatastore", "vsanDatastore (3)"}
451-
// parts := strings.Split(datastorePath, "/")
452-
// datastoreName := parts[len(parts)-1]
453-
// if helper_util.ContainsItem(cluster1Group, datastoreName) {
454-
// roleForUser = []string{constants.RoleCnsDatastore, ""}
455-
// } else if helper_util.ContainsItem(cluster2Group, datastoreName) {
456-
// roleForUser = []string{"", constants.RoleCnsDatastore}
457-
// } else if helper_util.ContainsItem(mixedGroup, datastoreName) {
458-
// roleForUser = []string{constants.RoleCnsDatastore, constants.RoleCnsDatastore}
459-
// } else {
460-
// roleForUser = []string{"", ""}
461-
// }
462446
switch {
463447
case strings.Contains(datastorePath, "vsanDatastore (2)"):
464448
roleForUser = []string{constants.RoleCnsDatastore, ""}
@@ -548,7 +532,6 @@ var _ = ginkgo.Describe("[csi-multi-svc-refactor] Multi-SVC", func() {
548532
}()
549533

550534
ginkgo.By("Verify an alarm is raised for unmounted datastore and host in the supervisor cluster 1")
551-
// alarm := "Datastore not accessible to all hosts under the cluster"
552535
alarm := "Datastore no longer accessible to all hosts in the cluster compute resource"
553536
alarmPresent, err = IsAlarmPresentOnDatacenter(ctx, e2eTestConfig, dataCenter, alarm, true)
554537
gomega.Expect(err).NotTo(gomega.HaveOccurred())
@@ -673,7 +656,7 @@ var _ = ginkgo.Describe("[csi-multi-svc-refactor] Multi-SVC", func() {
673656
gomega.Expect(err).NotTo(gomega.HaveOccurred())
674657
isDsMountedOnSvc2 = false
675658
ginkgo.By("Verify datastore has permission for storage service account from the svc1 but not from svc2")
676-
roleForSvcUser = []string{"", constants.RoleCnsSearchAndSpbm}
659+
roleForSvcUser = []string{constants.RoleCnsDatastore, ""}
677660
// iterating through service account users
678661
for j, user := range wcpServiceAccUsers {
679662
userPermission, err := VerifyPermissionForWcpStorageUser(ctx, e2eTestConfig, "Datastore",

0 commit comments

Comments
 (0)