From 5a8cebc863039dbc0f3c456b4203ad3e65e9aa93 Mon Sep 17 00:00:00 2001
From: Zhaohui Sun <94606222+ZhaohuiS@users.noreply.github.com>
Date: Thu, 25 Jan 2024 12:21:03 +0800
Subject: [PATCH] Revert "Revert "Updating test_techsupport_commands to align
 with updated list of frr commands""

---
 tests/show_techsupport/tech_support_cmds.py | 63 ++++++++++++++++++++-
 tests/show_techsupport/test_techsupport.py  |  1 +
 2 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/tests/show_techsupport/tech_support_cmds.py b/tests/show_techsupport/tech_support_cmds.py
index 4fae1644d23..e93a41a2d05 100644
--- a/tests/show_techsupport/tech_support_cmds.py
+++ b/tests/show_techsupport/tech_support_cmds.py
@@ -63,12 +63,31 @@
 
 frr_cmds = [
     "vtysh{} -c 'show running-config'",
-    "vtysh{} -c 'show ip route vrf all'",
-    "vtysh{} -c 'show ipv6 route vrf all'",
+    "vtysh{} -c 'show ip route vrf all nexthop-group'",
+    "vtysh{} -c 'show ipv6 route vrf all nexthop-group'",
     "vtysh{} -c 'show zebra fpm stats'",
     "vtysh{} -c 'show zebra dplane detailed'",
     "vtysh{} -c 'show interface vrf all'",
+    "vtysh{} -c 'show zebra'",
+    "vtysh{} -c 'show zebra client'",
     "vtysh{} -c 'show zebra client summary'",
+    "vtysh{} -c 'show zebra router table summary'",
+    "vtysh{} -c 'show vrf'",
+    "vtysh{} -c 'show vrf vni'",
+    "vtysh{} -c 'show ip nht vrf all'",
+    "vtysh{} -c 'show ipv6 nht vrf all'",
+    "vtysh{} -c 'show mpls table'",
+    "vtysh{} -c 'show mpls fec'",
+    "vtysh{} -c 'show nexthop-group rib'",
+    "vtysh{} -c 'show thread cpu'",
+    "vtysh{} -c 'show thread poll'",
+    "vtysh{} -c 'show debugging hashtable'",
+    "vtysh{} -c 'show work-queues'",
+    "vtysh{} -c 'show memory'",
+    "vtysh{} -c 'show modules'",
+    "vtysh{} -c 'show version'",
+    "vtysh{} -c 'show debugging'",
+    "vtysh{} -c 'show logging'",
 ]
 
 
@@ -79,12 +98,52 @@
     "vtysh{} -c 'show bgp ipv6 summary'",
     "vtysh{} -c 'show bgp ipv6 neighbors'",
     "vtysh{} -c 'show bgp ipv6'",
+    "vtysh{} -c 'show ip bgp vrf all'",
+    "vtysh{} -c 'show ip bgp vrf all summary json'",
+    "vtysh{} -c 'show ip bgp vrf all neighbors json'",
+    "vtysh{} -c 'show ip bgp vrf all nexthop'",
+    "vtysh{} -c 'show ip bgp vrf all update-group'",
+    "vtysh{} -c 'show bgp vrfs json'",
+    "vtysh{} -c 'show bgp vrf all ipv4 unicast summary json'",
+    "vtysh{} -c 'show bgp vrf all ipv6 unicast summary json'",
+    "vtysh{} -c 'show bgp vrf all ipv4 unicast detail json'",
+    "vtysh{} -c 'show bgp vrf all ipv6 unicast detail json'",
+    "vtysh{} -c 'show bgp vrf all ipv4 unicast update-group'",
+    "vtysh{} -c 'show bgp vrf all ipv6 unicast update-group'",
+    "vtysh{} -c 'show bgp vrf all ipv4 unicast route-leak json'",
+    "vtysh{} -c 'show bgp vrf all ipv6 unicast route-leak json'",
+    "vtysh{} -c 'show bgp ipv4 labeled-unicast'",
+    "vtysh{} -c 'show bgp ipv6 labeled-unicast'",
+    "vtysh{} -c 'show bgp mac hash'",
     re.compile(r'vtysh{}\s+-c "show ip bgp neighbors .* advertised-routes"'),
     re.compile(r'vtysh{}\s+-c "show ip bgp neighbors .* routes"'),
     re.compile(r'vtysh{}\s+-c "show bgp ipv6 neighbors .* advertised-routes"'),
     re.compile(r'vtysh{}\s+-c "show bgp ipv6 neighbors .* routes"'),
 ]
 
+evpn_cmds = [
+    "vtysh{} -c 'show bgp l2vpn evpn'",
+    "vtysh{} -c 'show bgp l2vpn evpn summary json'",
+    "vtysh{} -c 'show bgp l2vpn evpn route'",
+    "vtysh{} -c 'show bgp l2vpn evpn route detail'",
+    "vtysh{} -c 'show bgp l2vpn evpn vni json'",
+    "vtysh{} -c 'show bgp l2vpn evpn import-rt json'",
+    "vtysh{} -c 'show bgp l2vpn evpn vrf-import-rt json'",
+    "vtysh{} -c 'show bgp l2vpn evpn update-groups'",
+    "vtysh{} -c 'show bgp l2vpn evpn next-hops json'",
+    "vtysh{} -c 'show bgp vni all'",
+    "vtysh{} -c 'show bgp vni all detail'",
+    "vtysh{} -c 'show evpn vni detail json'",
+    "vtysh{} -c 'show evpn access-vlan json'",
+    "vtysh{} -c 'show evpn arp-cache vni all'",
+    "vtysh{} -c 'show evpn json'",
+    "vtysh{} -c 'show evpn l2-nh json'",
+    "vtysh{} -c 'show evpn mac vni all'",
+    "vtysh{} -c 'show evpn arp-cache vni all'",
+    "vtysh{} -c 'show evpn rmac vni all json'",
+    "vtysh{} -c 'show evpn next-hops vni all json'",
+]
+
 nat_cmds = [
     "iptables -t nat -nv -L",
     "conntrack -j -L",
diff --git a/tests/show_techsupport/test_techsupport.py b/tests/show_techsupport/test_techsupport.py
index 5fb39118ce0..415dd0d692e 100644
--- a/tests/show_techsupport/test_techsupport.py
+++ b/tests/show_techsupport/test_techsupport.py
@@ -394,6 +394,7 @@ def commands_to_check(duthosts, enum_rand_one_per_hwsku_frontend_hostname):
         "bridge_cmds": cmds.bridge_cmds,
         "frr_cmds": add_asic_arg(" -n {}", cmds.frr_cmds, num),
         "bgp_cmds": add_asic_arg(" -n {}", cmds.bgp_cmds, num),
+        "evpn_cmds": add_asic_arg(" -n {}", cmds.evpn_cmds, num),
         "nat_cmds": cmds.nat_cmds,
         "bfd_cmds": add_asic_arg(" -n {}", cmds.bfd_cmds, num),
         "redis_db_cmds": add_asic_arg("asic{} ", cmds.redis_db_cmds, num),