Skip to content

Commit

Permalink
add arp ut (#4535)
Browse files Browse the repository at this point in the history
* add arp ut

Signed-off-by: bobz965 <[email protected]>

* add err log

Signed-off-by: bobz965 <[email protected]>

---------

Signed-off-by: bobz965 <[email protected]>
  • Loading branch information
bobz965 authored Sep 20, 2024
1 parent b904912 commit 996da81
Show file tree
Hide file tree
Showing 3 changed files with 172 additions and 5 deletions.
2 changes: 1 addition & 1 deletion pkg/controller/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -860,8 +860,8 @@ func (c *Controller) initNodeChassis() error {
}
for _, node := range nodes {
if err := c.UpdateChassisTag(node); err != nil {
klog.Error(err)
if _, ok := err.(*ErrChassisNotFound); !ok {
klog.Error(err)
return err
}
}
Expand Down
8 changes: 6 additions & 2 deletions pkg/controller/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -810,13 +810,17 @@ func (c *Controller) UpdateChassisTag(node *v1.Node) error {
klog.Errorf("failed to gc chassis: %v", err)
return err
}
return &ErrChassisNotFound{Chassis: annoChassisName, Node: node.Name}
err = &ErrChassisNotFound{Chassis: annoChassisName, Node: node.Name}
klog.Error(err)
return err
}

if chassis.ExternalIDs == nil || chassis.ExternalIDs["vendor"] != util.CniTypeName {
klog.Infof("init tag %s for node %s chassis %s", util.CniTypeName, node.Name, chassis.Name)
if err = c.OVNSbClient.UpdateChassisTag(chassis.Name, node.Name); err != nil {
return fmt.Errorf("failed to init chassis tag, %w", err)
err := fmt.Errorf("failed to init chassis tag, %w", err)
klog.Error(err)
return err
}
}
return nil
Expand Down
167 changes: 165 additions & 2 deletions pkg/util/arp_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"testing"
"time"

"github.com/stretchr/testify/require"
"github.com/vishvananda/netlink"
"golang.org/x/sys/unix"
)
Expand Down Expand Up @@ -96,13 +97,175 @@ func TestArpResolve(t *testing.T) {
if mac == nil {
t.Errorf("ARP resolved MAC address is nil: try %d, link name %s, default gw %s", count, linkName, defaultGW)
}
// should failed
defaultGW = "xx.xx.xx.xx"
// invalid link name
linkName = "invalid"
mac, count, err = ArpResolve(linkName, defaultGW, time.Second, maxRetry, done)
if err == nil {
t.Errorf("Expect error, but got nil: try %d, link name %s, default gw %s", count, linkName, defaultGW)
}
if mac != nil {
t.Errorf("Expect nil MAC address, but got %v: try %d, link name %s, default gw %s", mac, count, linkName, defaultGW)
}
linkName = link.Attrs().Name
// invalid gw
defaultGW = "x.x.x.x"
mac, count, err = ArpResolve(linkName, defaultGW, time.Second, maxRetry, done)
if err == nil {
t.Errorf("Expect error, but got nil: try %d, link name %s, default gw %s", count, linkName, defaultGW)
}
if mac != nil {
t.Errorf("Expect nil MAC address, but got %v: try %d, link name %s, default gw %s", mac, count, linkName, defaultGW)
}
// unreachable gw
defaultGW = "123.45.67.8"
mac, count, err = ArpResolve(linkName, defaultGW, time.Second, maxRetry, done)
if err == nil {
t.Errorf("Expect error, but got nil: try %d, link name %s, default gw %s", count, linkName, defaultGW)
}
if mac != nil {
t.Errorf("Expect nil MAC address, but got %v: try %d, link name %s, default gw %s", mac, count, linkName, defaultGW)
}
}

