Skip to content

Commit

Permalink
Wait for Pod update in MCNP UT (antrea-io#4618)
Browse files Browse the repository at this point in the history 
Signed-off-by: graysonwu <[email protected]>
  • Loading branch information
@GraysonWu @luolanzone
GraysonWu authored and luolanzone committed Mar 24, 2023
1 parent 330b793 commit 9f73f7d
Showing 1 changed file with 31 additions and 17 deletions.
48 changes: 31 additions & 17 deletions pkg/agent/multicluster/stretched_networkpolicy_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ package multicluster
import (
"context"
"net"
"reflect"
"testing"
"time"

Expand Down Expand Up @@ -159,10 +160,10 @@ func TestEnqueueAllPods(t *testing.T) {
c.mcInformerFactory.WaitForCacheSync(stopCh)
go c.podInformer.Run(stopCh)
if err := waitForPodRealized(c, pod); err != nil {
t.Errorf("error when waiting for Pod '%s/%s' to be realized: %v", pod.Namespace, pod.Name, err)
t.Errorf("Error when waiting for Pod '%s/%s' to be realized, err: %v", pod.Namespace, pod.Name, err)
}
if err := waitForLabelIdentityRealized(c, labelIdentity); err != nil {
t.Errorf("error when waiting for LabelIdentity '%s' to be realized: %v", labelIdentity.Name, err)
t.Errorf("Error when waiting for LabelIdentity '%s' to be realized, err: %v", labelIdentity.Name, err)
}
c.enqueueAllPods()

Expand Down Expand Up @@ -242,13 +243,13 @@ func TestStretchedNetworkPolicyControllerPodEvent(t *testing.T) {
defer close(finishCh)
c.clientset.CoreV1().Namespaces().Create(context.TODO(), ns, metav1.CreateOptions{})
if err := waitForNSRealized(c, ns); err != nil {
t.Errorf("error when waiting for Namespace '%s' to be realized: %v", ns.Name, err)
t.Errorf("Error when waiting for Namespace '%s' to be realized, err: %v", ns.Name, err)
}

// Create a Pod whose LabelIdentity doesn't exist.
c.clientset.CoreV1().Pods(pod.Namespace).Create(context.TODO(), pod, metav1.CreateOptions{})
if err := waitForPodRealized(c, pod); err != nil {
t.Errorf("error when waiting for Pod '%s/%s' to be realized: %v", pod.Namespace, pod.Name, err)
t.Errorf("Error when waiting for Pod '%s/%s' to be realized, err: %v", pod.Namespace, pod.Name, err)
}
c.interfaceStore.EXPECT().GetContainerInterfacesByPod(pod.Name, pod.Namespace).Return([]*interfacestore.InterfaceConfig{&interfaceConfig}).Times(1)
c.ofClient.EXPECT().InstallPodFlows(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Eq(&unknownLabelIdentity)).Times(1)
Expand All @@ -263,12 +264,12 @@ func TestStretchedNetworkPolicyControllerPodEvent(t *testing.T) {
// Create a Pod whose LabelIdentity already exist.
c.mcClient.MulticlusterV1alpha1().LabelIdentities().Create(context.TODO(), labelIdentity1, metav1.CreateOptions{})
if err := waitForLabelIdentityRealized(c, labelIdentity1); err != nil {
t.Errorf("error when waiting for LabelIdentity '%s' to be realized: %v", labelIdentity1.Name, err)
t.Errorf("Error when waiting for LabelIdentity '%s' to be realized, err: %v", labelIdentity1.Name, err)
}
c.interfaceStore.EXPECT().GetContainerInterfacesByPod(pod.Name, pod.Namespace).Return([]*interfacestore.InterfaceConfig{&interfaceConfig}).Times(1)
c.clientset.CoreV1().Pods(pod.Namespace).Create(context.TODO(), pod, metav1.CreateOptions{})
if err := waitForPodRealized(c, pod); err != nil {
t.Errorf("error when waiting for Pod '%s/%s' to be realized: %v", pod.Namespace, pod.Name, err)
t.Errorf("Error when waiting for Pod '%s/%s' to be realized, err: %v", pod.Namespace, pod.Name, err)
}
c.ofClient.EXPECT().InstallPodFlows(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Eq(&labelIdentity1.Spec.ID)).Times(1)
c.podUpdateChannel.Notify(toPodAddEvent(pod))
Expand All @@ -279,11 +280,14 @@ func TestStretchedNetworkPolicyControllerPodEvent(t *testing.T) {
// Update Pod label.
c.mcClient.MulticlusterV1alpha1().LabelIdentities().Create(context.TODO(), labelIdentity2, metav1.CreateOptions{})
if err := waitForLabelIdentityRealized(c, labelIdentity2); err != nil {
t.Errorf("error when waiting for LabelIdentity '%s' to be realized: %v", labelIdentity2.Name, err)
t.Errorf("Error when waiting for LabelIdentity '%s' to be realized, err: %v", labelIdentity2.Name, err)
}
c.interfaceStore.EXPECT().GetContainerInterfacesByPod(pod.Name, pod.Namespace).Return([]*interfacestore.InterfaceConfig{&interfaceConfig}).Times(1)
pod.Labels["foo"] = "bar2"
c.clientset.CoreV1().Pods(pod.Namespace).Update(context.TODO(), pod, metav1.UpdateOptions{})
if err := waitForPodLabelUpdate(c, pod); err != nil {
t.Errorf("Error when waiting for Pod '%s/%s' to be updated, err: %v", pod.Namespace, pod.Name, err)
}
c.ofClient.EXPECT().InstallPodFlows(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Eq(&labelIdentity2.Spec.ID)).Times(1)
c.processNextWorkItem()
assert.Equal(t, map[types.NamespacedName]string{{Name: pod.Name, Namespace: pod.Namespace}: labelIdentity2.Spec.Label}, c.podToLabel)
Expand Down Expand Up @@ -387,33 +391,33 @@ func TestStretchedNetworkPolicyControllerNSEvent(t *testing.T) {

c.mcClient.MulticlusterV1alpha1().LabelIdentities().Create(context.TODO(), labelIdentity1, metav1.CreateOptions{})
if err := waitForLabelIdentityRealized(c, labelIdentity1); err != nil {
t.Errorf("error when waiting for LabelIdentity '%s' to be realized: %v", labelIdentity1.Name, err)
t.Errorf("Error when waiting for LabelIdentity '%s' to be realized: %v", labelIdentity1.Name, err)
}
c.mcClient.MulticlusterV1alpha1().LabelIdentities().Create(context.TODO(), labelIdentity2, metav1.CreateOptions{})
if err := waitForLabelIdentityRealized(c, labelIdentity2); err != nil {
t.Errorf("error when waiting for LabelIdentity '%s' to be realized: %v", labelIdentity2.Name, err)
t.Errorf("Error when waiting for LabelIdentity '%s' to be realized, err: %v", labelIdentity2.Name, err)
}
c.mcClient.MulticlusterV1alpha1().LabelIdentities().Create(context.TODO(), labelIdentity3, metav1.CreateOptions{})
if err := waitForLabelIdentityRealized(c, labelIdentity3); err != nil {
t.Errorf("error when waiting for LabelIdentity '%s' to be realized: %v", labelIdentity3.Name, err)
t.Errorf("Error when waiting for LabelIdentity '%s' to be realized, err: %v", labelIdentity3.Name, err)
}
c.mcClient.MulticlusterV1alpha1().LabelIdentities().Create(context.TODO(), labelIdentity4, metav1.CreateOptions{})
if err := waitForLabelIdentityRealized(c, labelIdentity4); err != nil {
t.Errorf("error when waiting for LabelIdentity '%s' to be realized: %v", labelIdentity4.Name, err)
t.Errorf("Error when waiting for LabelIdentity '%s' to be realized, err: %v", labelIdentity4.Name, err)
}

c.clientset.CoreV1().Namespaces().Create(context.TODO(), ns, metav1.CreateOptions{})
if err := waitForNSRealized(c, ns); err != nil {
t.Errorf("error when waiting for Namespace '%s' to be realized: %v", ns.Name, err)
t.Errorf("Error when waiting for Namespace '%s' to be realized, err: %v", ns.Name, err)
}

c.clientset.CoreV1().Pods(pod1.Namespace).Create(context.TODO(), pod1, metav1.CreateOptions{})
if err := waitForPodRealized(c, pod1); err != nil {
t.Errorf("error when waiting for Pod '%s/%s' to be realized: %v", pod1.Namespace, pod1.Name, err)
t.Errorf("Error when waiting for Pod '%s/%s' to be realized, err: %v", pod1.Namespace, pod1.Name, err)
}
c.clientset.CoreV1().Pods(pod2.Namespace).Create(context.TODO(), pod2, metav1.CreateOptions{})
if err := waitForPodRealized(c, pod2); err != nil {
t.Errorf("error when waiting for Pod '%s/%s' to be realized: %v", pod2.Namespace, pod2.Name, err)
t.Errorf("Error when waiting for Pod '%s/%s' to be realized, err: %v", pod2.Namespace, pod2.Name, err)
}
c.interfaceStore.EXPECT().GetContainerInterfacesByPod(pod1.Name, pod1.Namespace).Return([]*interfacestore.InterfaceConfig{&interfaceConfig}).Times(1)
c.interfaceStore.EXPECT().GetContainerInterfacesByPod(pod2.Name, pod2.Namespace).Return([]*interfacestore.InterfaceConfig{&interfaceConfig}).Times(1)
Expand Down Expand Up @@ -499,12 +503,12 @@ func TestStretchedNetworkPolicyControllerLabelIdentityEvent(t *testing.T) {
defer close(finishCh)
c.clientset.CoreV1().Namespaces().Create(context.TODO(), ns, metav1.CreateOptions{})
if err := waitForNSRealized(c, ns); err != nil {
t.Errorf("error when waiting for Namespace '%s' to be realized: %v", ns.Name, err)
t.Errorf("Error when waiting for Namespace '%s' to be realized, err: %v", ns.Name, err)
}

c.clientset.CoreV1().Pods(pod.Namespace).Create(context.TODO(), pod, metav1.CreateOptions{})
if err := waitForPodRealized(c, pod); err != nil {
t.Errorf("error when waiting for Pod '%s/%s' to be realized: %v", pod.Namespace, pod.Name, err)
t.Errorf("Error when waiting for Pod '%s/%s' to be realized, err: %v", pod.Namespace, pod.Name, err)
}
c.interfaceStore.EXPECT().GetContainerInterfacesByPod(pod.Name, pod.Namespace).Return([]*interfacestore.InterfaceConfig{&interfaceConfig}).Times(1)
c.ofClient.EXPECT().InstallPodFlows(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Eq(&unknownLabelIdentity)).Times(1)
Expand All @@ -516,7 +520,7 @@ func TestStretchedNetworkPolicyControllerLabelIdentityEvent(t *testing.T) {
// Create LabelIdentity
c.mcClient.MulticlusterV1alpha1().LabelIdentities().Create(context.TODO(), labelIdentity, metav1.CreateOptions{})
if err := waitForLabelIdentityRealized(c, labelIdentity); err != nil {
t.Errorf("error when waiting for LabelIdentity '%s' to be realized: %v", labelIdentity.Name, err)
t.Errorf("Error when waiting for LabelIdentity '%s' to be realized, err: %v", labelIdentity.Name, err)
}
c.interfaceStore.EXPECT().GetContainerInterfacesByPod(pod.Name, pod.Namespace).Return([]*interfacestore.InterfaceConfig{&interfaceConfig}).Times(1)
c.ofClient.EXPECT().InstallPodFlows(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Eq(&labelIdentity.Spec.ID)).Times(1)
Expand Down Expand Up @@ -566,6 +570,16 @@ func waitForPodRealized(c *fakeStretchedNetworkPolicyController, pod *corev1.Pod
})
}

func waitForPodLabelUpdate(c *fakeStretchedNetworkPolicyController, pod *corev1.Pod) error {
return wait.Poll(interval, timeout, func() (bool, error) {
getPod, err := c.podLister.Pods(pod.Namespace).Get(pod.Name)
if err != nil || !reflect.DeepEqual(pod.Labels, getPod.Labels) {
return false, nil
}
return true, err
})
}

func waitForNSRealized(c *fakeStretchedNetworkPolicyController, ns *corev1.Namespace) error {
return wait.Poll(interval, timeout, func() (bool, error) {
_, err := c.namespaceLister.Get(ns.Name)
Expand Down

0 comments on commit 9f73f7d

Please sign in to comment.