[bgp]: Update TSA functionality

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 ["total_portstat.py", "/usr/bin/total_portstat.py"]
 COPY ["files/supervisor-proc-exit-listener", "/usr/bin"]
 COPY ["critical_processes", "/etc/supervisor"]
 RUN chmod a+x /usr/bin/TSA && \

dockers/docker-fpm-frr/TSA

@@ -24,12 +24,17 @@ then
     case "$route_map_name" in
       *V4*)
         ip_version=V4
+        ip_protocol=ip
       ;;
       *V6*)
         ip_version=V6
+        ip_protocol=ipv6
+      ;;
+      *)
+        continue
       ;;
     esac
-    sonic-cfggen -d -a "{\"route_map_name\":\"$route_map_name\", \"ip_version\": \"$ip_version\"}" -y /etc/sonic/constants.yml -t /usr/share/sonic/templates/bgpd/tsa/bgpd.tsa.isolate.conf.j2 > "$TSA_FILE"
+    sonic-cfggen -d -a "{\"route_map_name\":\"$route_map_name\", \"ip_version\": \"$ip_version\", \"ip_protocol\": \"$ip_protocol\"}" -y /etc/sonic/constants.yml -t /usr/share/sonic/templates/bgpd/tsa/bgpd.tsa.isolate.conf.j2 > "$TSA_FILE"
     vtysh -f "$TSA_FILE"
     rm -f "$TSA_FILE"
   done

dockers/docker-fpm-frr/TSB

@@ -24,6 +24,15 @@ then
   TSB_FILE=$(mktemp)
   for route_map_name in $(echo "$config" | sed -ne 's/  neighbor \S* route-map \(\S*\) out/\1/p');
   do
+    case "$route_map_name" in
+      *V4*)
+      ;;
+      *V6*)
+      ;;
+      *)
+        continue
+      ;;
+    esac
     sonic-cfggen -d -a "{\"route_map_name\":\"$route_map_name\"}" -t /usr/share/sonic/templates/bgpd/tsa/bgpd.tsa.unisolate.conf.j2 > "$TSB_FILE"
     vtysh -f "$TSB_FILE"
     rm -f "$TSB_FILE"

dockers/docker-fpm-frr/base_image_files/TSC

@@ -2,4 +2,7 @@
 
 docker exec -i bgp /usr/bin/TSC
 
-portstat -p 5
+TSC_FILE=$(mktemp)
+portstat -p 5 -j > $(TSC_FILE)
+python3 /usr/bin/total_portstat.py $(TSC_FILE)
+rm -f $(TSC_FILE)

dockers/docker-fpm-frr/frr/bgpd/tsa/bgpd.tsa.isolate.conf.j2

@@ -1,5 +1,5 @@
 route-map {{ route_map_name }} permit 2
-  match ip address prefix-list PL_Loopback{{ ip_version }}
+  match {{ ip_protocol }} address prefix-list PL_Loopback{{ ip_version }}
   set community {{ constants.bgp.traffic_shift_community }}
 route-map {{ route_map_name }} deny 3
 !

dockers/docker-fpm-frr/total_portstat.py

@@ -0,0 +1,62 @@
+#!/usr/bin/env python3
+
+from __future__ import print_function
+import json
+import argparse
+
+
+def get_filename():
+    """ Read the name of the file from the command line """
+    parser = argparse.ArgumentParser()
+    parser.add_argument('filename')
+    args = parser.parse_args()
+    return args.filename
+
+def get_json(filename):
+    """ Open the file and parse json from it """
+    js = ''
+    json_started = False
+    with open(filename) as fp:
+        for line in fp:
+            s_line = line.strip()
+            if s_line == '{':
+                json_started = True
+            if json_started:
+                js += s_line
+    data = json.loads(js)
+    return data
+
+def convert_to_raw(value):
+    """
+    Convert from a value from suffix to raw value
+    Example:
+    '1 KB/s' -> 10240.0
+    """
+    conversion = {
+        ' MB/s': 1024*1024*10,
+        ' KB/s': 1024*10,
+        ' B/s' : 1,
+    }
+    for suffix, multiplier in conversion.items():
+        if value.endswith(suffix):
+            no_suffix_value = value.replace(suffix, '')
+            float_value = float(no_suffix_value)
+            return float_value * multiplier
+    raise RuntimeError("Can't convert value '%s'" % value)
+
+def main():
+    """
+    Main function. Read the data and output result
+    """
+    filename = get_filename()
+    data = get_json(filename)
+    rx_bps_total = 0.0
+    tx_bps_total = 0.0
+    for _, obj in data.items():
+        rx_bps_total += convert_to_raw(obj['RX_BPS'])
+        tx_bps_total += convert_to_raw(obj['TX_BPS'])
+    print("Total RX = %d b/s" % int(rx_bps_total))
+    print("Total TX = %d b/s" % int(tx_bps_total))
+
+if __name__ == '__main__':
+    main()

src/sonic-bgpcfgd/tests/data/sonic-cfggen/tsa/isolate.json

@@ -5,5 +5,6 @@
         }
     },
     "route_map_name": "test_rm_name",
-    "ip_version": "V4"
+    "ip_version": "V4",
+    "ip_protocol": "ip"
 }