From a599da16e753e06fdb2bf2a9451e7a0a1c93670b Mon Sep 17 00:00:00 2001
From: Trekkie Coder <trekkie@netlox.io>
Date: Tue, 12 Dec 2023 01:49:14 +0900
Subject: [PATCH 1/2] Fixed perfCI regressions temporarily due to incomplete
 merge

---
 api/loxinlp/nlp.go             | 5 +++--
 cicd/common.sh                 | 6 +++++-
 cicd/tcpsctpperf/validation.sh | 6 +++---
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/api/loxinlp/nlp.go b/api/loxinlp/nlp.go
index 43d14cdf8..9aeb64386 100644
--- a/api/loxinlp/nlp.go
+++ b/api/loxinlp/nlp.go
@@ -1551,8 +1551,6 @@ func NlpInit(bgpPeerMode bool, blackList string) *NlH {
 	nNl.IMap = make(map[string]Intf)
 
 	checkInit := make(chan bool)
-	go NlpGet(checkInit)
-	done := <-checkInit
 
 	err := nlp.LinkSubscribe(nNl.FromLUCh, nNl.FromLUDone)
 	if err != nil {
@@ -1582,6 +1580,9 @@ func NlpInit(bgpPeerMode bool, blackList string) *NlH {
 	go NLWorker(nNl, bgpPeerMode)
 	tk.LogIt(tk.LogInfo, "[NLP] NLP Subscription done\n")
 
+	go NlpGet(checkInit)
+	done := <-checkInit
+
 	go LbSessionGet(done)
 
 	return nNl
diff --git a/cicd/common.sh b/cicd/common.sh
index ce40e744d..2ee1ac664 100644
--- a/cicd/common.sh
+++ b/cicd/common.sh
@@ -13,6 +13,8 @@ hns="sudo ip netns "
 hexist="$vrn$hn"
 lxdocker="ghcr.io/loxilb-io/loxilb:latest"
 cluster_opts=""
+## FIXME - This is needed for perfCI scripts
+OSE_LOXILB_SERVERS=${OSE_LOXILB_SERVERS:=1}
 var=$(lsb_release -r | cut -f2)
 if [[ $var == *"22.04"* ]];then
   lxdocker="ghcr.io/loxilb-io/loxilb:latestu22"
@@ -152,7 +154,9 @@ spawn_docker_host() {
   $hexec $dname ifconfig lo up
   $hexec $dname sysctl net.ipv6.conf.all.disable_ipv6=1 2>&1 >> /dev/null
   #$hexec $dname sysctl net.ipv4.conf.all.arp_accept=1 2>&1 >> /dev/null
-  $hexec $dname sysctl net.ipv4.conf.eth0.arp_ignore=2 2>&1 >> /dev/null
+  if [ -f /proc/sys/net/ipv4/conf/eth0/arp_ignore ]; then
+    $hexec $dname sysctl net.ipv4.conf.eth0.arp_ignore=2 2>&1 >> /dev/null
+  fi
 }
 
 ## Get loxilb peer docker IP
diff --git a/cicd/tcpsctpperf/validation.sh b/cicd/tcpsctpperf/validation.sh
index 7617d3c90..d800a77da 100755
--- a/cicd/tcpsctpperf/validation.sh
+++ b/cicd/tcpsctpperf/validation.sh
@@ -44,13 +44,13 @@ $dexec llb1 bash -c "nohup /root/loxilb-io/loxilb/loxilb --rss-enable >> /dev/nu
 sleep 40
 for ((i=1,port=12865;i<=100;i++,port++))
 do
-  $dexec llb1 loxicmd create lb 20.20.20.1 --tcp=$port:$port  --endpoints=31.31.31.1:1 >> /dev/null
+  $dexec llb1 loxicmd create lb 20.20.20.1 --tcp=$port:$port  --endpoints=31.31.1.1:1 >> /dev/null
 done
 
-$dexec llb1 loxicmd create lb 20.20.20.1 --tcp=13866:13866  --endpoints=31.31.31.1:1 >> /dev/null
+$dexec llb1 loxicmd create lb 20.20.20.1 --tcp=13866:13866  --endpoints=31.31.1.1:1 >> /dev/null
 for ((i=1,port=13866;i<=100;i++,port++))
 do
-  $dexec llb1 loxicmd create lb 20.20.20.1 --sctp=$port:$port  --endpoints=31.31.31.1:1 >> /dev/null
+  $dexec llb1 loxicmd create lb 20.20.20.1 --sctp=$port:$port  --endpoints=31.31.1.1:1 >> /dev/null
 done
 
 sleep 20

From 132cb089cd53c948e3b5ee34a7786c8a99d81cf8 Mon Sep 17 00:00:00 2001
From: Trekkie Coder <trekkie@netlox.io>
Date: Tue, 12 Dec 2023 02:09:06 +0900
Subject: [PATCH 2/2] removed shell var needed by perfCI as it is no longer
 needed

---
 cicd/common.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/cicd/common.sh b/cicd/common.sh
index 2ee1ac664..79fd9285b 100644
--- a/cicd/common.sh
+++ b/cicd/common.sh
@@ -13,8 +13,6 @@ hns="sudo ip netns "
 hexist="$vrn$hn"
 lxdocker="ghcr.io/loxilb-io/loxilb:latest"
 cluster_opts=""
-## FIXME - This is needed for perfCI scripts
-OSE_LOXILB_SERVERS=${OSE_LOXILB_SERVERS:=1}
 var=$(lsb_release -r | cut -f2)
 if [[ $var == *"22.04"* ]];then
   lxdocker="ghcr.io/loxilb-io/loxilb:latestu22"