Merge pull request #865 from l1b0k/ut

test(datapath): add unit test for Vlan data path with MultiNetwork fe…

Author: BSWANG

pkg/controller/common/eni.go

@@ -8,8 +8,6 @@ import (
 	aliyunClient "github.com/AliyunContainerService/terway/pkg/aliyun/client"
 	"github.com/AliyunContainerService/terway/pkg/apis/network.alibabacloud.com/v1beta1"
 	"github.com/AliyunContainerService/terway/pkg/backoff"
-	"github.com/AliyunContainerService/terway/types"
-	corev1 "k8s.io/api/core/v1"
 	k8sErr "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	k8stypes "k8s.io/apimachinery/pkg/types"
@@ -32,59 +30,6 @@ type CreateOption struct {
 	PodNamespace string
 }
 
-func FromPodENI(podENI *v1beta1.PodENI) []*v1beta1.NetworkInterface {
-	var result []*v1beta1.NetworkInterface
-
-	for _, alloc := range podENI.Spec.Allocations {
-		eniID := alloc.ENI.ID
-		if eniID == "" {
-			continue
-		}
-
-		// create it
-		networkInterface := &v1beta1.NetworkInterface{
-			ObjectMeta: metav1.ObjectMeta{
-				Name:   eniID,
-				Labels: map[string]string{},
-			},
-		}
-
-		if podENI.Labels[types.ENIRelatedNodeName] != "" {
-			networkInterface.Labels[types.ENIRelatedNodeName] = podENI.Labels[types.ENIRelatedNodeName]
-		}
-
-		networkInterface.Spec.ENI = alloc.ENI
-		networkInterface.Spec.IPv4 = alloc.IPv4
-		networkInterface.Spec.IPv6 = alloc.IPv6
-		// leave cidr to empty
-		networkInterface.Spec.ExtraConfig = alloc.ExtraConfig
-
-		networkInterface.Spec.ManagePolicy = v1beta1.ManagePolicy{
-			Cache:     false,
-			UnManaged: false,
-		}
-
-		if _, ok := podENI.Annotations[types.ENIAllocFromPool]; ok {
-			networkInterface.Spec.ManagePolicy.Cache = true
-		}
-
-		networkInterface.Spec.PodENIRef = &corev1.ObjectReference{
-			Kind:      "Pod",
-			Name:      podENI.Name,
-			Namespace: podENI.Namespace,
-		}
-
-		networkInterface.Status.Phase = podENI.Status.Phase
-
-		networkInterface.Status.NodeName = podENI.Labels[types.ENIRelatedNodeName]
-		networkInterface.Status.InstanceID = podENI.Status.InstanceID
-		networkInterface.Status.TrunkENIID = podENI.Status.TrunkENIID
-		networkInterface.Status.ENIInfo = podENI.Status.ENIInfos[eniID]
-		// NetworkCardIndex is not stored
-	}
-	return result
-}
-
 func ToNetworkInterfaceCR(eni *aliyunClient.NetworkInterface) *v1beta1.NetworkInterface {
 	networkInterface := &v1beta1.NetworkInterface{
 		ObjectMeta: metav1.ObjectMeta{

pkg/controller/common/eni_test.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"time"
 
+	aliyunClient "github.com/AliyunContainerService/terway/pkg/aliyun/client"
 	networkv1beta1 "github.com/AliyunContainerService/terway/pkg/apis/network.alibabacloud.com/v1beta1"
 	"github.com/AliyunContainerService/terway/pkg/backoff"
 	. "github.com/onsi/ginkgo/v2"
@@ -305,4 +306,87 @@ var _ = Describe("Common ENI Operations", func() {
 			Expect(err).To(HaveOccurred())
 		})
 	})
+
+	Context("ToNetworkInterfaceCR", func() {
+		It("should convert aliyunClient.NetworkInterface to NetworkInterface CR", func() {
+			aliyunENI := &aliyunClient.NetworkInterface{
+				NetworkInterfaceID: "eni-123",
+				MacAddress:         "00:11:22:33:44:55",
+				VPCID:              "vpc-123",
+				ZoneID:             "zone-1",
+				VSwitchID:          "vsw-123",
+				ResourceGroupID:    "rg-123",
+				SecurityGroupIDs:   []string{"sg-1", "sg-2"},
+				PrivateIPAddress:   "192.168.1.100",
+				IPv6Set: []aliyunClient.IPSet{
+					{IPAddress: "2001:db8::1"},
+				},
+			}
+
+			result := ToNetworkInterfaceCR(aliyunENI)
+
+			Expect(result.Name).To(Equal("eni-123"))
+			Expect(result.Spec.ENI.ID).To(Equal("eni-123"))
+			Expect(result.Spec.ENI.MAC).To(Equal("00:11:22:33:44:55"))
+			Expect(result.Spec.IPv4).To(Equal("192.168.1.100"))
+			Expect(result.Spec.IPv6).To(Equal("2001:db8::1"))
+		})
+	})
+
+	Context("WaitCreated", func() {
+		It("should wait for object to be created successfully", func() {
+			obj := &networkv1beta1.NetworkInterface{
+				ObjectMeta: metav1.ObjectMeta{
+					Name: "wait-created-test",
+				},
+			}
+			Expect(k8sClient.Create(ctx, obj)).To(Succeed())
+
+			err := WaitCreated(ctx, k8sClient, obj, "", "wait-created-test")
+			Expect(err).NotTo(HaveOccurred())
+		})
+	})
+
+	Context("WaitDeleted", func() {
+		It("should wait for object to be deleted successfully", func() {
+			obj := &networkv1beta1.NetworkInterface{
+				ObjectMeta: metav1.ObjectMeta{
+					Name: "wait-deleted-test",
+				},
+			}
+			Expect(k8sClient.Create(ctx, obj)).To(Succeed())
+			Expect(k8sClient.Delete(ctx, obj)).To(Succeed())
+
+			WaitDeleted(ctx, k8sClient, obj, "", "wait-deleted-test")
+
+			err := k8sClient.Get(ctx, client.ObjectKey{Name: "wait-deleted-test"}, obj)
+			Expect(k8sErr.IsNotFound(err)).To(BeTrue())
+		})
+	})
+
+	Context("WaitRVChanged", func() {
+		It("should wait for resource version to change", func() {
+			obj := &networkv1beta1.NetworkInterface{
+				ObjectMeta: metav1.ObjectMeta{
+					Name: "wait-rv-test",
+				},
+			}
+			Expect(k8sClient.Create(ctx, obj)).To(Succeed())
+
+			Expect(k8sClient.Get(ctx, client.ObjectKey{Name: "wait-rv-test"}, obj)).To(Succeed())
+			initialRV := obj.GetResourceVersion()
+
+			update := obj.DeepCopy()
+
+			go func() {
+				time.Sleep(50 * time.Millisecond)
+				update.Spec.IPv4 = "192.168.1.100"
+				Expect(k8sClient.Update(ctx, update)).To(Succeed())
+			}()
+
+			err := WaitRVChanged(ctx, k8sClient, obj, "", "wait-rv-test", initialRV)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(obj.GetResourceVersion()).NotTo(Equal(initialRV))
+		})
+	})
 })