Fix flaky e2e test TestL7NetworkPolicy/TLS

Signed-off-by: Hongliang Liu <lhongliang@vmware.com>
antrea-io · Jul 25, 2023 · 892d699 · 892d699
1 parent d73c121
commit 892d699
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 2 deletions.
diff --git a/pkg/agent/route/route_windows.go b/pkg/agent/route/route_windows.go
@@ -250,13 +250,13 @@ func (c *Client) addVirtualServiceIPRoute(isIPv6 bool) error {
 	svcIP := config.VirtualServiceIPv4
 
 	neigh := generateNeigh(svcIP, linkIndex)
-	if err := util.ReplaceNetNeighbor(neigh); err != nil {
+	if err := c.netUtil.ReplaceNetNeighbor(neigh); err != nil {
 		return fmt.Errorf("failed to add new IP neighbour for %s: %w", svcIP, err)
 	}
 	klog.InfoS("Added virtual Service IP neighbor", "neighbor", neigh)
 
 	route := generateRoute(virtualServiceIPv4Net, net.IPv4zero, linkIndex, util.MetricHigh)
-	if err := util.ReplaceNetRoute(route); err != nil {
+	if err := c.netUtil.ReplaceNetRoute(route); err != nil {
 		return fmt.Errorf("failed to install route for virtual Service IP %s: %w", svcIP.String(), err)
 	}
 	c.serviceRoutes.Store(svcIP.String(), route)

diff --git a/pkg/agent/route/route_windows_test.go b/pkg/agent/route/route_windows_test.go
@@ -106,6 +106,7 @@ func TestInitServiceIPRoutes(t *testing.T) {
 	}
 	mockNetUtil.EXPECT().ReplaceNetRoute(generateRoute(virtualServiceIPv4Net, net.IPv4zero, 10, util.MetricHigh))
 	mockNetUtil.EXPECT().ReplaceNetRoute(generateRoute(virtualNodePortDNATIPv4Net, config.VirtualServiceIPv4, 10, util.MetricHigh))
+	mockNetUtil.EXPECT().ReplaceNetNeighbor(generateNeigh(config.VirtualServiceIPv4, 10))
 	mockServiceCIDRProvider.EXPECT().AddEventHandler(gomock.Any())
 	assert.NoError(t, c.initServiceIPRoutes())
 }

diff --git a/pkg/agent/util/mock_net_windows.go b/pkg/agent/util/mock_net_windows.go
diff --git a/pkg/agent/util/net_windows.go b/pkg/agent/util/net_windows.go
@@ -64,6 +64,8 @@ type Interface interface {
 
 	ReplaceNetRoute(route *Route) error
 
+	ReplaceNetNeighbor(neighbor *Neighbor) error
+
 	GetNetRoutes(linkIndex int, dstSubnet *net.IPNet) ([]Route, error)
 
 	GetNetRoutesAll() ([]Route, error)
@@ -950,6 +952,10 @@ func RemoveNetNeighbor(neighbor *Neighbor) error {
 	return err
 }
 
+func (h *Handle) ReplaceNetNeighbor(neighbor *Neighbor) error {
+	return ReplaceNetNeighbor(neighbor)
+}
+
 func ReplaceNetNeighbor(neighbor *Neighbor) error {
 	neighbors, err := GetNetNeighbor(neighbor)
 	if err != nil {