Revert "updated test cases"

This reverts commit 9f02563.

Author: sunnylovestiramisu

pkg/common/parameters.go

@@ -133,15 +133,15 @@ func ExtractAndDefaultParameters(parameters map[string]string, driverName string
 		case ParameterKeyDiskEncryptionKmsKey:
 			// Resource names (e.g. "keyRings", "cryptoKeys", etc.) are case sensitive, so do not change case
 			p.DiskEncryptionKMSKey = v
-		case ParameterKeyPVCName:
-			p.Tags[tagKeyCreatedForClaimName] = v
-			p.Labels[labelKeyCreatedForClaimName] = v
-		case ParameterKeyPVCNamespace:
-			p.Tags[tagKeyCreatedForClaimNamespace] = v
-			p.Labels[labelKeyCreatedForClaimNamespace] = v
-		case ParameterKeyPVName:
-			p.Tags[tagKeyCreatedForVolumeName] = v
-			p.Labels[labelKeyCreatedForVolumeName] = v
+        case ParameterKeyPVCName:
+            p.Tags[tagKeyCreatedForClaimName] = v
+            p.Labels[labelKeyCreatedForClaimName] = v
+        case ParameterKeyPVCNamespace:
+            p.Tags[tagKeyCreatedForClaimNamespace] = v
+            p.Labels[labelKeyCreatedForClaimNamespace] = v
+        case ParameterKeyPVName:
+            p.Tags[tagKeyCreatedForVolumeName] = v
+            p.Labels[labelKeyCreatedForVolumeName] = v
 		case ParameterKeyLabels:
 			paramLabels, err := ConvertLabelsStringToMap(v)
 			if err != nil {

pkg/common/parameters_test.go

@@ -139,7 +139,7 @@ func TestExtractAndDefaultParameters(t *testing.T) {
 				ReplicationType:      "none",
 				DiskEncryptionKMSKey: "",
 				Tags:                 map[string]string{tagKeyCreatedForClaimName: "testPVCName", tagKeyCreatedForClaimNamespace: "testPVCNamespace", tagKeyCreatedForVolumeName: "testPVName", tagKeyCreatedBy: "testDriver"},
-				Labels:               map[string]string{labelKeyCreatedForClaimName: "testPVCName", labelKeyCreatedForClaimNamespace: "testPVCNamespace", labelKeyCreatedForVolumeName: "testPVName"},
+				Labels:               map[string]string{},
 			},
 		},
 		{
@@ -178,30 +178,18 @@ func TestExtractAndDefaultParameters(t *testing.T) {
 				Labels:               map[string]string{"key1": "value1", "label-1": "value-a", "label-2": "label-value-2"},
 			},
 		},
-		{
-			name:       "PVC labels",
-			parameters: map[string]string{ParameterKeyPVCName: "testPVCName", ParameterKeyPVCNamespace: "testPVCNamespace", ParameterKeyPVName: "testPVName"},
-			labels:     map[string]string{},
-			expectParams: DiskParameters{
-				DiskType:             "pd-standard",
-				ReplicationType:      "none",
-				DiskEncryptionKMSKey: "",
-				Tags:                 map[string]string{tagKeyCreatedForClaimName: "testPVCName", tagKeyCreatedForClaimNamespace: "testPVCNamespace", tagKeyCreatedForVolumeName: "testPVName", tagKeyCreatedBy: "testDriver"},
-				Labels:               map[string]string{labelKeyCreatedForClaimName: "testPVCName", labelKeyCreatedForClaimNamespace: "testPVCNamespace", labelKeyCreatedForVolumeName: "testPVName"},
-			},
-		},
-		{
-			name:       "PVC labels-override",
-			parameters: map[string]string{ParameterKeyPVCName: "testPVCName", ParameterKeyPVCNamespace: "testPVCNamespace", ParameterKeyPVName: "testPVName"},
-			labels:     map[string]string{labelKeyCreatedForClaimNamespace: "test-override"},
-			expectParams: DiskParameters{
-				DiskType:             "pd-standard",
-				ReplicationType:      "none",
-				DiskEncryptionKMSKey: "",
-				Tags:                 map[string]string{tagKeyCreatedForClaimName: "testPVCName", tagKeyCreatedForClaimNamespace: "testPVCNamespace", tagKeyCreatedForVolumeName: "testPVName", tagKeyCreatedBy: "testDriver"},
-				Labels:               map[string]string{labelKeyCreatedForClaimName: "testPVCName", labelKeyCreatedForClaimNamespace: "testPVCNamespace", labelKeyCreatedForVolumeName: "testPVName"},
-			},
-		},
+        {
+            name:       "PVC labels",
+            parameters: map[string]string{ParameterKeyPVCName: "testPVCName", ParameterKeyPVCNamespace: "testPVCNamespace", ParameterKeyPVName: "testPVName"},
+            labels:     map[string]string{},
+            expectParams: DiskParameters{
+                DiskType:             "pd-standard",
+                ReplicationType:      "none",
+                DiskEncryptionKMSKey: "",
+                Tags:                 map[string]string{},
+                Labels:               map[string]string{labelKeyCreatedForClaimName: "testPVCName", labelKeyCreatedForClaimNamespace: "testPVCNamespace", labelKeyCreatedForVolumeName: "testPVName"},
+            },
+        },
 	}
 
 	for _, tc := range tests {