Skip to content

Commit b0d15e9

Browse files
committed
Modify default volumeID
1 parent f205d62 commit b0d15e9

File tree

1 file changed

+28
-24
lines changed

1 file changed

+28
-24
lines changed

pkg/gce-pd-csi-driver/node_test.go

+28-24
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ import (
2525
mountmanager "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/mount-manager"
2626
)
2727

28+
const defaultVolumeID = "project/test001/zones/c1/disks/testDisk"
29+
const defaultTargetPath = "/mnt/test"
30+
const defaultStagingPath = "/staging"
31+
2832
func getTestGCEDriver(t *testing.T) *GCEDriver {
2933
gceDriver := GetGCEDriver()
3034
err := gceDriver.SetupGCEDriver(nil, mountmanager.NewFakeSafeMounter(), mountmanager.NewFakeDeviceUtils(), metadataservice.NewFakeService(), driver, "test-vendor")
@@ -100,18 +104,18 @@ func TestNodePublishVolume(t *testing.T) {
100104
{
101105
name: "Valid request",
102106
req: &csi.NodePublishVolumeRequest{
103-
VolumeId: "1",
104-
TargetPath: "/mnt/test",
105-
StagingTargetPath: "/staging",
107+
VolumeId: defaultVolumeID,
108+
TargetPath: defaultTargetPath,
109+
StagingTargetPath: defaultStagingPath,
106110
Readonly: false,
107111
VolumeCapability: &csi.VolumeCapability{},
108112
},
109113
},
110114
{
111115
name: "Invalid request (No VolumeId)",
112116
req: &csi.NodePublishVolumeRequest{
113-
TargetPath: "/mnt/test",
114-
StagingTargetPath: "/staging",
117+
TargetPath: defaultTargetPath,
118+
StagingTargetPath: defaultStagingPath,
115119
Readonly: false,
116120
VolumeCapability: &csi.VolumeCapability{},
117121
},
@@ -120,8 +124,8 @@ func TestNodePublishVolume(t *testing.T) {
120124
{
121125
name: "Invalid request (No TargetPath)",
122126
req: &csi.NodePublishVolumeRequest{
123-
VolumeId: "1",
124-
StagingTargetPath: "/staging",
127+
VolumeId: defaultVolumeID,
128+
StagingTargetPath: defaultStagingPath,
125129
Readonly: false,
126130
VolumeCapability: &csi.VolumeCapability{},
127131
},
@@ -130,8 +134,8 @@ func TestNodePublishVolume(t *testing.T) {
130134
{
131135
name: "Invalid request (No StagingTargetPath)",
132136
req: &csi.NodePublishVolumeRequest{
133-
VolumeId: "1",
134-
TargetPath: "/mnt/test",
137+
VolumeId: defaultVolumeID,
138+
TargetPath: defaultTargetPath,
135139
Readonly: false,
136140
VolumeCapability: &csi.VolumeCapability{},
137141
},
@@ -140,9 +144,9 @@ func TestNodePublishVolume(t *testing.T) {
140144
{
141145
name: "Invalid request (Nil VolumeCapability)",
142146
req: &csi.NodePublishVolumeRequest{
143-
VolumeId: "1",
144-
TargetPath: "/mnt/test",
145-
StagingTargetPath: "/staging",
147+
VolumeId: defaultVolumeID,
148+
TargetPath: defaultTargetPath,
149+
StagingTargetPath: defaultStagingPath,
146150
Readonly: false,
147151
VolumeCapability: nil,
148152
},
@@ -179,21 +183,21 @@ func TestNodeUnpublishVolume(t *testing.T) {
179183
{
180184
name: "Valid request",
181185
req: &csi.NodeUnpublishVolumeRequest{
182-
VolumeId: "1",
183-
TargetPath: "/mnt/test",
186+
VolumeId: defaultVolumeID,
187+
TargetPath: defaultTargetPath,
184188
},
185189
},
186190
{
187191
name: "Invalid request (No VolumeId)",
188192
req: &csi.NodeUnpublishVolumeRequest{
189-
TargetPath: "/mnt/test",
193+
TargetPath: defaultTargetPath,
190194
},
191195
expErrCode: codes.InvalidArgument,
192196
},
193197
{
194198
name: "Invalid request (No TargetPath)",
195199
req: &csi.NodeUnpublishVolumeRequest{
196-
VolumeId: "1",
200+
VolumeId: defaultVolumeID,
197201
},
198202
expErrCode: codes.InvalidArgument,
199203
},
@@ -237,14 +241,14 @@ func TestNodeStageVolume(t *testing.T) {
237241
name: "Valid request",
238242
req: &csi.NodeStageVolumeRequest{
239243
VolumeId: volumeID,
240-
StagingTargetPath: "/staging",
244+
StagingTargetPath: defaultStagingPath,
241245
VolumeCapability: &csi.VolumeCapability{},
242246
},
243247
},
244248
{
245249
name: "Invalid request (No VolumeId)",
246250
req: &csi.NodeStageVolumeRequest{
247-
StagingTargetPath: "/staging",
251+
StagingTargetPath: defaultStagingPath,
248252
VolumeCapability: &csi.VolumeCapability{},
249253
},
250254
expErrCode: codes.InvalidArgument,
@@ -261,7 +265,7 @@ func TestNodeStageVolume(t *testing.T) {
261265
name: "Invalid request (Nil VolumeCapability)",
262266
req: &csi.NodeStageVolumeRequest{
263267
VolumeId: volumeID,
264-
StagingTargetPath: "/staging",
268+
StagingTargetPath: defaultStagingPath,
265269
VolumeCapability: nil,
266270
},
267271
expErrCode: codes.InvalidArgument,
@@ -270,7 +274,7 @@ func TestNodeStageVolume(t *testing.T) {
270274
name: "Invalid request (No Mount in capability)",
271275
req: &csi.NodeStageVolumeRequest{
272276
VolumeId: volumeID,
273-
StagingTargetPath: "/staging",
277+
StagingTargetPath: defaultStagingPath,
274278
VolumeCapability: cap,
275279
},
276280
expErrCode: codes.Unimplemented,
@@ -307,21 +311,21 @@ func TestNodeUnstageVolume(t *testing.T) {
307311
{
308312
name: "Valid request",
309313
req: &csi.NodeUnstageVolumeRequest{
310-
VolumeId: "1",
311-
StagingTargetPath: "/staging",
314+
VolumeId: defaultVolumeID,
315+
StagingTargetPath: defaultStagingPath,
312316
},
313317
},
314318
{
315319
name: "Invalid request (No VolumeId)",
316320
req: &csi.NodeUnstageVolumeRequest{
317-
StagingTargetPath: "/staging",
321+
StagingTargetPath: defaultStagingPath,
318322
},
319323
expErrCode: codes.InvalidArgument,
320324
},
321325
{
322326
name: "Invalid request (No StagingTargetPath)",
323327
req: &csi.NodeUnstageVolumeRequest{
324-
VolumeId: "1",
328+
VolumeId: defaultVolumeID,
325329
},
326330
expErrCode: codes.InvalidArgument,
327331
},

0 commit comments

Comments
 (0)