bgp_l3vpn_to_bgp_vrf: use FRR PR #2053

Check CE routes from CE in another VRF attached to same PE router. Relies
on FRR bug fix to not require labeled nexthop for paths that go only
through PE router and not mpls core.

Signed-off-by: G. Paul Ziemba <paulz@labn.net>

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/check_routes.py b/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/check_routes.py
index 57f352f449b3a31e31316f7d9344b04d327b1bd2..0ff6bf6a22ba56d3b395dc8f26a436b2bf0ef2f3 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/check_routes.py
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/check_routes.py
@@ -288,20 +288,28 @@ want = [
 ]
 bgpribRequireUnicastRoutes('ce2','ipv4','','Cust 1 routes from remote',want)
 
-# Requires bvl-bug-degenerate-no-label fix
-# want = [
-#     {'p':'5.1.0.0/24', 'n':'192.168.1.1'},
-#     {'p':'5.1.1.0/24', 'n':'192.168.1.1'},
-#     {'p':'5.4.2.0/24', 'n':'192.168.1.1'},
-#     {'p':'5.4.3.0/24', 'n':'192.168.1.1'},
-# ]
-# bgpribRequireUnicastRoutes('ce3','ipv4','','Cust 1 routes from remote',want)
-# 
-# want = [
-#     {'p':'5.1.0.0/24', 'n':'192.168.2.1'},
-#     {'p':'5.1.1.0/24', 'n':'192.168.2.1'},
-#     {'p':'5.1.2.0/24', 'n':'192.168.2.1'},
-#     {'p':'5.1.3.0/24', 'n':'192.168.2.1'},
-# ]
-# bgpribRequireUnicastRoutes('ce4','ipv4','','Cust 2 routes from remote',want)
+# human readable output for debugging
+luCommand('r4','vtysh -c "show bgp vrf r4-cust1 ipv4 uni"')
+luCommand('r4','vtysh -c "show bgp vrf r4-cust2 ipv4 uni"')
+luCommand('r4','vtysh -c "show bgp ipv4 vpn"')
+luCommand('r4','vtysh -c "show ip route vrf r4-cust1"')
+luCommand('r4','vtysh -c "show ip route vrf r4-cust2"')
+
+
+# Requires bvl-bug-degenerate-no-label fix (FRR PR #2053)
+want = [
+    {'p':'5.1.0.0/24', 'n':'192.168.1.1'},
+    {'p':'5.1.1.0/24', 'n':'192.168.1.1'},
+    {'p':'5.4.2.0/24', 'n':'192.168.1.1'},
+    {'p':'5.4.3.0/24', 'n':'192.168.1.1'},
+]
+bgpribRequireUnicastRoutes('ce3','ipv4','','Cust 1 routes from remote',want)
+
+want = [
+    {'p':'5.1.0.0/24', 'n':'192.168.2.1'},
+    {'p':'5.1.1.0/24', 'n':'192.168.2.1'},
+    {'p':'5.1.2.0/24', 'n':'192.168.2.1'},
+    {'p':'5.1.3.0/24', 'n':'192.168.2.1'},
+]
+bgpribRequireUnicastRoutes('ce4','ipv4','','Cust 2 routes from remote',want)