fix: account for VPC CNI ENI attachment in suite tests

Author: ryan-mist

test/suites/integration/connection_tracking_test.go

@@ -47,9 +47,10 @@ var _ = Describe("ConnectionTracking", func() {
 		instance := env.GetInstance(pod.Spec.NodeName)
 		Expect(instance.NetworkInterfaces).ToNot(BeEmpty())
 
-		primaryNI := instance.NetworkInterfaces[0]
-		Expect(primaryNI.Attachment).ToNot(BeNil())
-		Expect(aws.ToInt32(primaryNI.Attachment.DeviceIndex)).To(Equal(int32(0)))
+		primaryNI, found := lo.Find(instance.NetworkInterfaces, func(ni ec2types.InstanceNetworkInterface) bool {
+			return ni.Attachment != nil && ni.Attachment.DeviceIndex != nil && aws.ToInt32(ni.Attachment.DeviceIndex) == 0
+		})
+		Expect(found).To(BeTrue())
 
 		niOutput, err := env.EC2API.DescribeNetworkInterfaces(env.Context, &ec2.DescribeNetworkInterfacesInput{
 			NetworkInterfaceIds: []string{aws.ToString(primaryNI.NetworkInterfaceId)},
@@ -143,7 +144,10 @@ var _ = Describe("ConnectionTracking", func() {
 		instance := env.GetInstance(pod.Spec.NodeName)
 		Expect(instance.NetworkInterfaces).ToNot(BeEmpty())
 
-		primaryNI := instance.NetworkInterfaces[0]
+		primaryNI, found := lo.Find(instance.NetworkInterfaces, func(ni ec2types.InstanceNetworkInterface) bool {
+			return ni.Attachment != nil && ni.Attachment.DeviceIndex != nil && aws.ToInt32(ni.Attachment.DeviceIndex) == 0
+		})
+		Expect(found).To(BeTrue())
 		niOutput, err := env.EC2API.DescribeNetworkInterfaces(env.Context, &ec2.DescribeNetworkInterfacesInput{
 			NetworkInterfaceIds: []string{aws.ToString(primaryNI.NetworkInterfaceId)},
 		})
@@ -164,7 +168,10 @@ var _ = Describe("ConnectionTracking", func() {
 		instance := env.GetInstance(pod.Spec.NodeName)
 		Expect(instance.NetworkInterfaces).ToNot(BeEmpty())
 
-		primaryNI := instance.NetworkInterfaces[0]
+		primaryNI, found := lo.Find(instance.NetworkInterfaces, func(ni ec2types.InstanceNetworkInterface) bool {
+			return ni.Attachment != nil && ni.Attachment.DeviceIndex != nil && aws.ToInt32(ni.Attachment.DeviceIndex) == 0
+		})
+		Expect(found).To(BeTrue())
 		niOutput, err := env.EC2API.DescribeNetworkInterfaces(env.Context, &ec2.DescribeNetworkInterfacesInput{
 			NetworkInterfaceIds: []string{aws.ToString(primaryNI.NetworkInterfaceId)},
 		})

test/suites/ipv6/suite_test.go

@@ -101,9 +101,13 @@ var _ = Describe("IPv6", func() {
 		env.ExpectCreatedNodeCount("==", 1)
 		node := env.GetNode(pod.Spec.NodeName)
 		instance := env.GetInstanceByID(env.ExpectParsedProviderID(node.Spec.ProviderID))
-		Expect(instance.NetworkInterfaces).To(HaveLen(1))
-		Expect(instance.NetworkInterfaces[0].Ipv6Addresses).To(HaveLen(1))
-		_, hasIPv6Primary := lo.Find(instance.NetworkInterfaces[0].Ipv6Addresses, func(ip types.InstanceIpv6Address) bool {
+		Expect(instance.NetworkInterfaces).ToNot(BeEmpty())
+		primaryNI, found := lo.Find(instance.NetworkInterfaces, func(ni types.InstanceNetworkInterface) bool {
+			return ni.Attachment != nil && ni.Attachment.DeviceIndex != nil && lo.FromPtr(ni.Attachment.DeviceIndex) == int32(0)
+		})
+		Expect(found).To(BeTrue())
+		Expect(primaryNI.Ipv6Addresses).To(HaveLen(1))
+		_, hasIPv6Primary := lo.Find(primaryNI.Ipv6Addresses, func(ip types.InstanceIpv6Address) bool {
 			return lo.FromPtr(ip.IsPrimaryIpv6)
 		})
 		Expect(hasIPv6Primary).To(BeTrue())

test/suites/scheduling/suite_test.go

@@ -1052,16 +1052,17 @@ var _ = DescribeTableSubtree("Scheduling", Ordered, ContinueOnFailure, func(minV
 
 		instance := env.GetInstance(node.Name)
 		networkInterfaces := instance.NetworkInterfaces
-		Expect(networkInterfaces).To(HaveLen(2))
+		// VPC CNI may attach additional interfaces beyond what we configured, so we check for at least our expected count
+		Expect(len(networkInterfaces)).To(BeNumerically(">=", 2))
 
 		for _, deviceIndex := range []int32{0, 1} {
 			networkInterface, found := lo.Find(networkInterfaces, func(i ec2types.InstanceNetworkInterface) bool {
-				Expect(i.Attachment).ToNot(BeNil())
-				Expect(i.Attachment.DeviceIndex).ToNot(BeNil())
+				if i.Attachment == nil || i.Attachment.DeviceIndex == nil {
+					return false
+				}
 				return deviceIndex == lo.FromPtr(i.Attachment.DeviceIndex)
 			})
-			Expect(found).To(Equal(true))
-
+			Expect(found).To(BeTrue())
 			Expect(lo.FromPtr(networkInterface.InterfaceType)).To(Equal(
 				lo.Ternary(deviceIndex == 0, string(ec2types.NetworkInterfaceTypeInterface), string(ec2types.NetworkInterfaceTypeEfaOnly)),
 			))