Merge pull request #15351 from louis-6wind/fix-leak-vrf-interface

bgpd: update route leak after vrf interface changes

1 files changed, 8 insertions, 4 deletions

diff --git a/tests/topotests/lib/checkping.py b/tests/topotests/lib/checkping.py
index aaa6164dd4..5500807fab 100644
--- a/tests/topotests/lib/checkping.py
+++ b/tests/topotests/lib/checkping.py
@@ -8,7 +8,7 @@ from lib.topolog import logger
 from lib import topotest
 
 
-def check_ping(name, dest_addr, expect_connected, count, wait):
+def check_ping(name, dest_addr, expect_connected, count, wait, source_addr=None):
     """
     Assert that ping to dest_addr is expected
     * 'name': the router to set the ping from
@@ -18,9 +18,13 @@ def check_ping(name, dest_addr, expect_connected, count, wait):
     * 'wait': how long ping should wait to receive all replies
     """
 
-    def _check(name, dest_addr, match):
+    def _check(name, dest_addr, source_addr, match):
         tgen = get_topogen()
-        output = tgen.gears[name].run("ping {} -c 1 -w 1".format(dest_addr))
+        cmd = "ping {}".format(dest_addr)
+        if source_addr:
+            cmd += " -I {}".format(source_addr)
+        cmd += " -c 1 -w 1"
+        output = tgen.gears[name].run(cmd)
         logger.info(output)
         if match not in output:
             return "ping fail"
@@ -28,6 +32,6 @@ def check_ping(name, dest_addr, expect_connected, count, wait):
     match = ", {} packet loss".format("0%" if expect_connected else "100%")
     logger.info("[+] check {} {} {}".format(name, dest_addr, match))
     tgen = get_topogen()
-    func = functools.partial(_check, name, dest_addr, match)
+    func = functools.partial(_check, name, dest_addr, source_addr, match)
     success, result = topotest.run_and_expect(func, None, count=count, wait=wait)
     assert result is None, "Failed"