Update the disk tests to run with multiple types of disks attached

Author: mauriciopoppe

integrationtests/disk_v1_test.go

@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/kubernetes-csi/csi-proxy/client/api/disk/v1"
+	v1 "github.com/kubernetes-csi/csi-proxy/client/api/disk/v1"
 	diskv1client "github.com/kubernetes-csi/csi-proxy/client/groups/disk/v1"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -51,19 +51,20 @@ func v1DiskTests(t *testing.T) {
 			t.Errorf("Expected to get at least one diskIDs, instead got diskIDsResponse.DiskIDs=%+v", diskIDsMap)
 		}
 
+		// some disks may have the field Page83, if it's a GCE Persistent disk
+		// it'll have a nonempty SerialNumber
 		// first disk is the VM disk (other disks might be VHD)
-		diskNumber := 0
-		diskIDs, found := diskIDsMap[uint32(diskNumber)]
-		if !found {
-			t.Errorf("Cannot find Disk %d", diskNumber)
-		}
-		page83 := diskIDs.Page83
-		if page83 == "" {
-			t.Errorf("page83 field of diskNumber=%d should be defined, instead got diskIDs=%v", diskNumber, diskIDs)
-		}
-		serialNumber := diskIDs.SerialNumber
-		if serialNumber == "" {
-			t.Errorf("serialNumber field of diskNumber=%d should be defined, instead got diskIDs=%v", diskNumber, diskIDs)
+		for diskNumber, diskIDs := range diskIDsMap {
+			if len(diskIDs.SerialNumber) > 0 {
+				// the nvme disks don't have a Page83 number
+				if strings.HasPrefix(diskIDs.SerialNumber, "nvme") {
+					continue
+				}
+				page83 := diskIDs.Page83
+				if page83 == "" {
+					t.Errorf("page83 field of diskNumber=%d should be defined, instead got diskIDs=%v", diskNumber, diskIDs)
+				}
+			}
 		}
 
 		listDiskLocationsRequest := &v1.ListDiskLocationsRequest{}

integrationtests/disk_v1beta1_test.go

@@ -47,21 +47,6 @@ func v1beta1DiskTests(t *testing.T) {
 			t.Errorf("Expected to get at least one diskIDs, instead got diskIDsResponse.DiskIDs=%+v", diskIDsMap)
 		}
 
-		// first disk is the VM disk (other disks might be VHD)
-		diskNumber := 0
-		diskIDs, found := diskIDsMap[strconv.FormatUint(uint64(diskNumber), 10)]
-		if !found {
-			t.Errorf("Cannot find Disk %d", diskNumber)
-		}
-		page83 := diskIDs.Identifiers["page83"]
-		if page83 == "" {
-			t.Errorf("page83 field of diskNumber=%d should be defined, instead got diskIDs=%v", diskNumber, diskIDs)
-		}
-		serialNumber := diskIDs.Identifiers["serialNumber"]
-		if serialNumber == "" {
-			t.Errorf("serialNumber field of diskNumber=%d should be defined, instead got diskIDs=%v", diskNumber, diskIDs)
-		}
-
 		listDiskLocationsRequest := &v1beta1.ListDiskLocationsRequest{}
 		listDiskLocationsResponse, err := client.ListDiskLocations(context.TODO(), listDiskLocationsRequest)
 		require.Nil(t, err)

integrationtests/disk_v1beta2_test.go

@@ -48,21 +48,6 @@ func v1beta2DiskTests(t *testing.T) {
 			t.Errorf("Expected to get at least one diskIDs, instead got diskIDsResponse.DiskIDs=%+v", diskIDsMap)
 		}
 
-		// first disk is the VM disk (other disks might be VHD)
-		diskNumber := 0
-		diskIDs, found := diskIDsMap[strconv.FormatUint(uint64(diskNumber), 10)]
-		if !found {
-			t.Errorf("Cannot find Disk %d", diskNumber)
-		}
-		page83 := diskIDs.Identifiers["page83"]
-		if page83 == "" {
-			t.Errorf("page83 field of diskNumber=%d should be defined, instead got diskIDs=%v", diskNumber, diskIDs)
-		}
-		serialNumber := diskIDs.Identifiers["serialNumber"]
-		if serialNumber == "" {
-			t.Errorf("serialNumber field of diskNumber=%d should be defined, instead got diskIDs=%v", diskNumber, diskIDs)
-		}
-
 		listDiskLocationsRequest := &v1beta2.ListDiskLocationsRequest{}
 		listDiskLocationsResponse, err := client.ListDiskLocations(context.TODO(), listDiskLocationsRequest)
 		require.Nil(t, err)

integrationtests/disk_v1beta3_test.go

@@ -51,19 +51,20 @@ func v1beta3DiskTests(t *testing.T) {
 			t.Errorf("Expected to get at least one diskIDs, instead got diskIDsResponse.DiskIDs=%+v", diskIDsMap)
 		}
 
+		// some disks may have the field Page83, if it's a GCE Persistent disk
+		// it'll have a nonempty SerialNumber
 		// first disk is the VM disk (other disks might be VHD)
-		diskNumber := 0
-		diskIDs, found := diskIDsMap[uint32(diskNumber)]
-		if !found {
-			t.Errorf("Cannot find Disk %d", diskNumber)
-		}
-		page83 := diskIDs.Page83
-		if page83 == "" {
-			t.Errorf("page83 field of diskNumber=%d should be defined, instead got diskIDs=%v", diskNumber, diskIDs)
-		}
-		serialNumber := diskIDs.SerialNumber
-		if serialNumber == "" {
-			t.Errorf("serialNumber field of diskNumber=%d should be defined, instead got diskIDs=%v", diskNumber, diskIDs)
+		for diskNumber, diskIDs := range diskIDsMap {
+			if len(diskIDs.SerialNumber) > 0 {
+				// the nvme disks don't have a Page83 number
+				if strings.HasPrefix(diskIDs.SerialNumber, "nvme") {
+					continue
+				}
+				page83 := diskIDs.Page83
+				if page83 == "" {
+					t.Errorf("page83 field of diskNumber=%d should be defined, instead got diskIDs=%v", diskNumber, diskIDs)
+				}
+			}
 		}
 
 		listDiskLocationsRequest := &v1beta3.ListDiskLocationsRequest{}

integrationtests/utils.go

@@ -156,7 +156,7 @@ func shouldRunIscsiTests() bool {
 }
 
 func runPowershellCmd(t *testing.T, command string) (string, error) {
-	cmd := exec.Command("powershell", "/c", command)
+	cmd := exec.Command("powershell", "/c", fmt.Sprintf("& { $global:ProgressPreference = 'SilentlyContinue'; %s }", command))
 	t.Logf("Executing command: %q", cmd.String())
 	result, err := cmd.CombinedOutput()
 	return string(result), err

scripts/utils.psm1

@@ -26,5 +26,9 @@ function Restart-CSIProxy {
 
 function Run-CSIProxyIntegrationTests {
   Write-Output "Running integration tests"
-  powershell -c "C:\Users\$env:UserName\integrationtests.test.exe --test.v"
+  .\integrationtests.test.exe --test.v --test.run TestAPIGroups
+  .\integrationtests.test.exe --test.v --test.run TestDiskAPIGroup
+  .\integrationtests.test.exe --test.v --test.run TestVolumeAPIs
+  .\integrationtests.test.exe --test.v --test.run TestSmbAPIGroup
+  .\integrationtests.test.exe --test.v --test.run TestFilesystemAPIGroup
 }

scripts/utils.sh

@@ -50,5 +50,5 @@ restart_csi_proxy() {
 
 run_csi_proxy_integration_tests() {
   echo "Run integration tests"
-  gcloud compute ssh $windows_node --command='powershell -c "& { Import-Module .\utils.psm1; Run-CSIProxyIntegrationTests }"'
+  gcloud compute ssh $windows_node --command="powershell -c \"& { Import-Module .\utils.psm1; Run-CSIProxyIntegrationTests }\""
 }