Skip to content

Commit 35eb219

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #524 from huww98/create-capacity
use MakeCreateVolumeReq()
2 parents 660eb5b + ce1eb8c commit 35eb219

File tree

3 files changed

+44
-231
lines changed

3 files changed

+44
-231
lines changed

‎pkg/sanity/controller.go‎

Lines changed: 38 additions & 189 deletions
Original file line numberDiff line numberDiff line change
@@ -217,15 +217,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
217217
name := "sanity"
218218

219219
// Create a new volume.
220-
req := &csi.CreateVolumeRequest{
221-
Name: name,
222-
VolumeCapabilities: []*csi.VolumeCapability{
223-
TestVolumeCapabilityWithAccessType(sc, csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER),
224-
},
225-
Secrets: sc.Secrets.CreateVolumeSecret,
226-
Parameters: sc.Config.TestVolumeParameters,
227-
}
228-
220+
req := MakeCreateVolumeReq(sc, name)
229221
vol := r.MustCreateVolume(context.Background(), req)
230222

231223
// List volumes and check for the newly created volume.
@@ -291,15 +283,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
291283
By("creating required new volumes")
292284
for i := initialTotalVols; i < minVolCount; i++ {
293285
name := "sanity" + strconv.Itoa(i)
294-
req := &csi.CreateVolumeRequest{
295-
Name: name,
296-
VolumeCapabilities: []*csi.VolumeCapability{
297-
TestVolumeCapabilityWithAccessType(sc, csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER),
298-
},
299-
Secrets: sc.Secrets.CreateVolumeSecret,
300-
Parameters: sc.Config.TestVolumeParameters,
301-
}
302-
286+
req := MakeCreateVolumeReq(sc, name)
303287
vol, err := r.CreateVolume(context.Background(), req)
304288
Expect(err).NotTo(HaveOccurred())
305289
Expect(vol).NotTo(BeNil())
@@ -335,15 +319,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
335319
}
336320

337321
By("creating a new volume")
338-
req := &csi.CreateVolumeRequest{
339-
Name: "new-addition",
340-
VolumeCapabilities: []*csi.VolumeCapability{
341-
TestVolumeCapabilityWithAccessType(sc, csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER),
342-
},
343-
Secrets: sc.Secrets.CreateVolumeSecret,
344-
Parameters: sc.Config.TestVolumeParameters,
345-
}
346-
vol := r.MustCreateVolume(context.Background(), req)
322+
vol := r.MustCreateVolume(context.Background(), MakeCreateVolumeReq(sc, "new-addition"))
347323
existing_vols[vol.Volume.VolumeId] = true
348324

349325
vols, err = r.ListVolumes(
@@ -399,21 +375,11 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
399375

400376
By("creating a volume")
401377
name := UniqueString("sanity-controller-create-single-no-capacity")
378+
req := MakeCreateVolumeReq(sc, name)
379+
// req.CapacityRange = nil
380+
// FIXME: We should set it to nil, but this may break existing tests
402381

403-
r.MustCreateVolume(
404-
context.Background(),
405-
&csi.CreateVolumeRequest{
406-
Name: name,
407-
VolumeCapabilities: []*csi.VolumeCapability{
408-
TestVolumeCapabilityWithAccessType(sc, csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER),
409-
},
410-
CapacityRange: &csi.CapacityRange{
411-
RequiredBytes: TestVolumeSize(sc),
412-
},
413-
Secrets: sc.Secrets.CreateVolumeSecret,
414-
Parameters: sc.Config.TestVolumeParameters,
415-
},
416-
)
382+
r.MustCreateVolume(context.Background(), req)
417383
})
418384

