Merge pull request #2780 from mdzraf/e2eValidateParams

Added Verification Of Expected Parameters for e2e tests

Author: k8s-ci-robot

tests/e2e/testsuites/dynamically_provisioned_volume_properties_tester.go

@@ -0,0 +1,46 @@
+// Copyright 2025 The Kubernetes Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the 'License');
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an 'AS IS' BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package testsuites
+
+import (
+	"github.com/kubernetes-sigs/aws-ebs-csi-driver/tests/e2e/driver"
+	. "github.com/onsi/ginkgo/v2"
+	v1 "k8s.io/api/core/v1"
+	clientset "k8s.io/client-go/kubernetes"
+)
+
+// DynamicallyProvisionedVolumePropertiesTest will create a pod along with a volume.
+// It will then wait until the volume is created and verify input parameters were
+// properly applied to the volume.
+type DynamicallyProvisionedVolumePropertiesTest struct {
+	CreateVolumeParameters map[string]string
+	ClaimSize              string
+}
+
+func (t *DynamicallyProvisionedVolumePropertiesTest) Run(c clientset.Interface, ns *v1.Namespace, ebsDriver driver.PVTestDriver) {
+	volumeDetails := CreateVolumeDetails(t.CreateVolumeParameters, t.ClaimSize)
+	testVolume, _ := volumeDetails.SetupDynamicPersistentVolumeClaim(c, ns, ebsDriver)
+	defer testVolume.Cleanup()
+
+	pod := createPodWithVolume(c, ns, "", testVolume, volumeDetails)
+	defer pod.Cleanup()
+	pod.WaitForSuccess()
+
+	By("verifying volume properties")
+	volumeID := testVolume.persistentVolume.Spec.CSI.VolumeHandle
+
+	expected := BuildExpectedParameters(t.CreateVolumeParameters, t.ClaimSize)
+	VerifyVolumeProperties(volumeID, expected)
+}

tests/e2e/testsuites/e2e_utils.go

@@ -17,8 +17,12 @@ package testsuites
 import (
 	"context"
 	"fmt"
+	"strconv"
 	"time"
 
+	"github.com/aws/aws-sdk-go-v2/aws"
+	"github.com/aws/aws-sdk-go-v2/config"
+	"github.com/aws/aws-sdk-go-v2/service/ec2"
 	"github.com/kubernetes-sigs/aws-ebs-csi-driver/pkg/util"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
@@ -44,6 +48,7 @@ const (
 	VolumeType = "type"
 	TagSpec    = "tagSpecification"
 	TagDel     = "tagDeletion"
+	Encrypted  = "encrypted"
 )
 
 var DefaultGeneratedVolumeMount = VolumeMountDetails{
@@ -181,3 +186,92 @@ func PrefixAnnotations(prefix string, parameters map[string]string) map[string]s
 	}
 	return result
 }
