IpAssigner Linux UT

Signed-off-by: Rajnish Kumar <rajnishk1@vmware.com>
antrea-io · Oct 9, 2023 · b18f057 · b18f057
1 parent 4806be3
commit b18f057
Show file tree

Hide file tree

Showing 4 changed files with 495 additions and 7 deletions.
diff --git a/hack/update-codegen-dockerized.sh b/hack/update-codegen-dockerized.sh
@@ -52,6 +52,7 @@ MOCKGEN_TARGETS=(
   "pkg/agent/querier AgentQuerier testing"
   "pkg/agent/route Interface testing"
   "pkg/agent/ipassigner IPAssigner testing"
+  "pkg/agent/ipassigner/responder Responder testing"
   "pkg/agent/secondarynetwork/podwatch InterfaceConfigurator testing"
   "pkg/agent/secondarynetwork/ipam IPAMDelegator testing"
   "pkg/agent/servicecidr Interface testing"

diff --git a/pkg/agent/ipassigner/ip_assigner_linux.go b/pkg/agent/ipassigner/ip_assigner_linux.go
@@ -33,6 +33,15 @@ import (
 	"antrea.io/antrea/pkg/agent/util/sysctl"
 )
 
+var (
+	netlinkAddrAdd = netlink.AddrAdd
+	netlinkAddrDel = netlink.AddrDel
+)
+
+type advertiseArpNdp func(a *ipAssigner, ip net.IP)
+
+var advertiseResponder advertiseArpNdp = (*ipAssigner).advertise
+
 // ipAssigner creates a dummy device and assigns IPs to it.
 // It's supposed to be used in the cases that external IPs should be configured on the system so that they can be used
 // for SNAT (egress scenario) or DNAT (ingress scenario). A dummy device is used because the IPs just need to be present
@@ -154,14 +163,14 @@ func (a *ipAssigner) AssignIP(ip string, forceAdvertise bool) error {
 	if a.assignedIPs.Has(ip) {
 		klog.V(2).InfoS("The IP is already assigned", "ip", ip)
 		if forceAdvertise {
-			a.advertise(parsedIP)
+			advertiseResponder(a, parsedIP)
 		}
 		return nil
 	}
 
 	if a.dummyDevice != nil {
 		addr := util.NewIPNet(parsedIP)
-		if err := netlink.AddrAdd(a.dummyDevice, &netlink.Addr{IPNet: addr}); err != nil {
+		if err := netlinkAddrAdd(a.dummyDevice, &netlink.Addr{IPNet: addr}); err != nil {
 			if !errors.Is(err, unix.EEXIST) {
 				return fmt.Errorf("failed to add IP %v to interface %s: %v", ip, a.dummyDevice.Attrs().Name, err)
 			} else {
@@ -183,7 +192,7 @@ func (a *ipAssigner) AssignIP(ip string, forceAdvertise bool) error {
 		}
 	}
 	// Always advertise the IP when the IP is newly assigned to this Node.
-	a.advertise(parsedIP)
+	advertiseResponder(a, parsedIP)
 	a.assignedIPs.Insert(ip)
 	return nil
 }
@@ -218,7 +227,7 @@ func (a *ipAssigner) UnassignIP(ip string) error {
 
 	if a.dummyDevice != nil {
 		addr := util.NewIPNet(parsedIP)
-		if err := netlink.AddrDel(a.dummyDevice, &netlink.Addr{IPNet: addr}); err != nil {
+		if err := netlinkAddrDel(a.dummyDevice, &netlink.Addr{IPNet: addr}); err != nil {
 			if !errors.Is(err, unix.EADDRNOTAVAIL) {
 				return fmt.Errorf("failed to delete IP %v from interface %s: %v", ip, a.dummyDevice.Attrs().Name, err)
 			} else {
@@ -264,15 +273,15 @@ func (a *ipAssigner) InitIPs(ips sets.Set[string]) error {
 		}
 		for ip := range ips.Difference(assigned) {
 			addr := util.NewIPNet(net.ParseIP(ip))
-			if err := netlink.AddrAdd(a.dummyDevice, &netlink.Addr{IPNet: addr}); err != nil {
+			if err := netlinkAddrAdd(a.dummyDevice, &netlink.Addr{IPNet: addr}); err != nil {
 				if !errors.Is(err, unix.EEXIST) {
 					return fmt.Errorf("failed to add IP %v to interface %s: %v", ip, a.dummyDevice.Attrs().Name, err)
 				}
 			}
 		}
 		for ip := range assigned.Difference(ips) {
 			addr := util.NewIPNet(net.ParseIP(ip))
-			if err := netlink.AddrDel(a.dummyDevice, &netlink.Addr{IPNet: addr}); err != nil {
+			if err := netlinkAddrDel(a.dummyDevice, &netlink.Addr{IPNet: addr}); err != nil {
 				if !errors.Is(err, unix.EADDRNOTAVAIL) {
 					return fmt.Errorf("failed to delete IP %v from interface %s: %v", ip, a.dummyDevice.Attrs().Name, err)
 				}
@@ -291,7 +300,7 @@ func (a *ipAssigner) InitIPs(ips sets.Set[string]) error {
 		if err != nil {
 			return err
 		}
-		a.advertise(ip)
+		advertiseResponder(a, ip)
 	}
 	a.assignedIPs = ips.Union(nil)
 	return nil