[docker-fpm-frr]: TSA/B/C changes for multi-asic (#6510)

- Introduced TS common file in docker as well and moved common functions. - TSA/B/C scripts run only in BGP instances for front end ASICs. In addition skip enforcing it on route maps used between internal BGP sessions. admin@str--acs-1:~$ sudo /usr/bin/TSA System Mode: Normal -> Maintenance and in case of Multi-ASIC admin@str--acs-1:~$ sudo /usr/bin/TSA BGP0 : System Mode: Normal -> Maintenance BGP1 : System Mode: Normal -> Maintenance BGP2 : System Mode: Normal -> Maintenance
sonic-net · May 3, 2021 · 7ae4a99 · 7ae4a99
1 parent 0e97058
commit 7ae4a99
Show file tree

Hide file tree

Showing 10 changed files with 82 additions and 66 deletions.
diff --git a/dockers/docker-fpm-frr/Dockerfile.j2 b/dockers/docker-fpm-frr/Dockerfile.j2
@@ -53,6 +53,7 @@ COPY ["snmp.conf", "/etc/snmp/frr.conf"]
 COPY ["TSA", "/usr/bin/TSA"]
 COPY ["TSB", "/usr/bin/TSB"]
 COPY ["TSC", "/usr/bin/TSC"]
+COPY ["TS", "/usr/bin/TS"]
 COPY ["files/supervisor-proc-exit-listener", "/usr/bin"]
 COPY ["zsocket.sh", "/usr/bin/"]
 RUN chmod a+x /usr/bin/TSA && \

diff --git a/dockers/docker-fpm-frr/TS b/dockers/docker-fpm-frr/TS
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+# Check whether the routemap is for internal BGP sessions.
+function is_internal_route_map()
+{
+    [[ "$1" =~ .*"_INTERNAL_".* ]]
+}
+
+function check_not_installed()
+{
+  c=0
+  config=$(vtysh -c "show run")
+  for route_map_name in $(echo "$config" | sed -ne 's/  neighbor \S* route-map \(\S*\) out/\1/p' | egrep 'V4|V6');
+  do
+    is_internal_route_map $route_map_name && continue
+    echo "$config" | egrep -q "^route-map $route_map_name permit 20$"
+    c=$((c+$?))
+    echo "$config" | egrep -q "^route-map $route_map_name deny 30$"
+    c=$((c+$?))
+  done
+  return $c
+}
+
+function check_installed()
+{
+  c=0
+  e=0
+  config=$(vtysh -c "show run")
+  for route_map_name in $(echo "$config" | sed -ne 's/  neighbor \S* route-map \(\S*\) out/\1/p' | egrep 'V4|V6');
+  do
+    is_internal_route_map $route_map_name && continue
+    echo "$config" | egrep -q "^route-map $route_map_name permit 20$"
+    c=$((c+$?))
+    e=$((e+1))
+    echo "$config" | egrep -q "^route-map $route_map_name deny 30$"
+    c=$((c+$?))
+    e=$((e+1))
+  done
+  return $((e-c))
+}
diff --git a/dockers/docker-fpm-frr/TSA b/dockers/docker-fpm-frr/TSA
@@ -1,18 +1,7 @@
 #!/bin/bash
 
-function check_not_installed()
-{
-  c=0
-  config=$(vtysh -c "show run")
-  for route_map_name in $(echo "$config" | sed -ne 's/  neighbor \S* route-map \(\S*\) out/\1/p');
-  do
-    echo "$config" | egrep -q "^route-map $route_map_name permit 20$"
-    c=$((c+$?))
-    echo "$config" | egrep -q "^route-map $route_map_name deny 30$"
-    c=$((c+$?))
-  done
-  return $c
-}
+# Load the common functions
+source /usr/bin/TS
 
 check_not_installed
 not_installed=$?
@@ -21,6 +10,7 @@ then
   TSA_FILE=$(mktemp)
   for route_map_name in $(echo "$config" | sed -ne 's/  neighbor \S* route-map \(\S*\) out/\1/p');
   do
+    is_internal_route_map $route_map_name && continue
     case "$route_map_name" in
       *V4*)
         ip_version=V4

diff --git a/dockers/docker-fpm-frr/TSB b/dockers/docker-fpm-frr/TSB
@@ -1,21 +1,7 @@
 #!/bin/bash
 
-function check_installed()
-{
-  c=0
-  e=0
-  config=$(vtysh -c "show run")
-  for route_map_name in $(echo "$config" | sed -ne 's/  neighbor \S* route-map \(\S*\) out/\1/p');
-  do
-    echo "$config" | egrep -q "^route-map $route_map_name permit 20$"
-    c=$((c+$?))
-    e=$((e+1))
-    echo "$config" | egrep -q "^route-map $route_map_name deny 30$"
-    c=$((c+$?))
-    e=$((e+1))
-  done
-  return $((e-c))
-}
+# Load the common functions
+source /usr/bin/TS
 
 check_installed
 installed=$?
