Merge pull request #543 from TrekkieCoder/main

cicd : Fixes to accomodate working with bfd
loxilb-io · Feb 23, 2024 · d0618df · d0618df
2 parents f640a83 + 2843533
commit d0618df
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/cicd/common.sh b/cicd/common.sh
@@ -156,7 +156,7 @@ get_llb_peerIP() {
         llb2IP="$A.$B.$C.$((D+1))"
       fi
       cluster_opts=" --cluster=$llb2IP --self=0"
-      ka_opts=" --ka=$llb2IP"
+      ka_opts=" --ka=$llb2IP:$llb1IP"
     elif [[ "$1" == "llb2" ]]; then
       llb2IP=$(docker inspect --format='{{.NetworkSettings.IPAddress}}' llb2)
       if [[ "lb$llb2IP" == "lb" ]];then
@@ -166,7 +166,7 @@ get_llb_peerIP() {
         llb1IP="$A.$B.$C.$((D-1))"
       fi
       cluster_opts=" --cluster=$llb1IP --self=1"
-      ka_opts=" --ka=$llb1IP"
+      ka_opts=" --ka=$llb1IP:$llb2IP"
     fi
 }
 

diff --git a/cicd/k3s-flannel/validation.sh b/cicd/k3s-flannel/validation.sh
@@ -28,7 +28,7 @@ do
 done
 
 ## Any routing updates  ??
-sleep 30
+sleep 60
 
 echo "ExternalIP $extIP"
 
@@ -45,20 +45,29 @@ print_debug_info() {
   $dexec llb1 loxicmd get ep -o wide
   echo "**** llb1 route-info ****"
   $dexec llb1 ip route
+  echo "**** llb1 bfd-info ****"
+  $dexec llb1 loxicmd get ha
 
   echo "**** llb2 lb-info ****"
   $dexec llb2 loxicmd get lb -o wide
   echo "**** loxilb ep-info ****"
   $dexec llb1 loxicmd get ep -o wide
   echo "**** llb2 route-info ****"
   $dexec llb2 ip route
+  echo "**** llb2 bfd-info ****"
+  $dexec llb2 loxicmd get ha
 
   echo "**** r1 route-info ****"
   $dexec r1 ip route
+
+  echo "**** sys route-info ****"
+  ip route
 }
 
 code=0
-#print_debug_info
+echo "********************"
+print_debug_info
+echo "********************"
 
 out=$($hexec user curl -s --connect-timeout 10 http://$extIP:55002) 
 if [[ ${out} == *"Welcome to nginx"* ]]; then