+
+type ExpectedParameters struct {
+	Size       *int32
+	IOPS       *int32
+	Throughput *int32
+	VolumeType *string
+	Encrypted  *bool
+}
+
+func BuildExpectedParameters(params map[string]string, claimSize string) ExpectedParameters {
+	expected := ExpectedParameters{}
+
+	if claimSize != "" {
+		quantity, err := resource.ParseQuantity(claimSize)
+		framework.ExpectNoError(err, "failed to parse claim size")
+		sizeGiB := util.BytesToGiB(quantity.Value())
+		expected.Size = &sizeGiB
+	}
+
+	if iopsStr, ok := params[Iops]; ok {
+		iops, err := strconv.ParseInt(iopsStr, 10, 32)
+		framework.ExpectNoError(err, "failed to parse IOPS")
+		iops32 := int32(iops)
+		expected.IOPS = &iops32
+	}
+
+	if throughputStr, ok := params[Throughput]; ok {
+		throughput, err := strconv.ParseInt(throughputStr, 10, 32)
+		framework.ExpectNoError(err, "failed to parse throughput")
+		throughput32 := int32(throughput)
+		expected.Throughput = &throughput32
+	}
+
+	if volType, ok := params[VolumeType]; ok {
+		expected.VolumeType = &volType
+	}
+
+	if _, ok := params[Encrypted]; ok {
+		expected.Encrypted = aws.Bool(true)
+	}
+
+	return expected
+}
+
+func VerifyVolumeProperties(volumeID string, verification ExpectedParameters) {
+	cfg, err := config.LoadDefaultConfig(context.Background())
+	framework.ExpectNoError(err, "failed to load AWS config")
+
+	ec2Client := ec2.NewFromConfig(cfg)
+	resp, err := ec2Client.DescribeVolumes(context.Background(), &ec2.DescribeVolumesInput{
+		VolumeIds: []string{volumeID},
+	})
+	framework.ExpectNoError(err, fmt.Sprintf("failed to describe volume %s", volumeID))
+	if len(resp.Volumes) == 0 {
+		framework.Failf("volume %s not found", volumeID)
+	}
+	volume := &resp.Volumes[0]
+
+	if verification.Size != nil && volume.Size != nil {
+		if *volume.Size != *verification.Size {
+			framework.Failf("volume size mismatch: expected %d GiB, got %d GiB", *verification.Size, *volume.Size)
+		}
+	}
+
+	if verification.IOPS != nil && volume.Iops != nil {
+		if *volume.Iops != *verification.IOPS {
+			framework.Failf("volume IOPS mismatch: expected %d, got %d", *verification.IOPS, *volume.Iops)
+		}
+	}
+
+	if verification.Throughput != nil && volume.Throughput != nil {
+		if *volume.Throughput != *verification.Throughput {
+			framework.Failf("volume throughput mismatch: expected %d, got %d", *verification.Throughput, *volume.Throughput)
+		}
+	}
+
+	if verification.VolumeType != nil {
+		if string(volume.VolumeType) != *verification.VolumeType {
+			framework.Failf("volume type mismatch: expected %s, got %s", *verification.VolumeType, volume.VolumeType)
+		}
+	}
+
+	if verification.Encrypted != nil && volume.Encrypted != nil {
+		if *volume.Encrypted != *verification.Encrypted {
+			framework.Failf("volume encryption mismatch: expected %t, got %t", *verification.Encrypted, *volume.Encrypted)
+		}
+	}
+	framework.Logf("Volume %s verified successfully", volumeID)
+}

tests/e2e/testsuites/modify_volume_tester.go

@@ -112,6 +112,17 @@ func (modifyVolumeTest *ModifyVolumeTest) Run(c clientset.Interface, ns *v1.Name
 		err = WaitForPvToResize(c, ns, testVolume.persistentVolume.Name, updatedPvcSize, DefaultResizeTimout, DefaultK8sAPIPollingInterval)
 		framework.ExpectNoError(err, fmt.Sprintf("fail to resize pv(%s): %v", modifyingPvc.Name, err))
 	}
