Merge pull request #111951 from sashrith/vsphere_intree_test_fixes

vsphere in-tree driver test fixes

test/e2e/storage/drivers/in_tree.go

@@ -1253,6 +1253,7 @@ func InitVSphereDriver() storageframework.TestDriver {
 				storageframework.CapExec:        true,
 				storageframework.CapMultiPODs:   true,
 				storageframework.CapTopology:    true,
+				storageframework.CapBlock:       true,
 			},
 		},
 	}

test/e2e/storage/testsuites/multivolume.go

@@ -429,6 +429,10 @@ func (t *multiVolumeTestSuite) DefineTests(driver storageframework.TestDriver, p
 			e2eskipper.Skipf("Driver %q does not support multiple concurrent pods - skipping", dInfo.Name)
 		}
 
+		if l.driver.GetDriverInfo().Name == "vsphere" && pattern == storageframework.BlockVolModeDynamicPV {
+			e2eskipper.Skipf("Driver %q does not support read only raw block volumes - skipping", dInfo.Name)
+		}
+
 		// Create volume
 		testVolumeSizeRange := t.GetTestSuiteInfo().SupportedSizeRange
 		resource := storageframework.CreateVolumeResource(l.driver, l.config, pattern, testVolumeSizeRange)
@@ -746,7 +750,7 @@ func getCurrentTopologiesNumber(cs clientset.Interface, nodes *v1.NodeList, keys
 				break
 			}
 		}
-		if !found {
+		if !found && len(topo) > 0 {
 			framework.Logf("found topology %v", topo)
 			topos = append(topos, topo)
 			topoCount = append(topoCount, 1)