Skip to content

Commit 8c9ec12

Browse files
sunnylovestiramisusunnylovestiramisu
committed
Add pd-extreme k8s integration and e2e test case
1 parent c2d4dee commit 8c9ec12

File tree

4 files changed

+1181
-19
lines changed

4 files changed

+1181
-19
lines changed

Diff for: ‎test/e2e/tests/single_zone_e2e_test.go

+18-18
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ var _ = Describe("GCE PD CSI Driver", func() {
7171
instance := testContext.Instance
7272

7373
// Create Disk
74-
volName, volID := createAndValidateUniqueZonalDisk(client, p, z)
74+
volName, volID := createAndValidateUniqueZonalDisk(client, p, z, standardDiskType)
7575

7676
defer func() {
7777
// Delete Disk
@@ -96,7 +96,7 @@ var _ = Describe("GCE PD CSI Driver", func() {
9696
instance := testContext.Instance
9797

9898
// Create Disk
99-
volName, volID := createAndValidateUniqueZonalDisk(client, p, z)
99+
volName, volID := createAndValidateUniqueZonalDisk(client, p, z, standardDiskType)
100100

101101
defer func() {
102102
// Delete Disk
@@ -168,7 +168,7 @@ var _ = Describe("GCE PD CSI Driver", func() {
168168
instance := testContext.Instance
169169

170170
// Create Disk
171-
volName, volID := createAndValidateUniqueZonalDisk(client, p, z)
171+
volName, volID := createAndValidateUniqueZonalDisk(client, p, z, standardDiskType)
172172

173173
defer func() {
174174
// Delete Disk
@@ -267,7 +267,7 @@ var _ = Describe("GCE PD CSI Driver", func() {
267267
client := testContext.Client
268268
instance := testContext.Instance
269269

270-
volName, _ := createAndValidateUniqueZonalDisk(client, p, z)
270+
volName, _ := createAndValidateUniqueZonalDisk(client, p, z, standardDiskType)
271271

272272
underSpecifiedID := common.GenerateUnderspecifiedVolumeID(volName, true /* isZonal */)
273273

@@ -414,7 +414,7 @@ var _ = Describe("GCE PD CSI Driver", func() {
414414
p, z, _ := testContext.Instance.GetIdentity()
415415
client := testContext.Client
416416

417-
volName, volID := createAndValidateUniqueZonalDisk(client, p, z)
417+
volName, volID := createAndValidateUniqueZonalDisk(client, p, z, standardDiskType)
418418

419419
// Create Snapshot
420420
snapshotName := testNamePrefix + string(uuid.NewUUID())
@@ -620,10 +620,10 @@ var _ = Describe("GCE PD CSI Driver", func() {
620620

621621
nodeID := testContext.Instance.GetNodeID()
622622

623-
_, volID := createAndValidateUniqueZonalDisk(client, p, z)
623+
_, volID := createAndValidateUniqueZonalDisk(client, p, z, standardDiskType)
624624
defer deleteVolumeOrError(client, volID)
625625

626-
_, secondVolID := createAndValidateUniqueZonalDisk(client, p, z)
626+
_, secondVolID := createAndValidateUniqueZonalDisk(client, p, z, standardDiskType)
627627
defer deleteVolumeOrError(client, secondVolID)
628628

629629
// Attach volID to current instance
@@ -722,7 +722,7 @@ var _ = Describe("GCE PD CSI Driver", func() {
722722
client := testContext.Client
723723
instance := testContext.Instance
724724

725-
volName, volID := createAndValidateUniqueZonalDisk(client, p, z)
725+
volName, volID := createAndValidateUniqueZonalDisk(client, p, z, standardDiskType)
726726

727727
defer func() {
728728
// Delete Disk
@@ -759,7 +759,7 @@ var _ = Describe("GCE PD CSI Driver", func() {
759759
client := testContext.Client
760760
instance := testContext.Instance
761761

762-
volName, volID := createAndValidateUniqueZonalDisk(client, p, z)
762+
volName, volID := createAndValidateUniqueZonalDisk(client, p, z, standardDiskType)
763763

764764
defer func() {
765765
// Delete Disk
@@ -801,7 +801,7 @@ var _ = Describe("GCE PD CSI Driver", func() {
801801
zone := "us-east1-a"
802802

803803
// Create and Validate Disk
804-
volName, volID := createAndValidateUniqueZonalMultiWriterDisk(client, p, zone)
804+
volName, volID := createAndValidateUniqueZonalMultiWriterDisk(client, p, zone, standardDiskType)
805805

806806
defer func() {
807807
// Delete Disk
@@ -823,7 +823,7 @@ var _ = Describe("GCE PD CSI Driver", func() {
823823
instance := testContext.Instance
824824

825825
// Create and Validate Disk
826-
volName, volID := createAndValidateUniqueZonalMultiWriterDisk(client, p, z)
826+
volName, volID := createAndValidateUniqueZonalMultiWriterDisk(client, p, z, standardDiskType)
827827

828828
defer func() {
829829
// Delete Disk
@@ -903,7 +903,7 @@ var _ = Describe("GCE PD CSI Driver", func() {
903903
client := testContext.Client
904904

905905
// Create Disk
906-
volName, volID := createAndValidateUniqueZonalDisk(client, p, z)
906+
volName, volID := createAndValidateUniqueZonalDisk(client, p, z, standardDiskType)
907907

908908
// Create Snapshot
909909
snapshotName := testNamePrefix + string(uuid.NewUUID())
@@ -964,7 +964,7 @@ var _ = Describe("GCE PD CSI Driver", func() {
964964
client := testContext.Client
965965

966966
// Create Disk
967-
volName, volID := createAndValidateUniqueZonalDisk(client, p, z)
967+
volName, volID := createAndValidateUniqueZonalDisk(client, p, z, standardDiskType)
968968

969969
// Create Snapshot
970970
snapshotName := testNamePrefix + string(uuid.NewUUID())
@@ -1025,7 +1025,7 @@ var _ = Describe("GCE PD CSI Driver", func() {
10251025
p, z, _ := controllerInstance.GetIdentity()
10261026

10271027
// Create Source Disk
1028-
_, srcVolID := createAndValidateUniqueZonalDisk(controllerClient, p, z)
1028+
_, srcVolID := createAndValidateUniqueZonalDisk(controllerClient, p, z, standardDiskType)
10291029

10301030
// Create Disk
10311031
volName := testNamePrefix + string(uuid.NewUUID())
@@ -1167,7 +1167,7 @@ func equalWithinEpsilon(a, b, epsiolon int64) bool {
11671167
return b-a < epsiolon
11681168
}
11691169

1170-
func createAndValidateUniqueZonalDisk(client *remote.CsiClient, project, zone string) (volName, volID string) {
1170+
func createAndValidateUniqueZonalDisk(client *remote.CsiClient, project, zone string, diskType string) (volName, volID string) {
11711171
// Create Disk
11721172
var err error
11731173
volName = testNamePrefix + string(uuid.NewUUID())
@@ -1184,7 +1184,7 @@ func createAndValidateUniqueZonalDisk(client *remote.CsiClient, project, zone st
11841184
// Validate Disk Created
11851185
cloudDisk, err := computeService.Disks.Get(project, zone, volName).Do()
11861186
Expect(err).To(BeNil(), "Could not get disk from cloud directly")
1187-
Expect(cloudDisk.Type).To(ContainSubstring(standardDiskType))
1187+
Expect(cloudDisk.Type).To(ContainSubstring(diskType))
11881188
Expect(cloudDisk.Status).To(Equal(readyState))
11891189
Expect(cloudDisk.SizeGb).To(Equal(defaultSizeGb))
11901190
Expect(cloudDisk.Name).To(Equal(volName))
@@ -1203,7 +1203,7 @@ func deleteVolumeOrError(client *remote.CsiClient, volID string) {
12031203
Expect(gce.IsGCEError(err, "notFound")).To(BeTrue(), "Expected disk to not be found")
12041204
}
12051205

1206-
func createAndValidateUniqueZonalMultiWriterDisk(client *remote.CsiClient, project, zone string) (string, string) {
1206+
func createAndValidateUniqueZonalMultiWriterDisk(client *remote.CsiClient, project, zone string, diskType string) (string, string) {
12071207
// Create Disk
12081208
volName := testNamePrefix + string(uuid.NewUUID())
12091209
volID, err := client.CreateVolumeWithCaps(volName, nil, defaultMwSizeGb,
@@ -1229,7 +1229,7 @@ func createAndValidateUniqueZonalMultiWriterDisk(client *remote.CsiClient, proje
12291229
// Validate Disk Created
12301230
cloudDisk, err := computeAlphaService.Disks.Get(project, zone, volName).Do()
12311231
Expect(err).To(BeNil(), "Could not get disk from cloud directly")
1232-
Expect(cloudDisk.Type).To(ContainSubstring(standardDiskType))
1232+
Expect(cloudDisk.Type).To(ContainSubstring(diskType))
12331233
Expect(cloudDisk.Status).To(Equal(readyState))
12341234
Expect(cloudDisk.SizeGb).To(Equal(defaultMwSizeGb))
12351235
Expect(cloudDisk.Name).To(Equal(volName))

0 commit comments

Comments
 (0)