tests: Rename `show thread ...` to `show event ...`

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/scale_up.py b/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/scale_up.py
index 46993c7d9a4658be8d13caa2c842121a186b63b4..e05bf21ea965fcdf8373b7b77f3f3cb2396d4d78 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/scale_up.py
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/scale_up.py
@@ -226,7 +226,7 @@ else:
             ave_b = float(delta_b) / float(num)
             luCommand(
                 rtr,
-                'vtysh -c "show thread cpu"',
+                'vtysh -c "show event cpu"',
                 ".",
                 "pass",
                 "BGPd heap: {0} {1} --> {2} {3} ({4} {1}/vpn route)".format(
@@ -239,7 +239,7 @@ else:
             )
             luCommand(
                 rtr,
-                'vtysh -c "show thread cpu"',
+                'vtysh -c "show event cpu"',
                 ".",
                 "pass",
                 "Zebra heap: {0} {1} --> {2} {3} ({4} {1}/vpn route)".format(

diff --git a/tests/topotests/isis_topo1/test_isis_topo1.py b/tests/topotests/isis_topo1/test_isis_topo1.py
index 48e9d5336fdf3095be86d6dc1d7dbffc6bcc6020..532e70859c34cfec2abe7ccb77feee94d5676c2a 100644 (file)
--- a/tests/topotests/isis_topo1/test_isis_topo1.py
+++ b/tests/topotests/isis_topo1/test_isis_topo1.py
@@ -708,9 +708,9 @@ def _check_overload_timer(router, timer_expected):
 
     tgen = get_topogen()
     router = tgen.gears[router]
-    thread_output = router.vtysh_cmd("show thread timers")
+    output = router.vtysh_cmd("show event timers")
 
-    timer_running = "set_overload_on_start_timer" in thread_output
+    timer_running = "set_overload_on_start_timer" in output
     if timer_running == timer_expected:
         return True
     return "Expected timer running status: {}".format(timer_expected)