func TestDetectIPConflict(t *testing.T) {
// get the default route gw and nic
routes, err := netlink.RouteList(nil, unix.AF_UNSPEC)
if errors.Is(err, netlink.ErrNotImplemented) {
return // skip if not implemented
}
if err != nil {
t.Fatalf("failed to get routes: %v", err)
}
var validIP, invalidIP string
var nicIndex int
var inMac, outMac net.HardwareAddr
for _, r := range routes {
if r.Dst != nil && r.Dst.IP.String() == "0.0.0.0" {
nicIndex = r.LinkIndex
validIP = r.Src.String()
}
}

if nicIndex == 0 {
t.Fatalf("failed to get nic")
}

link, err := netlink.LinkByIndex(nicIndex)
if err != nil {
t.Fatalf("failed to get link: %v", err)
}
linkName := link.Attrs().Name
inMac = link.Attrs().HardwareAddr
outMac, err = ArpDetectIPConflict(linkName, validIP, inMac)
if err != nil {
if strings.Contains(err.Error(), "not permitted") {
t.Skip("ARP request operation not permitted")
return
}
t.Errorf("Error resolving ARP: %v", err)
}
require.Nil(t, err)
require.Nil(t, outMac)
// invalid ip
invalidIP = "x.x.x.x"
outMac, err = ArpDetectIPConflict(linkName, invalidIP, inMac)
if err != nil {
if strings.Contains(err.Error(), "not permitted") {
t.Skip("ARP request operation not permitted")
return
}
}
require.NotNil(t, err)
require.Nil(t, outMac)
// invalid nil nic
linkName = ""
outMac, err = ArpDetectIPConflict(linkName, validIP, inMac)
if err != nil {
if strings.Contains(err.Error(), "not permitted") {
t.Skip("ARP request operation not permitted")
return
}
}
require.NotNil(t, err)
require.Nil(t, outMac)

// invalid mac
outMac, err = ArpDetectIPConflict(linkName, validIP, nil)
if err != nil {
if strings.Contains(err.Error(), "not permitted") {
t.Skip("ARP request operation not permitted")
return
}
}
require.NotNil(t, err)
require.Nil(t, outMac)
}

func TestAnnounceArpAddress(t *testing.T) {
// get the default route gw and nic
routes, err := netlink.RouteList(nil, unix.AF_UNSPEC)
if errors.Is(err, netlink.ErrNotImplemented) {
return // skip if not implemented
}
if err != nil {
t.Fatalf("failed to get routes: %v", err)
}
var validIP, invalidIP string
var nicIndex int
var inMac net.HardwareAddr
for _, r := range routes {
if r.Dst != nil && r.Dst.IP.String() == "0.0.0.0" {
nicIndex = r.LinkIndex
validIP = r.Src.String()
}
}
if nicIndex == 0 {
t.Fatalf("failed to get nic")
}

link, err := netlink.LinkByIndex(nicIndex)
if err != nil {
t.Fatalf("failed to get link: %v", err)
}
maxRetry := 1
linkName := link.Attrs().Name
inMac = link.Attrs().HardwareAddr
err = AnnounceArpAddress(linkName, validIP, inMac, maxRetry, time.Second)
if err != nil {
if strings.Contains(err.Error(), "not permitted") {
t.Skip("ARP announce operation not permitted")
return
}
}
require.Nil(t, err)
// invalid link name
linkName = "invalid"
err = AnnounceArpAddress(linkName, validIP, inMac, maxRetry, time.Second)
if err != nil {
if strings.Contains(err.Error(), "not permitted") {
t.Skip("ARP announce operation not permitted")
return
}
}
require.NotNil(t, err)
linkName = link.Attrs().Name
// invalid ip
invalidIP = "x.x.x.x"
err = AnnounceArpAddress(linkName, invalidIP, inMac, maxRetry, time.Second)
if err != nil {
if strings.Contains(err.Error(), "not permitted") {
t.Skip("ARP announce operation not permitted")
return
}
}
require.NotNil(t, err)
// invalid mc
err = AnnounceArpAddress(linkName, validIP, nil, maxRetry, time.Second)
if err != nil {
if strings.Contains(err.Error(), "not permitted") {
t.Skip("ARP announce operation not permitted")
return
}
}
require.NotNil(t, err)
}

0 comments on commit 996da81

Please sign in to comment.