Harmonize parameter consts usage (#416)

ironcore-dev · Feb 1, 2024 · b3887a2 · b3887a2
1 parent a588d1d
commit b3887a2
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 27 deletions.
diff --git a/pkg/driver/controller_test.go b/pkg/driver/controller_test.go
@@ -105,8 +105,8 @@ var _ = Describe("Controller", func() {
 				},
 			},
 			Parameters: map[string]string{
-				"type":   volumeClassExpandOnly.Name,
-				"fstype": "ext4",
+				ParameterType:   volumeClassExpandOnly.Name,
+				ParameterFSType: FSTypeExt4,
 			},
 			AccessibilityRequirements: &csi.TopologyRequirement{
 				Requisite: []*csi.Topology{
@@ -133,11 +133,11 @@ var _ = Describe("Controller", func() {
 				HaveField("Segments", HaveKeyWithValue("topology.csi.ironcore.dev/zone", "volumepool"))),
 			),
 			HaveField("VolumeContext", SatisfyAll(
-				HaveKeyWithValue("volume_id", "volume"),
-				HaveKeyWithValue("volume_name", "volume"),
-				HaveKeyWithValue("volume_pool", "volumepool"),
-				HaveKeyWithValue("fstype", "ext4"),
-				HaveKeyWithValue("creation_time", ContainSubstring(strconv.Itoa(time.Now().Year()))))),
+				HaveKeyWithValue(ParameterVolumeID, "volume"),
+				HaveKeyWithValue(ParameterVolumeName, "volume"),
+				HaveKeyWithValue(ParameterVolumePool, "volumepool"),
+				HaveKeyWithValue(ParameterFSType, FSTypeExt4),
+				HaveKeyWithValue(ParameterCreationTime, ContainSubstring(strconv.Itoa(time.Now().Year()))))),
 		))
 
 		wg.Wait()
@@ -184,8 +184,8 @@ var _ = Describe("Controller", func() {
 				},
 			},
 			Parameters: map[string]string{
-				"type":   "slow",
-				"fstype": "ext4",
+				ParameterType:   "slow",
+				ParameterFSType: FSTypeExt4,
 			},
 			AccessibilityRequirements: &csi.TopologyRequirement{
 				Requisite: []*csi.Topology{
@@ -212,11 +212,11 @@ var _ = Describe("Controller", func() {
 				HaveField("Segments", HaveKeyWithValue("topology.csi.ironcore.dev/zone", "foo"))),
 			),
 			HaveField("VolumeContext", SatisfyAll(
-				HaveKeyWithValue("volume_id", "volume-wrong-pool"),
-				HaveKeyWithValue("volume_name", "volume-wrong-pool"),
-				HaveKeyWithValue("volume_pool", ""),
-				HaveKeyWithValue("fstype", "ext4"),
-				HaveKeyWithValue("creation_time", ContainSubstring(strconv.Itoa(time.Now().Year()))))),
+				HaveKeyWithValue(ParameterVolumeID, "volume-wrong-pool"),
+				HaveKeyWithValue(ParameterVolumeName, "volume-wrong-pool"),
+				HaveKeyWithValue(ParameterVolumePool, ""),
+				HaveKeyWithValue(ParameterFSType, FSTypeExt4),
+				HaveKeyWithValue(ParameterCreationTime, ContainSubstring(strconv.Itoa(time.Now().Year()))))),
 		))
 
 		wg.Wait()
@@ -263,8 +263,8 @@ var _ = Describe("Controller", func() {
 				},
 			},
 			Parameters: map[string]string{
-				"type":   "slow",
-				"fstype": "ext4",
+				ParameterType:   "slow",
+				ParameterFSType: FSTypeExt4,
 			},
 			AccessibilityRequirements: &csi.TopologyRequirement{
 				Requisite: []*csi.Topology{
@@ -332,7 +332,7 @@ var _ = Describe("Controller", func() {
 			},
 			VolumeCapability: &csi.VolumeCapability{
 				AccessType: &csi.VolumeCapability_Mount{Mount: &csi.VolumeCapability_MountVolume{
-					FsType: "ext4",
+					FsType: FSTypeExt4,
 				}},
 				AccessMode: &csi.VolumeCapability_AccessMode{
 					Mode: 1,
@@ -397,8 +397,8 @@ var _ = Describe("Controller", func() {
 				},
 			},
 			Parameters: map[string]string{
-				"type":   volumeClass.Name,
-				"fstype": "ext4",
+				ParameterType:   volumeClass.Name,
+				ParameterFSType: FSTypeExt4,
 			},
 			AccessibilityRequirements: &csi.TopologyRequirement{
 				Requisite: []*csi.Topology{

diff --git a/pkg/driver/node.go b/pkg/driver/node.go
@@ -33,8 +33,8 @@ var (
 
 func (d *driver) NodeStageVolume(_ context.Context, req *csi.NodeStageVolumeRequest) (*csi.NodeStageVolumeResponse, error) {
 	klog.InfoS("Staging volume on node ", "Volume", req.GetVolumeId(), "StagingTargetPath", req.GetStagingTargetPath())
-	fstype := req.GetVolumeContext()["fstype"]
-	devicePath := req.PublishContext["device_name"]
+	fstype := req.GetVolumeContext()[ParameterFSType]
+	devicePath := req.PublishContext[ParameterDeviceName]
 
 	klog.InfoS("Check if the device path exists")
 	if _, err := d.os.Stat(devicePath); err != nil {
@@ -119,7 +119,7 @@ func (d *driver) NodePublishVolume(_ context.Context, req *csi.NodePublishVolume
 		}
 	}
 
-	fstype := req.GetVolumeContext()["fstype"]
+	fstype := req.GetVolumeContext()[ParameterFSType]
 	if len(fstype) == 0 {
 		fstype = FSTypeExt4
 	}

diff --git a/pkg/driver/node_test.go b/pkg/driver/node_test.go
@@ -48,7 +48,7 @@ var _ = Describe("Node", func() {
 		volumeId = "test-volume-id"
 		devicePath = "/dev/sdb"
 		targetPath = "/target/path"
-		fstype = "ext4"
+		fstype = FSTypeExt4
 	})
 
 	AfterEach(func() {
@@ -66,8 +66,8 @@ var _ = Describe("Node", func() {
 			req = &csi.NodeStageVolumeRequest{
 				VolumeId:          volumeId,
 				StagingTargetPath: targetPath,
-				VolumeContext:     map[string]string{"fstype": fstype, "readOnly": "false"},
-				PublishContext:    map[string]string{"device_name": devicePath},
+				VolumeContext:     map[string]string{ParameterFSType: fstype, "readOnly": "false"},
+				PublishContext:    map[string]string{ParameterDeviceName: devicePath},
 				VolumeCapability: &csi.VolumeCapability{
 					AccessMode: &csi.VolumeCapability_AccessMode{
 						Mode: csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
@@ -154,11 +154,11 @@ var _ = Describe("Node", func() {
 					},
 					AccessType: &csi.VolumeCapability_Mount{
 						Mount: &csi.VolumeCapability_MountVolume{
-							FsType: "ext4",
+							FsType: FSTypeExt4,
 						},
 					},
 				},
-				PublishContext: map[string]string{"device_name": devicePath},
+				PublishContext: map[string]string{ParameterDeviceName: devicePath},
 			}
 		})