Merge pull request #13916 from pguibert6WIND/vpnv4_asbr_test_complement

topotests: bgp_vpnv4_asbr, wait that mpls entry is installed

1 files changed, 31 insertions, 6 deletions

diff --git a/tests/topotests/bgp_vpnv4_asbr/test_bgp_vpnv4_asbr.py b/tests/topotests/bgp_vpnv4_asbr/test_bgp_vpnv4_asbr.py
index c47822614..c0e57930a 100644
--- a/tests/topotests/bgp_vpnv4_asbr/test_bgp_vpnv4_asbr.py
+++ b/tests/topotests/bgp_vpnv4_asbr/test_bgp_vpnv4_asbr.py
@@ -205,6 +205,28 @@ def bgp_vpnv4_prefix_check(router, rd, prefix, label, nexthop):
     logger.info(assert_msg + " found")
 
 
+def mpls_table_get_entry(router, out_label, out_nexthop):
+    """
+    Get the in_label from tuple (out_label, out_nexthop)
+    * 'router': the router to check
+    * 'out_label': The outgoing label expected
+    * 'out_nexthop': The outgoing nexthop expected
+    """
+    dump = router.vtysh_cmd("show mpls table json", isjson=True)
+    for in_label, label_info in dump.items():
+        for nh in label_info["nexthops"]:
+            if nh["type"] != "BGP" or "installed" not in nh.keys():
+                continue
+            if "nexthop" in nh.keys():
+                if nh["nexthop"] != out_nexthop:
+                    continue
+            if "outLabelStack" in nh.keys():
+                if out_label not in nh["outLabelStack"]:
+                    continue
+            return in_label
+    return None
+
+
 def mpls_table_check_entry(router, out_label, out_nexthop):
     """
     Dump and check 'show mpls table json' output. An assert is triggered in case test fails
@@ -229,13 +251,10 @@ def mpls_table_check_entry(router, out_label, out_nexthop):
                     router.name, in_label, nh["outLabelStack"], nh["nexthop"]
                 )
             )
-            return in_label
-    assert (
-        0
-    ), "{}, show mpls table, entry matching in_label {} out_label {} out_nexthop {} not found".format(
+            return None
+    return "{}, show mpls table, entry matching in_label {} out_label {} out_nexthop {} not found".format(
         router.name, in_label, out_label, out_nexthop
     )
-    return None
 
 
 def check_ping(name, dest_addr, expect_connected):
@@ -390,7 +409,13 @@ def check_show_bgp_vpn_ok(router, vpnv4_entries):
                 router.name, prefix, l3vpn_label, l3vpn_nh
             )
         )
-        in_label = mpls_table_check_entry(router, l3vpn_label, vpnv4_nht[l3vpn_nh])
+        test_func = functools.partial(
+            mpls_table_check_entry, router, l3vpn_label, vpnv4_nht[l3vpn_nh]
+        )
+        success, result = topotest.run_and_expect(test_func, None, count=10, wait=0.5)
+        assert success, result
+
+        in_label = mpls_table_get_entry(router, l3vpn_label, vpnv4_nht[l3vpn_nh])
         label_ip_entries[prefix] = in_label
 
         bgp_vpnv4_prefix_check(