Merge pull request #910 from TrekkieCoder/main

PR : gh-877 Initial support for egress : patchset2

cicd/tcplbmaxep/config.sh

@@ -51,4 +51,5 @@ sleep 5
 
 #configure LB
 
-create_lb_rule llb1 20.20.20.1 --tcp=2020:8080 --endpoints=35.1.1.1:1,35.1.2.1:1,35.1.3.1:1,35.1.4.1:1,35.1.5.1:1,35.1.6.1:1,35.1.7.1:1,35.1.8.1:1,35.2.1.1:1,35.2.2.1:1,35.2.3.1:1,35.2.4.1:1,35.2.5.1:1,35.2.6.1:1,35.2.7.1:1,35.2.8.1:1,35.3.1.1:1,35.3.2.1:1,35.3.3.1:1,35.3.4.1:1,35.3.5.1:1,35.3.6.1:1,35.3.7.1:1,35.3.8.1:1,35.4.1.1:1,35.4.2.1:1,35.4.3.1:1,35.4.4.1:1,35.4.5.1:1,35.4.6.1:1,35.4.7.1:1,35.4.8.1:1
+#create_lb_rule llb1 20.20.20.1 --tcp=2020:8080 --endpoints=35.1.1.1:1,35.1.2.1:1,35.1.3.1:1,35.1.4.1:1,35.1.5.1:1,35.1.6.1:1,35.1.7.1:1,35.1.8.1:1,35.2.1.1:1,35.2.2.1:1,35.2.3.1:1,35.2.4.1:1,35.2.5.1:1,35.2.6.1:1,35.2.7.1:1,35.2.8.1:1,35.3.1.1:1,35.3.2.1:1,35.3.3.1:1,35.3.4.1:1,35.3.5.1:1,35.3.6.1:1,35.3.7.1:1,35.3.8.1:1,35.4.1.1:1,35.4.2.1:1,35.4.3.1:1,35.4.4.1:1,35.4.5.1:1,35.4.6.1:1,35.4.7.1:1,35.4.8.1:1
+create_lb_rule llb1 20.20.20.1 --tcp=2020:8080 --endpoints=35.1.1.1:1,35.1.2.1:1,35.1.3.1:1,35.1.4.1:1,35.1.5.1:1,35.1.6.1:1,35.1.7.1:1,35.1.8.1:1,35.2.1.1:1,35.2.2.1:1,35.2.3.1:1,35.2.4.1:1,35.2.5.1:1,35.2.6.1:1,35.2.7.1:1,35.2.8.1:1,35.3.1.1:1,35.3.2.1:1,35.3.3.1:1,35.3.4.1:1,35.3.5.1:1,35.3.6.1:1,35.3.7.1:1,35.3.8.1:1

cicd/tcplbmaxep/validation.sh

@@ -10,19 +10,20 @@ sleep 5
 code=0
 servIP=( "20.20.20.1" )
 servArr=(
-          "server1" "server2" "server3" "server4" 
-          "server1" "server2" "server3" "server4" 
-          "server1" "server2" "server3" "server4" 
-          "server1" "server2" "server3" "server4" 
-          "server1" "server2" "server3" "server4" 
-          "server1" "server2" "server3" "server4" 
-          "server1" "server2" "server3" "server4" 
-          "server1" "server2" "server3" "server4" 
+          "server1" "server2" "server3" 
+          "server1" "server2" "server3"
+          "server1" "server2" "server3"
+          "server1" "server2" "server3"
+          "server1" "server2" "server3"
+          "server1" "server2" "server3"
+          "server1" "server2" "server3"
+          "server1" "server2" "server3"
         )
+#ep=( "31.31.31.1" "32.32.32.1" "33.33.33.1" "34.34.34.1" )
 ep=( "31.31.31.1" "32.32.32.1" "33.33.33.1" "34.34.34.1" )
 j=0
 waitCount=0
-while [ $j -le 3 ]
+while [ $j -le 2 ]
 do
     res=$($hexec l3h1 curl --max-time 10 -s ${ep[j]}:8080)
     #echo $res
@@ -46,7 +47,7 @@ done
 
 echo "Testing Service IP: ${servIP[0]}"
 lcode=0
-for i in {0..31}
+for i in {0..23}
 do
   res=$($hexec l3h1 curl --max-time 10 -s ${servIP[0]}:2020)
   echo $res

cicd/wrrtcplb1/validation.sh

@@ -39,14 +39,14 @@ respArr=( "server1" "server1" "server1"
           "server1" "server1" "server1"
           "server1" "server1" "server1"
           "server1" "server1" "server1"
-          "server1" "server1" "server1"
-          "server1" "server1" "server1"
+          "server1" "server2" "server2"
+          "server2" "server2" "server1"
           "server1" "server2" "server2"
           "server2" "server2" "server2"
           "server2" "server1"
         )
 
-for i in {0..31}
+for i in {0..23}
 do
     res=$($hexec l3h1 curl --max-time 10 -s 20.20.20.1:2020)
     echo $i:$res

cicd/wrrtcplb2/validation.sh

@@ -36,17 +36,16 @@ done
 respArr=( "server1" "server1" "server1"
           "server1" "server1" "server1"
           "server1" "server1" "server1"
-          "server1" "server1" "server1"
-          "server2" "server2" "server2"
           "server2" "server2" "server2"
           "server2" "server2" "server2"
           "server2" "server2" "server2"
           "server3" "server3" "server3"
-          "server3" "server3" "server3"
+          "server3" "server1" "server1"
+          "server1" "server3" "server3"
           "server1" "server1"
         )
 
-for i in {0..31}
+for i in {0..23}
 do
     res=$($hexec l3h1 curl --max-time 10 -s 20.20.20.1:2020)
     echo $i:$res

pkg/loxinet/rules.go

@@ -78,7 +78,7 @@ const (
 
 // constants
 const (
-	MaxLBEndPoints             = 32
+	MaxLBEndPoints             = 24
 	DflLbaInactiveTries        = 2          // Default number of inactive tries before LB arm is turned off
 	MaxDflLbaInactiveTries     = 100        // Max number of inactive tries before LB arm is turned off
 	DflLbaCheckTimeout         = 10         // Default timeout for checking LB arms