helper function

Author: ryan-mist

test/pkg/environment/aws/expectations.go

@@ -218,6 +218,14 @@ func (env *Environment) GetNetworkInterfaces(ids ...string) []ec2types.NetworkIn
 	return dnio.NetworkInterfaces
 }
 
+func FindNetworkInterface(interfaces []ec2types.InstanceNetworkInterface, networkCardIndex, deviceIndex int32) (ec2types.InstanceNetworkInterface, bool) {
+	return lo.Find(interfaces, func(ni ec2types.InstanceNetworkInterface) bool {
+		return ni.Attachment != nil &&
+			ni.Attachment.NetworkCardIndex != nil && aws.ToInt32(ni.Attachment.NetworkCardIndex) == networkCardIndex &&
+			ni.Attachment.DeviceIndex != nil && aws.ToInt32(ni.Attachment.DeviceIndex) == deviceIndex
+	})
+}
+
 func (env *Environment) GetSpotInstance(id string) ec2types.SpotInstanceRequest {
 	GinkgoHelper()
 	siro, err := env.EC2API.DescribeSpotInstanceRequests(env.Context, &ec2.DescribeSpotInstanceRequestsInput{

test/suites/integration/connection_tracking_test.go

@@ -26,6 +26,7 @@ import (
 	"sigs.k8s.io/karpenter/pkg/test"
 
 	v1 "github.com/aws/karpenter-provider-aws/pkg/apis/v1"
+	environmentaws "github.com/aws/karpenter-provider-aws/test/pkg/environment/aws"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -47,9 +48,7 @@ var _ = Describe("ConnectionTracking", func() {
 		instance := env.GetInstance(pod.Spec.NodeName)
 		Expect(instance.NetworkInterfaces).ToNot(BeEmpty())
 
-		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
-		})
+		primaryNI, found := environmentaws.FindNetworkInterface(instance.NetworkInterfaces, 0, 0)
 		Expect(found).To(BeTrue())
 
 		niOutput, err := env.EC2API.DescribeNetworkInterfaces(env.Context, &ec2.DescribeNetworkInterfacesInput{
@@ -144,9 +143,7 @@ var _ = Describe("ConnectionTracking", func() {
 		instance := env.GetInstance(pod.Spec.NodeName)
 		Expect(instance.NetworkInterfaces).ToNot(BeEmpty())
 
-		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
-		})
+		primaryNI, found := environmentaws.FindNetworkInterface(instance.NetworkInterfaces, 0, 0)
 		Expect(found).To(BeTrue())
 		niOutput, err := env.EC2API.DescribeNetworkInterfaces(env.Context, &ec2.DescribeNetworkInterfacesInput{
 			NetworkInterfaceIds: []string{aws.ToString(primaryNI.NetworkInterfaceId)},
@@ -168,9 +165,7 @@ var _ = Describe("ConnectionTracking", func() {
 		instance := env.GetInstance(pod.Spec.NodeName)
 		Expect(instance.NetworkInterfaces).ToNot(BeEmpty())
 
-		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
-		})
+		primaryNI, found := environmentaws.FindNetworkInterface(instance.NetworkInterfaces, 0, 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

@@ -102,9 +102,7 @@ var _ = Describe("IPv6", func() {
 		node := env.GetNode(pod.Spec.NodeName)
 		instance := env.GetInstanceByID(env.ExpectParsedProviderID(node.Spec.ProviderID))
 		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)
-		})
+		primaryNI, found := aws.FindNetworkInterface(instance.NetworkInterfaces, 0, 0)
 		Expect(found).To(BeTrue())
 		Expect(primaryNI.Ipv6Addresses).To(HaveLen(1))
 		_, hasIPv6Primary := lo.Find(primaryNI.Ipv6Addresses, func(ip types.InstanceIpv6Address) bool {

test/suites/scheduling/suite_test.go

@@ -1056,12 +1056,7 @@ var _ = DescribeTableSubtree("Scheduling", Ordered, ContinueOnFailure, func(minV
 		Expect(len(networkInterfaces)).To(BeNumerically(">=", 2))
 
 		for _, deviceIndex := range []int32{0, 1} {
-			networkInterface, found := lo.Find(networkInterfaces, func(i ec2types.InstanceNetworkInterface) bool {
-				if i.Attachment == nil || i.Attachment.DeviceIndex == nil {
-					return false
-				}
-				return deviceIndex == lo.FromPtr(i.Attachment.DeviceIndex)
-			})
+			networkInterface, found := environmentaws.FindNetworkInterface(networkInterfaces, 0, deviceIndex)
 			Expect(found).To(BeTrue())
 			Expect(lo.FromPtr(networkInterface.InterfaceType)).To(Equal(
 				lo.Ternary(deviceIndex == 0, string(ec2types.NetworkInterfaceTypeInterface), string(ec2types.NetworkInterfaceTypeEfaOnly)),