Fix provisioned-iops-on-create passing logic

Author: sunnylovestiramisu

pkg/common/utils_test.go

@@ -597,6 +597,12 @@ func TestConvertStringToInt64(t *testing.T) {
 			expInt64:    10000,
 			expectError: false,
 		},
+		{
+			desc:        "test higher number",
+			inputStr:    "15000",
+			expInt64:    15000,
+			expectError: false,
+		},
 		{
 			desc:        "round M to number",
 			inputStr:    "1M",

pkg/gce-cloud-provider/compute/gce-compute.go

@@ -419,6 +419,9 @@ func convertV1DiskToBetaDisk(v1Disk *computev1.Disk, provisionedThroughputOnCrea
 		ReplicaZones:      v1Disk.ReplicaZones,
 		DiskEncryptionKey: dek,
 	}
+	if v1Disk.ProvisionedIops > 0 {
+		betaDisk.ProvisionedIops = v1Disk.ProvisionedIops
+	}
 	if provisionedThroughputOnCreate > 0 {
 		betaDisk.ProvisionedThroughput = provisionedThroughputOnCreate
 	}
@@ -449,12 +452,11 @@ func (cloud *CloudProvider) insertRegionalDisk(
 	}
 
 	diskToCreate := &computev1.Disk{
-		Name:            volKey.Name,
-		SizeGb:          common.BytesToGbRoundUp(capBytes),
-		Description:     description,
-		Type:            cloud.GetDiskTypeURI(cloud.project, volKey, params.DiskType),
-		Labels:          params.Labels,
-		ProvisionedIops: params.ProvisionedIOPSOnCreate,
+		Name:        volKey.Name,
+		SizeGb:      common.BytesToGbRoundUp(capBytes),
+		Description: description,
+		Type:        cloud.GetDiskTypeURI(cloud.project, volKey, params.DiskType),
+		Labels:      params.Labels,
 	}
 	if snapshotID != "" {
 		_, snapshotType, _, err := common.SnapshotIDToProjectKey(snapshotID)
@@ -562,11 +564,12 @@ func (cloud *CloudProvider) insertZonalDisk(
 	}
 
 	diskToCreate := &computev1.Disk{
-		Name:        volKey.Name,
-		SizeGb:      common.BytesToGbRoundUp(capBytes),
-		Description: description,
-		Type:        cloud.GetDiskTypeURI(project, volKey, params.DiskType),
-		Labels:      params.Labels,
+		Name:            volKey.Name,
+		SizeGb:          common.BytesToGbRoundUp(capBytes),
+		Description:     description,
+		Type:            cloud.GetDiskTypeURI(project, volKey, params.DiskType),
+		Labels:          params.Labels,
+		ProvisionedIops: params.ProvisionedIOPSOnCreate,
 	}
 
 	if snapshotID != "" {

test/e2e/tests/single_zone_e2e_test.go

@@ -44,19 +44,24 @@ import (
 const (
 	testNamePrefix = "gcepd-csi-e2e-"
 
-	defaultSizeGb              int64 = 5
-	defaultRepdSizeGb          int64 = 200
-	defaultMwSizeGb            int64 = 200
-	defaultVolumeLimit         int64 = 127
-	readyState                       = "READY"
-	standardDiskType                 = "pd-standard"
-	extremeDiskType                  = "pd-extreme"
-	provisionedIOPSOnCreate          = "100000"
-	provisionedIOPSOnCreateInt       = int64(100000)
+	defaultSizeGb                    int64 = 5
+	defaultExtremeSizeGb             int64 = 500
+	defaultRepdSizeGb                int64 = 200
+	defaultMwSizeGb                  int64 = 200
+	defaultVolumeLimit               int64 = 127
+	readyState                             = "READY"
+	standardDiskType                       = "pd-standard"
+	extremeDiskType                        = "pd-extreme"
+	provisionedIOPSOnCreate                = "100000"
+	provisionedIOPSConfigOnCreate          = "112345"
+	provisionedIOPSOnCreateInt             = int64(100000)
+	provisionedIOPSConfigOnCreateInt       = int64(112345)
 
 	defaultEpsilon = 500000000 // 500M
 )
 
+var test_counter = 1
+
 var _ = Describe("GCE PD CSI Driver", func() {
 
 	It("Should get reasonable volume limits from nodes with NodeGetInfo", func() {
@@ -386,14 +391,28 @@ var _ = Describe("GCE PD CSI Driver", func() {
 			// Create Disk
 			disk := typeToDisk[diskType]
 			volName := testNamePrefix + string(uuid.NewUUID())
-			volID, err := client.CreateVolume(volName, disk.params, defaultSizeGb, nil, nil)
+			if test_counter == 1 && disk.params.DiskType == extremeDiskType {
+				disk.params.ProvisionedIOPSOnCreate = provisionedIOPSConfigOnCreate
+				volID, err := client.CreateVolume(volName, disk.params, defaultExtremeSizeGb, nil, nil)
+			} else {
+				volID, err := client.CreateVolume(volName, disk.params, defaultSizeGb, nil, nil)
+			}
+
 			Expect(err).To(BeNil(), "CreateVolume failed with error: %v", err)
 
 			// Validate Disk Created
 			cloudDisk, err := computeService.Disks.Get(p, z, volName).Do()
 			Expect(err).To(BeNil(), "Could not get disk from cloud directly")
 			Expect(cloudDisk.Status).To(Equal(readyState))
-			Expect(cloudDisk.SizeGb).To(Equal(defaultSizeGb))
+
+			if test_counter == 1 && disk.params.DiskType == extremeDiskType {
+				Expect(cloudDisk.SizeGb).To(Equal(defaultDiskSizeGb))
+				Expect(cloudDisk.ProvisionedIops).To(Equal(provisionedIOPSOnCreateInt))
+				test_counter++
+			} else {
+				Expect(cloudDisk.SizeGb).To(Equal(defaultSizeGb))
+			}
+
 			Expect(cloudDisk.Name).To(Equal(volName))
 			disk.validate(cloudDisk)