+
+	By("verifying volume properties")
+	volumeID := testVolume.persistentVolume.Spec.CSI.VolumeHandle
+
+	expected := BuildExpectedParameters(modifyVolumeTest.ModifyVolumeParameters, "")
+	if modifyVolumeTest.ShouldResizeVolume {
+		sizeGiB := util.BytesToGiB(updatedPvcSize.Value())
+		expected.Size = &sizeGiB
+	}
+
+	VerifyVolumeProperties(volumeID, expected)
 }
 
 func attemptInvalidModification(c clientset.Interface, ns *v1.Namespace, testVolume *TestPersistentVolumeClaim) {

tests/e2e/volume_properties.go

@@ -0,0 +1,116 @@
+// Copyright 2025 The Kubernetes Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the 'License');
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an 'AS IS' BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package e2e
+
+import (
+	awscloud "github.com/kubernetes-sigs/aws-ebs-csi-driver/pkg/cloud"
+	ebscsidriver "github.com/kubernetes-sigs/aws-ebs-csi-driver/pkg/driver"
+	"github.com/kubernetes-sigs/aws-ebs-csi-driver/tests/e2e/driver"
+	"github.com/kubernetes-sigs/aws-ebs-csi-driver/tests/e2e/testsuites"
+	. "github.com/onsi/ginkgo/v2"
+	v1 "k8s.io/api/core/v1"
+	clientset "k8s.io/client-go/kubernetes"
+	"k8s.io/kubernetes/test/e2e/framework"
+	admissionapi "k8s.io/pod-security-admission/api"
+)
+
+var _ = Describe("[ebs-csi-e2e] [single-az] Volume Properties Verification", func() {
+	f := framework.NewDefaultFramework("ebs")
+	f.NamespacePodSecurityEnforceLevel = admissionapi.LevelPrivileged
+
+	var (
+		cs        clientset.Interface
+		ns        *v1.Namespace
+		ebsDriver driver.PVTestDriver
+	)
+
+	BeforeEach(func() {
+		cs = f.ClientSet
+		ns = f.Namespace
+		ebsDriver = driver.InitEbsCSIDriver()
+	})
+
+	It("should create a gp3 volume with custom IOPS", func() {
+		test := testsuites.DynamicallyProvisionedVolumePropertiesTest{
+			CreateVolumeParameters: map[string]string{
+				ebscsidriver.VolumeTypeKey: awscloud.VolumeTypeGP3,
+				ebscsidriver.IopsKey:       "4000",
+			},
+			ClaimSize: "10Gi",
+		}
+		test.Run(cs, ns, ebsDriver)
+	})
+
+	It("should create a gp3 volume with custom IOPS and throughput", func() {
+		test := testsuites.DynamicallyProvisionedVolumePropertiesTest{
+			CreateVolumeParameters: map[string]string{
+				ebscsidriver.VolumeTypeKey: awscloud.VolumeTypeGP3,
+				ebscsidriver.IopsKey:       "5000",
+				ebscsidriver.ThroughputKey: "250",
+			},
+			ClaimSize: "10Gi",
+		}
+		test.Run(cs, ns, ebsDriver)
+	})
+
+	It("should create an io2 volume with custom IOPS", func() {
+		test := testsuites.DynamicallyProvisionedVolumePropertiesTest{
+			CreateVolumeParameters: map[string]string{
+				ebscsidriver.VolumeTypeKey: awscloud.VolumeTypeIO2,
+				ebscsidriver.IopsKey:       "10000",
+			},
+			ClaimSize: "10Gi",
+		}
+		test.Run(cs, ns, ebsDriver)
+	})
+
+	It("should create a io2 volume with custom IOPS and encryption", func() {
+		test := testsuites.DynamicallyProvisionedVolumePropertiesTest{
+			CreateVolumeParameters: map[string]string{
+				ebscsidriver.VolumeTypeKey: awscloud.VolumeTypeIO2,
+				ebscsidriver.IopsKey:       "5000",
+				ebscsidriver.EncryptedKey:  "true",
+			},
+			ClaimSize: "10Gi",
+		}
+		test.Run(cs, ns, ebsDriver)
+	})
+
+	It("should create an io2 volume with encryption", func() {
+		test := testsuites.DynamicallyProvisionedVolumePropertiesTest{
+			CreateVolumeParameters: map[string]string{
+				ebscsidriver.VolumeTypeKey: awscloud.VolumeTypeIO2,
+				ebscsidriver.IopsKey:       "1000",
+				ebscsidriver.EncryptedKey:  "true",
+			},
+			ClaimSize: "10Gi",
+		}
+		test.Run(cs, ns, ebsDriver)
+	})
+
+	It("should create an gp3 volume with custom size, IOPS, throughput, and encryption", func() {
+		test := testsuites.DynamicallyProvisionedVolumePropertiesTest{
+			CreateVolumeParameters: map[string]string{
+				ebscsidriver.VolumeTypeKey: awscloud.VolumeTypeGP3,
+				ebscsidriver.IopsKey:       "4000",
+				ebscsidriver.ThroughputKey: "250",
+				ebscsidriver.EncryptedKey:  "true",
+			},
+			ClaimSize: "10Gi",
+		}
+		test.Run(cs, ns, ebsDriver)
+	})
+
+})