419385
It("should return appropriate values SingleNodeWriter WithCapacity 1Gi", func() {
@@ -423,17 +389,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
423389

424390
vol, err := r.CreateVolume(
425391
context.Background(),
426-
&csi.CreateVolumeRequest{
427-
Name: name,
428-
VolumeCapabilities: []*csi.VolumeCapability{
429-
TestVolumeCapabilityWithAccessType(sc, csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER),
430-
},
431-
CapacityRange: &csi.CapacityRange{
432-
RequiredBytes: TestVolumeSize(sc),
433-
},
434-
Secrets: sc.Secrets.CreateVolumeSecret,
435-
Parameters: sc.Config.TestVolumeParameters,
436-
},
392+
MakeCreateVolumeReq(sc, name),
437393
)
438394
if serverError, ok := status.FromError(err); ok &&
439395
(serverError.Code() == codes.OutOfRange || serverError.Code() == codes.Unimplemented) {
@@ -454,34 +410,14 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
454410

455411
vol1 := r.MustCreateVolume(
456412
context.Background(),
457-
&csi.CreateVolumeRequest{
458-
Name: name,
459-
VolumeCapabilities: []*csi.VolumeCapability{
460-
TestVolumeCapabilityWithAccessType(sc, csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER),
461-
},
462-
CapacityRange: &csi.CapacityRange{
463-
RequiredBytes: size,
464-
},
465-
Secrets: sc.Secrets.CreateVolumeSecret,
466-
Parameters: sc.Config.TestVolumeParameters,
467-
},
413+
MakeCreateVolumeReq(sc, name),
468414
)
469415

470416
Expect(vol1.GetVolume().GetCapacityBytes()).To(Or(BeNumerically(">=", size), BeZero()))
471417

472418
vol2 := r.MustCreateVolume(
473419
context.Background(),
474-
&csi.CreateVolumeRequest{
475-
Name: name,
476-
VolumeCapabilities: []*csi.VolumeCapability{
477-
TestVolumeCapabilityWithAccessType(sc, csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER),
478-
},
479-
CapacityRange: &csi.CapacityRange{
480-
RequiredBytes: size,
481-
},
482-
Secrets: sc.Secrets.CreateVolumeSecret,
483-
Parameters: sc.Config.TestVolumeParameters,
484-
},
420+
MakeCreateVolumeReq(sc, name),
485421
)
486422
Expect(vol2.GetVolume().GetCapacityBytes()).To(Or(BeNumerically(">=", size), BeZero()))
487423
Expect(vol1.GetVolume().GetVolumeId()).To(Equal(vol2.GetVolume().GetVolumeId()))
@@ -492,39 +428,26 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
492428
By("creating a volume")
493429
name := UniqueString("sanity-controller-create-twice-different")
494430
size1 := TestVolumeSize(sc)
431+
req1 := MakeCreateVolumeReq(sc, name)
432+
req1.CapacityRange = &csi.CapacityRange{
433+
RequiredBytes: size1,
434+
LimitBytes: size1, // Set Limit to ensure this volume is smaller than size2
435+
}
495436

496-
r.MustCreateVolume(
497-
context.Background(),
498-
&csi.CreateVolumeRequest{
499-
Name: name,
500-
VolumeCapabilities: []*csi.VolumeCapability{
501-
TestVolumeCapabilityWithAccessType(sc, csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER),
502-
},
503-
CapacityRange: &csi.CapacityRange{
504-
RequiredBytes: size1,
505-
LimitBytes: size1,
506-
},
507-
Secrets: sc.Secrets.CreateVolumeSecret,
508-
Parameters: sc.Config.TestVolumeParameters,
509-
},
510-
)
511-
size2 := 2 * TestVolumeSize(sc)
437+
vol1 := r.MustCreateVolume(context.Background(), req1)
438+
sizeVol1 := vol1.GetVolume().GetCapacityBytes()
439+
if sizeVol1 == 0 {
440+
Skip("capacity of the volume is unknown")
441+
}
442+
Expect(sizeVol1).To(Equal(size1))
512443

513-
rsp, err := r.CreateVolume(
514-
context.Background(),
515-
&csi.CreateVolumeRequest{
516-
Name: name,
517-
VolumeCapabilities: []*csi.VolumeCapability{
518-
TestVolumeCapabilityWithAccessType(sc, csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER),
519-
},
520-
CapacityRange: &csi.CapacityRange{
521-
RequiredBytes: size2,
522-
LimitBytes: size2,
523-
},
524-
Secrets: sc.Secrets.CreateVolumeSecret,
525-
Parameters: sc.Config.TestVolumeParameters,
526-
},
527-
)
444+
size2 := 2 * TestVolumeSize(sc)
445+
req2 := MakeCreateVolumeReq(sc, name)
446+
req2.CapacityRange = &csi.CapacityRange{
447+
RequiredBytes: size2,
448+
LimitBytes: size2,
449+
}
450+
rsp, err := r.CreateVolume(context.Background(), req2)
528451
ExpectErrorCode(rsp, err, codes.AlreadyExists)
529452
})
530453

@@ -535,17 +458,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
535458

536459
vol := r.MustCreateVolume(
537460
context.Background(),
538-
&csi.CreateVolumeRequest{
539-
Name: name,
540-
VolumeCapabilities: []*csi.VolumeCapability{
541-
TestVolumeCapabilityWithAccessType(sc, csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER),
542-
},
543-
CapacityRange: &csi.CapacityRange{
544-
RequiredBytes: size,
545-
},
546-
Secrets: sc.Secrets.CreateVolumeSecret,
547-
Parameters: sc.Config.TestVolumeParameters,
548-
},
461+
MakeCreateVolumeReq(sc, name),
549462
)
550463
Expect(vol.GetVolume().GetCapacityBytes()).To(Or(BeNumerically(">=", size), BeZero()))
551464
})
@@ -714,17 +627,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
714627

715628
vol := r.MustCreateVolume(
716629
context.Background(),
717-
&csi.CreateVolumeRequest{
718-
Name: name,
719-
VolumeCapabilities: []*csi.VolumeCapability{
720-
TestVolumeCapabilityWithAccessType(sc, csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER),
721-
},
722-
CapacityRange: &csi.CapacityRange{
723-
RequiredBytes: TestVolumeSize(sc),
724-
},
725-
Secrets: sc.Secrets.CreateVolumeSecret,
726-
Parameters: sc.Config.TestVolumeParameters,
727-
},
630+
MakeCreateVolumeReq(sc, name),
728631
)
729632

730633
// Delete Volume
@@ -760,17 +663,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
760663

