Change iops params directly convert string to int64

Author: sunnylovestiramisu

pkg/common/parameters.go

@@ -152,7 +152,7 @@ func ExtractAndDefaultParameters(parameters map[string]string, driverName string
 				p.Labels[labelKey] = labelValue
 			}
 		case ParameterKeyProvisionedIOPSOnCreate:
-			paramProvisionedIOPSOnCreate, err := ConvertGiBStringToInt64(v)
+			paramProvisionedIOPSOnCreate, err := ConvertStringToInt64(v)
 			if err != nil {
 				return p, fmt.Errorf("parameters contain invalid provisionedIOPSOnCreate parameter: %w", err)
 			}

pkg/common/parameters_test.go

@@ -76,7 +76,7 @@ func TestExtractAndDefaultParameters(t *testing.T) {
 		},
 		{
 			name:       "values from parameters, checking pd-extreme",
-			parameters: map[string]string{ParameterKeyType: "pd-extreme", ParameterKeyReplicationType: "none", ParameterKeyDiskEncryptionKmsKey: "foo/key", ParameterKeyLabels: "key1=value1,key2=value2", ParameterKeyProvisionedIOPSOnCreate: "10000Gi"},
+			parameters: map[string]string{ParameterKeyType: "pd-extreme", ParameterKeyReplicationType: "none", ParameterKeyDiskEncryptionKmsKey: "foo/key", ParameterKeyLabels: "key1=value1,key2=value2", ParameterKeyProvisionedIOPSOnCreate: "10k"},
 			labels:     map[string]string{},
 			expectParams: DiskParameters{
 				DiskType:             "pd-extreme",

pkg/common/utils.go

@@ -251,15 +251,15 @@ func ValidateSnapshotType(snapshotType string) error {
 	}
 }
 
-// ConvertGiBStringToInt64 converts a GiB string to int64
-func ConvertGiBStringToInt64(str string) (int64, error) {
+// ConvertStringToInt64 converts a string to int64
+func ConvertStringToInt64(str string) (int64, error) {
 	// Verify regex before
 	match, _ := regexp.MatchString("^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$", str)
 	if !match {
 		return 0, fmt.Errorf("invalid string %s", str)
 	}
 	quantity := resource.MustParse(str)
-	return volumehelpers.RoundUpToGiB(quantity)
+	return volumehelpers.RoundUpToB(quantity)
 }
 
 // ConvertMiBStringToInt64 converts a GiB string to int64

pkg/common/utils_test.go

@@ -578,7 +578,7 @@ func TestSnapshotStorageLocations(t *testing.T) {
 	}
 }
 
-func TestConvertGiBStringToInt64(t *testing.T) {
+func TestConvertStringToInt64(t *testing.T) {
 	tests := []struct {
 		desc        string
 		inputStr    string
@@ -588,73 +588,91 @@ func TestConvertGiBStringToInt64(t *testing.T) {
 		{
 			"valid number string",
 			"10000",
-			1,
+			10000,
 			false,
 		},
 		{
-			"round Ki to GiB",
-			"1000Ki",
-			1,
+			"round M to number",
+			"1M",
+			1000000,
 			false,
 		},
 		{
-			"round k to GiB",
-			"1000k",
+			"round m to number",
+			"1m",
 			1,
 			false,
 		},
 		{
-			"round Mi to GiB",
-			"1000Mi",
-			1,
+			"round k to number",
+			"1k",
+			1000,
 			false,
 		},
 		{
-			"round M to GiB",
-			"1000M",
-			1,
-			false,
+			"invalid empty string",
+			"",
+			10000,
+			true,
 		},
 		{
-			"round G to GiB",
-			"1000G",
-			932,
+			"invalid string",
+			"ew%65",
+			10000,
+			true,
+		},
+		{
+			"round Ki to number",
+			"1Ki",
+			1024,
 			false,
 		},
 		{
-			"round Gi to GiB",
-			"10000Gi",
+			"round k to number",
+			"10k",
 			10000,
 			false,
 		},
 		{
-			"round decimal to GiB",
-			"1.2Gi",
-			2,
+			"round Mi to number",
+			"10Mi",
+			10485760,
 			false,
 		},
 		{
-			"round big value to GiB",
-			"8191Pi",
-			8588886016,
+			"round M to number",
+			"10M",
+			10000000,
 			false,
 		},
 		{
-			"invalid empty string",
-			"",
-			10000,
-			true,
+			"round G to number",
+			"10G",
+			10000000000,
+			false,
 		},
 		{
-			"invalid string",
-			"ew%65",
-			10000,
-			true,
+			"round Gi to number",
+			"100Gi",
+			107374182400,
+			false,
+		},
+		{
+			"round decimal to number",
+			"1.2Gi",
+			1288490189,
+			false,
+		},
+		{
+			"round big value to number",
+			"8191Pi",
+			9222246136947933184,
+			false,
 		},
 	}
 	for _, tc := range tests {
 		t.Run(tc.desc, func(t *testing.T) {
-			actualInt64, err := ConvertGiBStringToInt64(tc.inputStr)
+			actualInt64, err := ConvertStringToInt64(tc.inputStr)
 			if err != nil && !tc.expectError {
 				t.Errorf("Got error %v converting string to int64 %s; expect no error", err, tc.inputStr)
 			}

test/e2e/tests/single_zone_e2e_test.go

@@ -51,7 +51,7 @@ const (
 	readyState                       = "READY"
 	standardDiskType                 = "pd-standard"
 	extremeDiskType                  = "pd-extreme"
-	provisionedIOPSOnCreate          = "100000Gi"
+	provisionedIOPSOnCreate          = "100000"
 	provisionedIOPSOnCreateInt       = int64(100000)
 
 	defaultEpsilon = 500000000 // 500M

test/k8s-integration/config/sc-extreme.yaml

@@ -5,7 +5,7 @@ metadata:
 provisioner: pd.csi.storage.gke.io
 parameters:
   type: pd-extreme
-  provisioned-iops-on-create: '10000Gi'
+  provisioned-iops-on-create: '10000'
   # Add labels for testing.
   labels: key1=value1,key2=value2
 volumeBindingMode: WaitForFirstConsumer