added data cache flags to test context and updated nvme disk list logic

Author: Sneha-at

pkg/gce-pd-csi-driver/cache.go

@@ -301,19 +301,27 @@ func RaidLocalSsds() error {
 		klog.V(2).Infof("============================== Local SSDs are already RAIDed ==============================")
 		return nil
 	}
-	info, err := common.RunCommand("grep" /* pipedCmd */, "DevicePath" /* pipeCmdArg */, "nvme", []string{"list", "-o", "json"}...)
+	info, err := common.RunCommand("" /* pipedCmd */, "" /* pipeCmdArg */, "nvme", []string{"list", "-o", "json"}...)
 	if err != nil {
 		return fmt.Errorf("errored while scanning available NVME disks info: %v; err:%v", info, err)
 	}
-	infoString := strings.ReplaceAll(string(info), "\"", "")
-	infoString = strings.TrimSpace(strings.ReplaceAll(infoString, ",", " "))
-	infoSlice := strings.Split(infoString, "\n")
-	klog.V(2).Infof("============================== NVME list %v ==============================", infoSlice)
+	infoString := strings.TrimSpace(strings.ReplaceAll(string(info), "\n", " "))
+	klog.V(2).Infof("============================== NVME list %v ==============================", infoString)
+	infoString = strings.ReplaceAll(infoString, "\"", "")
+	infoString = strings.ReplaceAll(infoString, " :", ":")
+	infoString = strings.ReplaceAll(infoString, ": ", ":")
+	infoString = strings.ReplaceAll(infoString, ",", " ")
+	infoSlice := strings.Split(infoString, " ")
+
 	diskList := []string{}
 	for _, diskInfo := range infoSlice {
 		diskName := strings.TrimSpace(diskInfo)
-		diskName = strings.TrimSpace(strings.Split(diskName, ":")[1])
-		diskList = append(diskList, diskName)
+
+		if strings.Contains(diskName, "DevicePath") {
+			diskName := strings.TrimSpace(strings.Split(diskName, ":")[1])
+
+			diskList = append(diskList, diskName)
+		}
 	}
 	nvmeDiskCount := len(diskList)
 	nvmeDiskList := strings.Join(diskList, " ")

test/e2e/utils/utils.go

@@ -60,7 +60,8 @@ func GCEClientAndDriverSetup(instance *remote.InstanceInfo, computeEndpoint stri
 		"--multi-zone-volume-handle-disk-types=pd-standard",
 		"--use-instance-api-to-poll-attachment-disk-types=pd-ssd",
 		"--use-instance-api-to-list-volumes-published-nodes",
-		"--enable-data-cache",
+		"--enable-controller-data-cache",
+		"--enable-node-data-cache",
 	}
 	extra_flags = append(extra_flags, fmt.Sprintf("--compute-endpoint=%s", computeEndpoint))