761664
vol := r.MustCreateVolume(
762665
context.Background(),
763-
&csi.CreateVolumeRequest{
764-
Name: name,
765-
VolumeCapabilities: []*csi.VolumeCapability{
766-
TestVolumeCapabilityWithAccessType(sc, csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER),
767-
},
768-
CapacityRange: &csi.CapacityRange{
769-
RequiredBytes: TestVolumeSize(sc),
770-
},
771-
Secrets: sc.Secrets.CreateVolumeSecret,
772-
Parameters: sc.Config.TestVolumeParameters,
773-
},
666+
MakeCreateVolumeReq(sc, name),
774667
)
775668

776669
rsp, err := r.ValidateVolumeCapabilities(
@@ -791,17 +684,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
791684

792685
vol := r.MustCreateVolume(
793686
context.Background(),
794-
&csi.CreateVolumeRequest{
795-
Name: name,
796-
VolumeCapabilities: []*csi.VolumeCapability{
797-
TestVolumeCapabilityWithAccessType(sc, csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER),
798-
},
799-
CapacityRange: &csi.CapacityRange{
800-
RequiredBytes: TestVolumeSize(sc),
801-
},
802-
Secrets: sc.Secrets.CreateVolumeSecret,
803-
Parameters: sc.Config.TestVolumeParameters,
804-
},
687+
MakeCreateVolumeReq(sc, name),
805688
)
806689

807690
// ValidateVolumeCapabilities
@@ -949,14 +832,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
949832

950833
vol := r.MustCreateVolume(
951834
context.Background(),
952-
&csi.CreateVolumeRequest{
953-
Name: name,
954-
VolumeCapabilities: []*csi.VolumeCapability{
955-
TestVolumeCapabilityWithAccessType(sc, csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER),
956-
},
957-
Secrets: sc.Secrets.CreateVolumeSecret,
958-
Parameters: sc.Config.TestVolumeParameters,
959-
},
835+
MakeCreateVolumeReq(sc, name),
960836
)
961837

962838
// ControllerPublishVolume
@@ -991,14 +867,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
991867

992868
vol := r.MustCreateVolume(
993869
context.Background(),
994-
&csi.CreateVolumeRequest{
995-
Name: name,
996-
VolumeCapabilities: []*csi.VolumeCapability{
997-
TestVolumeCapabilityWithAccessType(sc, csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER),
998-
},
999-
Secrets: sc.Secrets.CreateVolumeSecret,
1000-
Parameters: sc.Config.TestVolumeParameters,
1001-
},
870+
MakeCreateVolumeReq(sc, name),
1002871
)
1003872

1004873
By("getting a node id")
@@ -1503,17 +1372,7 @@ var _ = DescribeSanity("ExpandVolume [Controller Server]", func(sc *TestContext)
15031372
name := UniqueString("sanity-expand-volume")
15041373

15051374
// Create a new volume.
1506-
req := &csi.CreateVolumeRequest{
1507-
Name: name,
1508-
VolumeCapabilities: []*csi.VolumeCapability{
1509-
TestVolumeCapabilityWithAccessType(sc, csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER),
1510-
},
1511-
Parameters: sc.Config.TestVolumeParameters,
1512-
Secrets: sc.Secrets.CreateVolumeSecret,
1513-
CapacityRange: &csi.CapacityRange{
1514-
RequiredBytes: TestVolumeSize(sc),
1515-
},
1516-
}
1375+
req := MakeCreateVolumeReq(sc, name)
15171376
vol := r.MustCreateVolume(context.Background(), req)
15181377

15191378
By("expanding the volume")
@@ -1640,7 +1499,6 @@ func MakeCreateVolumeReq(sc *TestContext, name string) *csi.CreateVolumeRequest
16401499
},
16411500
CapacityRange: &csi.CapacityRange{
16421501
RequiredBytes: size1,
1643-
LimitBytes: size1,
16441502
},
16451503
Parameters: sc.Config.TestVolumeParameters,
16461504
}
@@ -1754,19 +1612,10 @@ func VolumeLifecycle(r *Resources, sc *TestContext, count int) {
17541612
// Create Volume First
17551613
By("creating a single node writer volume")
17561614
name := UniqueString(fmt.Sprintf("sanity-controller-publish-%d", count))
1615+
req := MakeCreateVolumeReq(sc, name)
1616+
req.AccessibilityRequirements = accReqs
17571617

1758-
vol := r.MustCreateVolume(
1759-
context.Background(),
1760-
&csi.CreateVolumeRequest{
1761-
Name: name,
1762-
VolumeCapabilities: []*csi.VolumeCapability{
1763-
TestVolumeCapabilityWithAccessType(sc, csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER),
1764-
},
1765-
Secrets: sc.Secrets.CreateVolumeSecret,
1766-
Parameters: sc.Config.TestVolumeParameters,
1767-
AccessibilityRequirements: accReqs,
1768-
},
1769-
)
1618+
vol := r.MustCreateVolume(context.Background(), req)
17701619

17711620
// ControllerPublishVolume
17721621
for i := 0; i < count; i++ {

0 commit comments

Comments
 (0)