Merge pull request #931 from TrekkieCoder/main

zoning: allow any default instance names
loxilb-io · Jan 12, 2025 · 5955773 · 5955773
2 parents d240c10 + a48aee9
commit 5955773
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 19 deletions.
diff --git a/common/common.go b/common/common.go
@@ -37,7 +37,7 @@ const BFDPort = 3784
 const BFDDefRetryCount = 3
 const (
 	// CIDefault - Default CI Instance name
-	CIDefault = "default"
+	CIDefault = "llb-inst0"
 )
 
 const (

diff --git a/pkg/loxinet/cluster.go b/pkg/loxinet/cluster.go
@@ -170,18 +170,6 @@ func (h *CIStateH) CIStateGetInst(inst string) (string, error) {
 		return ci.StateStr, nil
 	}
 
-	if inst == cmn.CIDefault {
-		for ciStr, ci := range h.ClusterMap {
-			instNum, err := parseInstance(ciStr)
-			if err != nil {
-				continue
-			}
-			if instNum == 0 {
-				return ci.StateStr, nil
-			}
-		}
-	}
-
 	return "NOT_DEFINED", errors.New("not found")
 }
 

diff --git a/pkg/loxinet/gobgpclient.go b/pkg/loxinet/gobgpclient.go
@@ -776,10 +776,11 @@ func (gbh *GoBgpH) initBgpClient() {
 			gbh.advertiseAllVIPs(ciname)
 		}
 
-		if ciname == cmn.CIDefault {
-			if ci.hastate == cmn.CIStateBackup {
+		ciState, err := mh.has.CIStateGetInst(cmn.CIDefault)
+		if err == nil {
+			if ciState == "BACKUP" {
 				gbh.resetBGPPolicy(true)
-			} else if ci.hastate == cmn.CIStateMaster {
+			} else if ciState == "MASTER" {
 				gbh.resetBGPPolicy(false)
 			}
 		}
@@ -850,10 +851,11 @@ func (gbh *GoBgpH) UpdateCIState(instance string, state int, vip net.IP) {
 
 	gbh.advertiseAllVIPs(instance)
 	if update {
-		if instance == cmn.CIDefault {
-			if ci.hastate == cmn.CIStateBackup {
+		ciState, err := mh.has.CIStateGetInst(cmn.CIDefault)
+		if err == nil {
+			if ciState == "BACKUP" {
 				gbh.resetBGPPolicy(true)
-			} else if ci.hastate == cmn.CIStateMaster {
+			} else if ciState == "MASTER" {
 				gbh.resetBGPPolicy(false)
 			}
 		}