gh-48 fullproxy regression fixes for sanity cicd run

loxilb-io · Jul 12, 2024 · c4e53ba · c4e53ba
1 parent c4ebd1a
commit c4e53ba
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 15 deletions.
diff --git a/pkg/loxinet/layer3.go b/pkg/loxinet/layer3.go
@@ -20,6 +20,7 @@ import (
 	"errors"
 	"fmt"
 	"net"
+	"strings"
 
 	tk "github.com/loxilb-io/loxilib"
 
@@ -550,7 +551,7 @@ func (ifa *Ifa) DP(work DpWorkT) int {
 	port := ifa.Zone.Ports.PortFindByName(ifa.Key.Obj)
 
 	if port == nil {
-		if ifa.Key.Obj != "lo" {
+		if ifa.Key.Obj != "lo" && !strings.Contains(ifa.Key.Obj, "llb-rule") {
 			tk.LogIt(tk.LogError, "No such obj : %s\n", ifa.Key.Obj)
 			ifa.Sync = DpCreateErr
 		}

diff --git a/pkg/loxinet/neighbor.go b/pkg/loxinet/neighbor.go
@@ -456,17 +456,11 @@ NhExist:
 	//Add a related L2 Pair entry if needed
 	if port.IsSlavePort() == false && port.IsLeafPort() == true && ne.Resolved {
 		var fdbAddr [6]byte
-		var vid int
 		for i := 0; i < 6; i++ {
 			fdbAddr[i] = uint8(ne.Attr.HardwareAddr[i])
 		}
-		if port.SInfo.PortType&cmn.PortReal != 0 {
-			vid = port.PortNo + RealPortIDB
-		} else {
-			vid = port.PortNo + BondIDB
-		}
 
-		fdbKey := FdbKey{fdbAddr, vid}
+		fdbKey := FdbKey{fdbAddr, port.L2.Vid}
 		fdbAttr := FdbAttr{port.Name, net.ParseIP("0.0.0.0"), cmn.FdbPhy}
 
 		code, err := n.Zone.L2.L2FdbAdd(fdbKey, fdbAttr)
@@ -518,17 +512,11 @@ func (n *NeighH) NeighDelete(Addr net.IP, Zone string) (int, error) {
 	port := ne.OifPort
 	if port != nil && port.IsSlavePort() == false && port.IsLeafPort() == true && ne.Resolved {
 		var fdbAddr [6]byte
-		var vid int
 		for i := 0; i < 6; i++ {
 			fdbAddr[i] = uint8(ne.Attr.HardwareAddr[i])
 		}
-		if port.SInfo.PortType&cmn.PortReal != 0 {
-			vid = port.PortNo + RealPortIDB
-		} else {
-			vid = port.PortNo + BondIDB
-		}
 
-		fdbKey := FdbKey{fdbAddr, vid}
+		fdbKey := FdbKey{fdbAddr, port.L2.Vid}
 		n.Zone.L2.L2FdbDel(fdbKey)
 	}