Skip to content

Commit d511ebe

Browse files
GouthamMLGouthamML
committed
fix csi_snapshot_restore.go
1 parent 7d9abab commit d511ebe

File tree

1 file changed

+28
-29
lines changed

1 file changed

+28
-29
lines changed

‎test/e2e/cloud-provider-oci/csi_snapshot_restore.go‎

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ const (
3030
WriteCommandBlock = "echo 'Hello World' > /var/test.txt; dd if=/var/test.txt of=/dev/xvda count=8; while true; do sleep 5; done"
3131
KeepAliveCommand = "while true; do echo 'hello world' >> /usr/share/nginx/html/out.txt; sleep 5; done"
3232
KeepAliveCommandBlock = "while true; do echo 'hello world' >> /var/newpod.txt; sleep 5; done"
33-
BVDriverName = "blockvolume.csi.oraclecloud.com"
3433
BindingModeWaitForFirstConsumer = "WaitForFirstConsumer"
3534
ReclaimPolicyDelete = "Delete"
3635
ReclaimPolicyRetain = "Retain"
@@ -72,14 +71,14 @@ var _ = Describe("Snapshot Creation and Restore", func() {
7271
pvcJig := framework.NewPVCTestJig(f.ClientSet, "csi-snapshot-restore-e2e-tests")
7372
pvcJig.InitialiseSnapClient(f.SnapClientSet)
7473

75-
scName := f.CreateStorageClassOrFail(f.Namespace.Name, BVDriverName, scParams, pvcJig.Labels, BindingModeWaitForFirstConsumer, true, ReclaimPolicyDelete, nil)
74+
scName := f.CreateStorageClassOrFail(f.Namespace.Name, setupF.BlockProvisionerName, scParams, pvcJig.Labels, BindingModeWaitForFirstConsumer, true, ReclaimPolicyDelete, nil)
7675
pvc := pvcJig.CreateAndAwaitPVCOrFailCSI(f.Namespace.Name, framework.MinVolumeBlock, scName, nil, v1.PersistentVolumeFilesystem, v1.ReadWriteOnce, v1.ClaimPending)
7776

7877
_ = pvcJig.NewPodForCSI("pod-original", f.Namespace.Name, pvc.Name, "", v1.PersistentVolumeBlock)
7978

8079
time.Sleep(60 * time.Second) //waiting for pod to up and running
8180

82-
vscName := f.CreateVolumeSnapshotClassOrFail(f.Namespace.Name, BVDriverName, vscParams, ReclaimPolicyDelete)
81+
vscName := f.CreateVolumeSnapshotClassOrFail(f.Namespace.Name, setupF.BlockProvisionerName, vscParams, ReclaimPolicyDelete)
8382
vs := pvcJig.CreateAndAwaitVolumeSnapshotOrFail(f.Namespace.Name, vscName, pvc.Name, nil)
8483

8584
pvcRestore := pvcJig.CreateAndAwaitPVCOrFailSnapshotSource(f.Namespace.Name, framework.MaxVolumeBlock, scName, vs.Name, v1.ReadWriteOnce, v1.ClaimPending, false, nil)
@@ -100,14 +99,14 @@ var _ = Describe("Snapshot Creation and Restore", func() {
10099
pvcJig := framework.NewPVCTestJig(f.ClientSet, "csi-snapshot-restore-e2e-tests")
101100
pvcJig.InitialiseSnapClient(f.SnapClientSet)
102101

103-
scName := f.CreateStorageClassOrFail(f.Namespace.Name, BVDriverName, scParams, pvcJig.Labels, BindingModeWaitForFirstConsumer, true, ReclaimPolicyDelete, nil)
102+
scName := f.CreateStorageClassOrFail(f.Namespace.Name, setupF.BlockProvisionerName, scParams, pvcJig.Labels, BindingModeWaitForFirstConsumer, true, ReclaimPolicyDelete, nil)
104103
pvc := pvcJig.CreateAndAwaitPVCOrFailCSI(f.Namespace.Name, framework.MinVolumeBlock, scName, nil, v1.PersistentVolumeFilesystem, v1.ReadWriteOnce, v1.ClaimPending)
105104

106105
_ = pvcJig.NewPodForCSI("pod-original", f.Namespace.Name, pvc.Name, "", v1.PersistentVolumeBlock)
107106

108107
time.Sleep(60 * time.Second) //waiting for pod to up and running
109108

110-
vscName := f.CreateVolumeSnapshotClassOrFail(f.Namespace.Name, BVDriverName, vscParams, ReclaimPolicyDelete)
109+
vscName := f.CreateVolumeSnapshotClassOrFail(f.Namespace.Name, setupF.BlockProvisionerName, vscParams, ReclaimPolicyDelete)
111110
vs := pvcJig.CreateAndAwaitVolumeSnapshotOrFail(f.Namespace.Name, vscName, pvc.Name, nil)
112111

113112
pvcRestore := pvcJig.CreateAndAwaitPVCOrFailSnapshotSource(f.Namespace.Name, framework.MaxVolumeBlock, scName, vs.Name, v1.ReadWriteOnce, v1.ClaimPending, false, nil)
@@ -129,11 +128,11 @@ var _ = Describe("Snapshot Creation and Restore", func() {
129128
pvcJig.InitialiseSnapClient(f.SnapClientSet)
130129

131130
//creating a snapshot dynamically
132-
scName := f.CreateStorageClassOrFail(f.Namespace.Name, BVDriverName, scParams, pvcJig.Labels, BindingModeWaitForFirstConsumer, true, ReclaimPolicyDelete, nil)
131+
scName := f.CreateStorageClassOrFail(f.Namespace.Name, setupF.BlockProvisionerName, scParams, pvcJig.Labels, BindingModeWaitForFirstConsumer, true, ReclaimPolicyDelete, nil)
133132
pvc := pvcJig.CreateAndAwaitPVCOrFailCSI(f.Namespace.Name, framework.MinVolumeBlock, scName, nil, v1.PersistentVolumeFilesystem, v1.ReadWriteOnce, v1.ClaimPending)
134133
podName := pvcJig.CreateAndAwaitNginxPodOrFail(f.Namespace.Name, pvc, WriteCommand)
135134
pvcJig.CheckFileExists(f.Namespace.Name, podName, "/usr/share/nginx/html", "testdata.txt")
136-
vscName := f.CreateVolumeSnapshotClassOrFail(f.Namespace.Name, BVDriverName, vscParams, ReclaimPolicyDelete)
135+
vscName := f.CreateVolumeSnapshotClassOrFail(f.Namespace.Name, setupF.BlockProvisionerName, vscParams, ReclaimPolicyDelete)
137136
vs := pvcJig.CreateAndAwaitVolumeSnapshotOrFail(f.Namespace.Name, vscName, pvc.Name, nil)
138137

139138
//Waiting for volume snapshot content to be created and status field to be populated
@@ -145,7 +144,7 @@ var _ = Describe("Snapshot Creation and Restore", func() {
145144

146145
//creating a snapshot statically using the backup provisioned dynamically
147146
restoreVsName := "e2e-restore-vs"
148-
vscontentName := pvcJig.CreateVolumeSnapshotContentOrFail(f.Namespace.Name+"-e2e-snapshot-vsc", BVDriverName, backupOCID, ReclaimPolicyDelete, restoreVsName, f.Namespace.Name, v1.PersistentVolumeFilesystem)
147+
vscontentName := pvcJig.CreateVolumeSnapshotContentOrFail(f.Namespace.Name+"-e2e-snapshot-vsc", setupF.BlockProvisionerName, backupOCID, ReclaimPolicyDelete, restoreVsName, f.Namespace.Name, v1.PersistentVolumeFilesystem)
149148

150149
pvcJig.CreateAndAwaitVolumeSnapshotStaticOrFail(restoreVsName, f.Namespace.Name, vscontentName)
151150

@@ -170,11 +169,11 @@ var _ = Describe("Snapshot Creation and Restore", func() {
170169

171170
backupOCID := pvcJig.CreateVolumeBackup(f.BlockStorageClient, setupF.StaticSnapshotCompartmentOcid, *volId, "test-backup")
172171

173-
scName := f.CreateStorageClassOrFail(f.Namespace.Name, BVDriverName, scParams, pvcJig.Labels, BindingModeWaitForFirstConsumer, true, ReclaimPolicyDelete, nil)
172+
scName := f.CreateStorageClassOrFail(f.Namespace.Name, setupF.BlockProvisionerName, scParams, pvcJig.Labels, BindingModeWaitForFirstConsumer, true, ReclaimPolicyDelete, nil)
174173

175174
//creating a snapshot statically using the backup provisioned dynamically
176175
restoreVsName := "e2e-restore-vs"
177-
vscontentName := pvcJig.CreateVolumeSnapshotContentOrFail(f.Namespace.Name+"-e2e-snapshot-vsc", BVDriverName, *backupOCID, ReclaimPolicyDelete, restoreVsName, f.Namespace.Name, v1.PersistentVolumeFilesystem)
176+
vscontentName := pvcJig.CreateVolumeSnapshotContentOrFail(f.Namespace.Name+"-e2e-snapshot-vsc", setupF.BlockProvisionerName, *backupOCID, ReclaimPolicyDelete, restoreVsName, f.Namespace.Name, v1.PersistentVolumeFilesystem)
178177

179178
pvcJig.CreateAndAwaitVolumeSnapshotStaticOrFail(restoreVsName, f.Namespace.Name, vscontentName)
180179

@@ -230,14 +229,14 @@ var _ = Describe("Raw Block Volume Snapshot Creation and Restore", func() {
230229
pvcJig := framework.NewPVCTestJig(f.ClientSet, "csi-snapshot-restore-e2e-tests")
231230
pvcJig.InitialiseSnapClient(f.SnapClientSet)
232231

233-
scName := f.CreateStorageClassOrFail(f.Namespace.Name, BVDriverName, scParams, pvcJig.Labels, BindingModeWaitForFirstConsumer, true, ReclaimPolicyDelete, nil)
232+
scName := f.CreateStorageClassOrFail(f.Namespace.Name, setupF.BlockProvisionerName, scParams, pvcJig.Labels, BindingModeWaitForFirstConsumer, true, ReclaimPolicyDelete, nil)
234233
pvc := pvcJig.CreateAndAwaitPVCOrFailCSI(f.Namespace.Name, framework.MinVolumeBlock, scName, nil, v1.PersistentVolumeBlock, v1.ReadWriteOnce, v1.ClaimPending)
235234

236235
_ = pvcJig.NewPodForCSI("pod-original", f.Namespace.Name, pvc.Name, "", v1.PersistentVolumeBlock)
237236

238237
time.Sleep(60 * time.Second) //waiting for pod to up and running
239238

240-
vscName := f.CreateVolumeSnapshotClassOrFail(f.Namespace.Name, BVDriverName, vscParams, ReclaimPolicyDelete)
239+
vscName := f.CreateVolumeSnapshotClassOrFail(f.Namespace.Name, setupF.BlockProvisionerName, vscParams, ReclaimPolicyDelete)
241240
vs := pvcJig.CreateAndAwaitVolumeSnapshotOrFail(f.Namespace.Name, vscName, pvc.Name, nil)
242241

243242
pvcRestore := pvcJig.CreateAndAwaitPVCOrFailSnapshotSource(f.Namespace.Name, framework.MaxVolumeBlock, scName, vs.Name, v1.ReadWriteOnce, v1.ClaimPending, true, nil)
@@ -258,14 +257,14 @@ var _ = Describe("Raw Block Volume Snapshot Creation and Restore", func() {
258257
pvcJig := framework.NewPVCTestJig(f.ClientSet, "csi-snapshot-restore-e2e-tests")
259258
pvcJig.InitialiseSnapClient(f.SnapClientSet)
260259

261-
scName := f.CreateStorageClassOrFail(f.Namespace.Name, BVDriverName, scParams, pvcJig.Labels, BindingModeWaitForFirstConsumer, true, ReclaimPolicyDelete, nil)
260+
scName := f.CreateStorageClassOrFail(f.Namespace.Name, setupF.BlockProvisionerName, scParams, pvcJig.Labels, BindingModeWaitForFirstConsumer, true, ReclaimPolicyDelete, nil)
262261
pvc := pvcJig.CreateAndAwaitPVCOrFailCSI(f.Namespace.Name, framework.MinVolumeBlock, scName, nil, v1.PersistentVolumeBlock, v1.ReadWriteOnce, v1.ClaimPending)
263262

264263
_ = pvcJig.NewPodForCSI("pod-original", f.Namespace.Name, pvc.Name, "", v1.PersistentVolumeBlock)
265264

266265
time.Sleep(60 * time.Second) //waiting for pod to up and running
267266

268-
vscName := f.CreateVolumeSnapshotClassOrFail(f.Namespace.Name, BVDriverName, vscParams, ReclaimPolicyDelete)
267+
vscName := f.CreateVolumeSnapshotClassOrFail(f.Namespace.Name, setupF.BlockProvisionerName, vscParams, ReclaimPolicyDelete)
269268
vs := pvcJig.CreateAndAwaitVolumeSnapshotOrFail(f.Namespace.Name, vscName, pvc.Name, nil)
270269

271270
pvcRestore := pvcJig.CreateAndAwaitPVCOrFailSnapshotSource(f.Namespace.Name, framework.MaxVolumeBlock, scName, vs.Name, v1.ReadWriteOnce, v1.ClaimPending, true, nil)
@@ -287,11 +286,11 @@ var _ = Describe("Raw Block Volume Snapshot Creation and Restore", func() {
287286
pvcJig.InitialiseSnapClient(f.SnapClientSet)
288287

289288
//creating a snapshot dynamically
290-
scName := f.CreateStorageClassOrFail(f.Namespace.Name, BVDriverName, scParams, pvcJig.Labels, BindingModeWaitForFirstConsumer, true, ReclaimPolicyDelete, nil)
289+
scName := f.CreateStorageClassOrFail(f.Namespace.Name, setupF.BlockProvisionerName, scParams, pvcJig.Labels, BindingModeWaitForFirstConsumer, true, ReclaimPolicyDelete, nil)
291290
pvc := pvcJig.CreateAndAwaitPVCOrFailCSI(f.Namespace.Name, framework.MinVolumeBlock, scName, nil, v1.PersistentVolumeBlock, v1.ReadWriteOnce, v1.ClaimPending)
292291
podName := pvcJig.CreateAndAwaitNginxPodOrFail(f.Namespace.Name, pvc, WriteCommandBlock)
293292
pvcJig.CheckDataInBlockDevice(f.Namespace.Name, podName, "Hello World")
294-
vscName := f.CreateVolumeSnapshotClassOrFail(f.Namespace.Name, BVDriverName, vscParams, ReclaimPolicyDelete)
293+
vscName := f.CreateVolumeSnapshotClassOrFail(f.Namespace.Name, setupF.BlockProvisionerName, vscParams, ReclaimPolicyDelete)
295294
vs := pvcJig.CreateAndAwaitVolumeSnapshotOrFail(f.Namespace.Name, vscName, pvc.Name, nil)
296295

297296
//Waiting for volume snapshot content to be created and status field to be populated
@@ -303,7 +302,7 @@ var _ = Describe("Raw Block Volume Snapshot Creation and Restore", func() {
303302

304303
//creating a snapshot statically using the backup provisioned dynamically
305304
restoreVsName := "e2e-restore-vs"
306-
vscontentName := pvcJig.CreateVolumeSnapshotContentOrFail(f.Namespace.Name+"-e2e-snapshot-vsc", BVDriverName, backupOCID, ReclaimPolicyDelete, restoreVsName, f.Namespace.Name, v1.PersistentVolumeBlock)
305+
vscontentName := pvcJig.CreateVolumeSnapshotContentOrFail(f.Namespace.Name+"-e2e-snapshot-vsc", setupF.BlockProvisionerName, backupOCID, ReclaimPolicyDelete, restoreVsName, f.Namespace.Name, v1.PersistentVolumeBlock)
307306

308307
pvcJig.CreateAndAwaitVolumeSnapshotStaticOrFail(restoreVsName, f.Namespace.Name, vscontentName)
309308

@@ -326,11 +325,11 @@ var _ = Describe("Raw Block Volume Snapshot Creation and Restore", func() {
326325

327326
backupOCID := pvcJig.CreateVolumeBackup(f.BlockStorageClient, setupF.StaticSnapshotCompartmentOcid, *volId, "test-backup")
328327

329-
scName := f.CreateStorageClassOrFail(f.Namespace.Name, BVDriverName, scParams, pvcJig.Labels, BindingModeWaitForFirstConsumer, true, ReclaimPolicyDelete, nil)
328+
scName := f.CreateStorageClassOrFail(f.Namespace.Name, setupF.BlockProvisionerName, scParams, pvcJig.Labels, BindingModeWaitForFirstConsumer, true, ReclaimPolicyDelete, nil)
330329

331330
//creating a snapshot statically using the backup provisioned dynamically
332331
restoreVsName := "e2e-restore-vs"
333-
vscontentName := pvcJig.CreateVolumeSnapshotContentOrFail(f.Namespace.Name+"-e2e-snapshot-vsc", BVDriverName, *backupOCID, ReclaimPolicyDelete, restoreVsName, f.Namespace.Name, v1.PersistentVolumeBlock)
332+
vscontentName := pvcJig.CreateVolumeSnapshotContentOrFail(f.Namespace.Name+"-e2e-snapshot-vsc", setupF.BlockProvisionerName, *backupOCID, ReclaimPolicyDelete, restoreVsName, f.Namespace.Name, v1.PersistentVolumeBlock)
334333

335334
pvcJig.CreateAndAwaitVolumeSnapshotStaticOrFail(restoreVsName, f.Namespace.Name, vscontentName)
336335

@@ -363,12 +362,12 @@ var _ = Describe("Volume Snapshot Deletion Tests", func() {
363362
scParams := map[string]string{framework.AttachmentType: framework.AttachmentTypeISCSI}
364363
vscParams := map[string]string{framework.BackupType: framework.BackupTypeFull}
365364

366-
scName := f.CreateStorageClassOrFail(f.Namespace.Name, BVDriverName, scParams, pvcJig.Labels, BindingModeWaitForFirstConsumer, true, ReclaimPolicyDelete, nil)
365+
scName := f.CreateStorageClassOrFail(f.Namespace.Name, setupF.BlockProvisionerName, scParams, pvcJig.Labels, BindingModeWaitForFirstConsumer, true, ReclaimPolicyDelete, nil)
367366
pvc := pvcJig.CreateAndAwaitPVCOrFailCSI(f.Namespace.Name, framework.MinVolumeBlock, scName, nil, v1.PersistentVolumeFilesystem, v1.ReadWriteOnce, v1.ClaimPending)
368367

369368
_ = pvcJig.CreateAndAwaitNginxPodOrFail(f.Namespace.Name, pvc, WriteCommand)
370369

371-
vscName := f.CreateVolumeSnapshotClassOrFail(f.Namespace.Name, BVDriverName, vscParams, ReclaimPolicyDelete)
370+
vscName := f.CreateVolumeSnapshotClassOrFail(f.Namespace.Name, setupF.BlockProvisionerName, vscParams, ReclaimPolicyDelete)
372371
vs := pvcJig.CreateAndAwaitVolumeSnapshotOrFail(f.Namespace.Name, vscName, pvc.Name, nil)
373372

374373
//Waiting for volume snapshot content to be created and status field to be populated
@@ -400,12 +399,12 @@ var _ = Describe("Volume Snapshot Deletion Tests", func() {
400399
scParams := map[string]string{framework.AttachmentType: framework.AttachmentTypeISCSI}
401400
vscParams := map[string]string{framework.BackupType: framework.BackupTypeFull}
402401

403-
scName := f.CreateStorageClassOrFail(f.Namespace.Name, BVDriverName, scParams, pvcJig.Labels, BindingModeWaitForFirstConsumer, true, ReclaimPolicyDelete, nil)
402+
scName := f.CreateStorageClassOrFail(f.Namespace.Name, setupF.BlockProvisionerName, scParams, pvcJig.Labels, BindingModeWaitForFirstConsumer, true, ReclaimPolicyDelete, nil)
404403
pvc := pvcJig.CreateAndAwaitPVCOrFailCSI(f.Namespace.Name, framework.MinVolumeBlock, scName, nil, v1.PersistentVolumeFilesystem, v1.ReadWriteOnce, v1.ClaimPending)
405404

406405
_ = pvcJig.CreateAndAwaitNginxPodOrFail(f.Namespace.Name, pvc, WriteCommand)
407406

408-
vscName := f.CreateVolumeSnapshotClassOrFail(f.Namespace.Name, BVDriverName, vscParams, ReclaimPolicyRetain)
407+
vscName := f.CreateVolumeSnapshotClassOrFail(f.Namespace.Name, setupF.BlockProvisionerName, vscParams, ReclaimPolicyRetain)
409408
vs := pvcJig.CreateAndAwaitVolumeSnapshotOrFail(f.Namespace.Name, vscName, pvc.Name, nil)
410409

411410
//Waiting for volume snapshot content to be created and status field to be populated
@@ -455,12 +454,12 @@ var _ = Describe("Raw Block Volume Snapshot Deletion Tests", func() {
455454
scParams := map[string]string{framework.AttachmentType: framework.AttachmentTypeISCSI}
456455
vscParams := map[string]string{framework.BackupType: framework.BackupTypeFull}
457456

458-
scName := f.CreateStorageClassOrFail(f.Namespace.Name, BVDriverName, scParams, pvcJig.Labels, BindingModeWaitForFirstConsumer, true, ReclaimPolicyDelete, nil)
457+
scName := f.CreateStorageClassOrFail(f.Namespace.Name, setupF.BlockProvisionerName, scParams, pvcJig.Labels, BindingModeWaitForFirstConsumer, true, ReclaimPolicyDelete, nil)
459458
pvc := pvcJig.CreateAndAwaitPVCOrFailCSI(f.Namespace.Name, framework.MinVolumeBlock, scName, nil, v1.PersistentVolumeBlock, v1.ReadWriteOnce, v1.ClaimPending)
460459

461460
_ = pvcJig.CreateAndAwaitNginxPodOrFail(f.Namespace.Name, pvc, WriteCommandBlock)
462461

463-
vscName := f.CreateVolumeSnapshotClassOrFail(f.Namespace.Name, BVDriverName, vscParams, ReclaimPolicyDelete)
462+
vscName := f.CreateVolumeSnapshotClassOrFail(f.Namespace.Name, setupF.BlockProvisionerName, vscParams, ReclaimPolicyDelete)
464463
vs := pvcJig.CreateAndAwaitVolumeSnapshotOrFail(f.Namespace.Name, vscName, pvc.Name, nil)
465464

466465
//Waiting for volume snapshot content to be created and status field to be populated
@@ -492,12 +491,12 @@ var _ = Describe("Raw Block Volume Snapshot Deletion Tests", func() {
492491
scParams := map[string]string{framework.AttachmentType: framework.AttachmentTypeISCSI}
493492
vscParams := map[string]string{framework.BackupType: framework.BackupTypeFull}
494493

495-
scName := f.CreateStorageClassOrFail(f.Namespace.Name, BVDriverName, scParams, pvcJig.Labels, BindingModeWaitForFirstConsumer, true, ReclaimPolicyDelete, nil)
494+
scName := f.CreateStorageClassOrFail(f.Namespace.Name, setupF.BlockProvisionerName, scParams, pvcJig.Labels, BindingModeWaitForFirstConsumer, true, ReclaimPolicyDelete, nil)
496495
pvc := pvcJig.CreateAndAwaitPVCOrFailCSI(f.Namespace.Name, framework.MinVolumeBlock, scName, nil, v1.PersistentVolumeBlock, v1.ReadWriteOnce, v1.ClaimPending)
497496

498497
_ = pvcJig.CreateAndAwaitNginxPodOrFail(f.Namespace.Name, pvc, WriteCommandBlock)
499498

500-
vscName := f.CreateVolumeSnapshotClassOrFail(f.Namespace.Name, BVDriverName, vscParams, ReclaimPolicyRetain)
499+
vscName := f.CreateVolumeSnapshotClassOrFail(f.Namespace.Name, setupF.BlockProvisionerName, vscParams, ReclaimPolicyRetain)
501500
vs := pvcJig.CreateAndAwaitVolumeSnapshotOrFail(f.Namespace.Name, vscName, pvc.Name, nil)
502501

503502
//Waiting for volume snapshot content to be created and status field to be populated
@@ -540,7 +539,7 @@ func testSnapshotAndRestore(f *framework.CloudProviderFramework, scParams map[st
540539
pvcJig := framework.NewPVCTestJig(f.ClientSet, "csi-snapshot-restore-e2e-tests")
541540
pvcJig.InitialiseSnapClient(f.SnapClientSet)
542541

543-
scName := f.CreateStorageClassOrFail(f.Namespace.Name, BVDriverName, scParams, pvcJig.Labels, BindingModeWaitForFirstConsumer, true, ReclaimPolicyDelete, nil)
542+
scName := f.CreateStorageClassOrFail(f.Namespace.Name, setupF.BlockProvisionerName, scParams, pvcJig.Labels, BindingModeWaitForFirstConsumer, true, ReclaimPolicyDelete, nil)
544543

545544
pvc := pvcJig.CreateAndAwaitPVCOrFailCSI(f.Namespace.Name, framework.MinVolumeBlock, scName, nil, volumeMode, v1.ReadWriteOnce, v1.ClaimPending)
546545

@@ -553,7 +552,7 @@ func testSnapshotAndRestore(f *framework.CloudProviderFramework, scParams map[st
553552
// Waiting to be sure write command runs
554553
time.Sleep(30 * time.Second)
555554

556-
vscName := f.CreateVolumeSnapshotClassOrFail(f.Namespace.Name, BVDriverName, vscParams, ReclaimPolicyDelete)
555+
vscName := f.CreateVolumeSnapshotClassOrFail(f.Namespace.Name, setupF.BlockProvisionerName, vscParams, ReclaimPolicyDelete)
557556
vs := pvcJig.CreateAndAwaitVolumeSnapshotOrFail(f.Namespace.Name, vscName, pvc.Name, nil)
558557

559558
if volumeMode == v1.PersistentVolumeFilesystem {

0 commit comments

Comments
 (0)