@@ -24,6 +10,7 @@ then
   TSB_FILE=$(mktemp)
   for route_map_name in $(echo "$config" | sed -ne 's/  neighbor \S* route-map \(\S*\) out/\1/p');
   do
+    is_internal_route_map $route_map_name && continue
     case "$route_map_name" in
       *V4*)
       ;;

diff --git a/dockers/docker-fpm-frr/TSC b/dockers/docker-fpm-frr/TSC
@@ -1,37 +1,7 @@
 #!/bin/bash
 
-function check_not_installed()
-{
-  c=0
-  config=$(vtysh -c "show run")
-  for route_map_name in $(echo "$config" | sed -ne 's/  neighbor \S* route-map \(\S*\) out/\1/p' | egrep 'V4|V6');
-  do
-    echo "$config" | egrep -q "^route-map $route_map_name permit 20$"
-    c=$((c+$?))
-    echo "$config" | egrep -q "^route-map $route_map_name deny 30$"
-    c=$((c+$?))
-  done
-  return $c
-}
-
-function check_installed()
-{
-  c=0
-  e=0
-  config=$(vtysh -c "show run")
-  for route_map_name in $(echo "$config" | sed -ne 's/  neighbor \S* route-map \(\S*\) out/\1/p' | egrep 'V4|V6');
-  do
-    echo "$config" | egrep -q "^route-map $route_map_name permit 20$"
-    c=$((c+$?))
-    e=$((e+1))
-    echo "$config" | egrep -q "^route-map $route_map_name deny 30$"
-    c=$((c+$?))
-    e=$((e+1))
-  done
-  return $((e-c))
-}
-
-echo "Traffic Shift Check:"
+# Load the common functions
+source /usr/bin/TS
 
 check_not_installed
 not_installed=$?
@@ -48,5 +18,3 @@ then
 else
   echo "System Mode: Not consistent"
 fi
-
-echo
diff --git a/dockers/docker-fpm-frr/base_image_files/TS b/dockers/docker-fpm-frr/base_image_files/TS
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+# read SONiC immutable variables
+[ -f /etc/sonic/sonic-environment ] && . /etc/sonic/sonic-environment
+
+PLATFORM=${PLATFORM:-`sonic-cfggen -H -v DEVICE_METADATA.localhost.platform`}
+
+# Parse the device specific asic conf file, if it exists
+ASIC_CONF=/usr/share/sonic/device/$PLATFORM/asic.conf
+[ -f $ASIC_CONF ] && . $ASIC_CONF
+
+if [[ ($NUM_ASIC -gt 1) ]]; then
+    asic=0
+    NAMESPACE_PREFIX='asic'
+
+    while [ $asic -lt $NUM_ASIC ]
+    do
+        # Run TSA/TSB/TSC scripts in BGP instance for frontend ASICs.
+        sub_role=`sonic-cfggen -d -v "DEVICE_METADATA['localhost']['sub_role']" -n $NAMESPACE_PREFIX$asic`
+        if [ $sub_role == 'FrontEnd' ]
+        then
+            echo -e "BGP"$asic" : \c"
+            docker exec -i bgp$asic /usr/bin/$1
+        fi
+        asic=$[$asic+1]
+    done
+else
+    docker exec -i bgp /usr/bin/$1
+fi
diff --git a/dockers/docker-fpm-frr/base_image_files/TSA b/dockers/docker-fpm-frr/base_image_files/TSA
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker exec -i bgp /usr/bin/TSA
+/usr/bin/TS TSA
diff --git a/dockers/docker-fpm-frr/base_image_files/TSB b/dockers/docker-fpm-frr/base_image_files/TSB
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker exec -i bgp /usr/bin/TSB
+/usr/bin/TS TSB
diff --git a/dockers/docker-fpm-frr/base_image_files/TSC b/dockers/docker-fpm-frr/base_image_files/TSC
@@ -1,5 +1,5 @@
 #!/bin/bash
 
-docker exec -i bgp /usr/bin/TSC
+/usr/bin/TS TSC
 
 portstat -p 5
diff --git a/rules/docker-fpm-frr.mk b/rules/docker-fpm-frr.mk
@@ -31,4 +31,5 @@ $(DOCKER_FPM_FRR)_BASE_IMAGE_FILES += rvtysh:/usr/bin/rvtysh
 $(DOCKER_FPM_FRR)_BASE_IMAGE_FILES += TSA:/usr/bin/TSA
 $(DOCKER_FPM_FRR)_BASE_IMAGE_FILES += TSB:/usr/bin/TSB
 $(DOCKER_FPM_FRR)_BASE_IMAGE_FILES += TSC:/usr/bin/TSC
+$(DOCKER_FPM_FRR)_BASE_IMAGE_FILES += TS:/usr/bin/TS
 $(DOCKER_FPM_FRR)_BASE_IMAGE_FILES += monit_bgp:/etc/monit/conf.d