Merge pull request #10219 from donaldsharp/l3vpn_to_bgp_vrf_fixes

tests: Further fix bgp_l3vpn_to_bgp_vrf
This commit is contained in:
Russ White 2021-12-30 18:42:21 -05:00 committed by GitHub
commit 074ad7cb59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -290,18 +290,98 @@ bgpribRequireVpnRoutes(
# to look at the rest of the routes in the vrf # to look at the rest of the routes in the vrf
luCommand( luCommand(
"r1", "r1",
'vtysh -c "show bgp vrf r1-cust1 ipv4 uni 99.0.0.4/32"', 'vtysh -c "show bgp vrf r1-cust1 ipv4 uni 5.1.0.0/24"',
"1 available, best", "2 available, best",
"wait", "wait",
"Ensure 99.0.0.4 shows up", "Ensure 5.1.0.0 shows up on r1",
10, 10,
) )
luCommand( luCommand(
"r1", "r1",
'vtysh -c "show bgp vrf r1-cust1 ipv4 uni 5.1.0.0/24"', 'vtysh -c "show bgp vrf r1-cust1 ipv4 uni 5.1.1.0/24"',
"2 available, best", "2 available, best",
"wait", "wait",
"Ensure 5.1.0.0 shows up", "Ensure 5.1.1.0 shows up on r1",
10,
)
luCommand(
"r1",
'vtysh -c "show bgp vrf r1-cust1 ipv4 uni 5.1.2.0/24"',
"1 available, best",
"wait",
"Ensure 5.1.2.0 shows up on r1",
10,
)
luCommand(
"r1",
'vtysh -c "show bgp vrf r1-cust1 ipv4 uni 5.1.3.0/24"',
"1 available, best",
"wait",
"Ensure 5.1.3.0 shows up on r1",
10,
)
luCommand(
"r1",
'vtysh -c "show bgp vrf r1-cust1 ipv4 uni 5.4.2.0/24"',
"1 available, best",
"wait",
"Ensure 5.4.2.0 shows up on r1",
10,
)
luCommand(
"r1",
'vtysh -c "show bgp vrf r1-cust1 ipv4 uni 5.4.2.0/24"',
"1 available, best",
"wait",
"Ensure 5.4.3.0 shows up on r1",
10,
)
luCommand(
"r1",
'vtysh -c "show bgp vrf r1-cust1 ipv4 uni 6.0.1.0/24"',
"3 available, best",
"wait",
"Ensure 6.0.1.0 shows up on r1",
10,
)
luCommand(
"r1",
'vtysh -c "show bgp vrf r1-cust1 ipv4 uni 6.0.2.0/24"',
"3 available, best",
"wait",
"Ensure 6.0.2.0 shows up on r1",
10,
)
luCommand(
"r1",
'vtysh -c "show bgp vrf r1-cust1 ipv4 uni 99.0.0.1/32"',
"1 available, best",
"wait",
"Ensure 99.0.0.1 shows up on r1",
10,
)
luCommand(
"r1",
'vtysh -c "show bgp vrf r1-cust1 ipv4 uni 99.0.0.2/32"',
"1 available, best",
"wait",
"Ensure 99.0.0.2 shows up on r1",
10,
)
luCommand(
"r1",
'vtysh -c "show bgp vrf r1-cust1 ipv4 uni 99.0.0.3/32"',
"1 available, best",
"wait",
"Ensure 99.0.0.3 shows up on r1",
10,
)
luCommand(
"r1",
'vtysh -c "show bgp vrf r1-cust1 ipv4 uni 99.0.0.4/32"',
"1 available, best",
"wait",
"Ensure 99.0.0.4 shows up on r1",
10, 10,
) )
want_r1_remote_cust1_routes = [ want_r1_remote_cust1_routes = [
@ -332,20 +412,102 @@ bgpribRequireUnicastRoutes(
want_r1_remote_cust1_routes, want_r1_remote_cust1_routes,
debug=False, debug=False,
) )
luCommand(
"r3",
'vtysh -c "show bgp vrf r3-cust1 ipv4 uni 99.0.0.4/32"',
"1 available, best",
"wait",
"Ensure 99.0.0.4 shows up",
10,
)
luCommand( luCommand(
"r3", "r3",
'vtysh -c "show bgp vrf r3-cust1 ipv4 uni 5.1.0.0/24"', 'vtysh -c "show bgp vrf r3-cust1 ipv4 uni 5.1.0.0/24"',
"2 available, best", "2 available, best",
"wait", "wait",
"Ensure 5.1.0.0 shows up", "Ensure 5.1.0.0 shows up r3",
10,
)
luCommand(
"r3",
'vtysh -c "show bgp vrf r3-cust1 ipv4 uni 5.1.1.0/24"',
"2 available, best",
"wait",
"Ensure 5.1.1.0 shows up on r3",
10,
)
luCommand(
"r3",
'vtysh -c "show bgp vrf r3-cust1 ipv4 uni 5.1.2.0/24"',
"1 available, best",
"wait",
"Ensure 5.1.2.0 shows up on r3",
10,
)
luCommand(
"r3",
'vtysh -c "show bgp vrf r3-cust1 ipv4 uni 5.1.3.0/24"',
"1 available, best",
"wait",
"Ensure 5.1.3.0 shows up on r3",
10,
)
luCommand(
"r3",
'vtysh -c "show bgp vrf r3-cust1 ipv4 uni 5.4.3.0/24"',
"1 available, best",
"wait",
"Ensure 5.4.3.0 shows up on r3",
10,
)
luCommand(
"r3",
'vtysh -c "show bgp vrf r3-cust1 ipv4 uni 5.4.3.0/24"',
"1 available, best",
"wait",
"Ensure 5.4.3.0 shows up on r3",
10,
)
luCommand(
"r3",
'vtysh -c "show bgp vrf r3-cust1 ipv4 uni 5.4.3.0/24"',
"1 available, best",
"wait",
"Ensure 5.4.3.0 shows up on r3",
10,
)
luCommand(
"r3",
'vtysh -c "show bgp vrf r3-cust1 ipv4 uni 6.0.1.0/24"',
"3 available, best",
"wait",
"Ensure 6.0.1.0 shows up on r3",
10,
)
luCommand(
"r3",
'vtysh -c "show bgp vrf r3-cust1 ipv4 uni 6.0.2.0/24"',
"3 available, best",
"wait",
"Ensure 6.0.2.0 shows up on r3",
10,
)
luCommand(
"r3",
'vtysh -c "show bgp vrf r3-cust1 ipv4 uni 99.0.0.1/32"',
"1 available, best",
"wait",
"Ensure 99.0.0.1 shows up on r3",
10,
)
luCommand(
"r3",
'vtysh -c "show bgp vrf r3-cust1 ipv4 uni 99.0.0.3/32"',
"1 available, best",
"wait",
"Ensure 99.0.0.3 shows up on r3",
10,
)
luCommand(
"r3",
'vtysh -c "show bgp vrf r3-cust1 ipv4 uni 99.0.0.4/32"',
"1 available, best",
"wait",
"Ensure 99.0.0.4 shows up on r3",
10, 10,
) )
want_r3_remote_cust1_routes = [ want_r3_remote_cust1_routes = [
@ -378,18 +540,42 @@ bgpribRequireUnicastRoutes(
luCommand( luCommand(
"r4", "r4",
'vtysh -c "show bgp vrf r4-cust1 ipv4 uni 99.0.0.4/32"', 'vtysh -c "show bgp vrf r4-cust1 ipv4 uni 5.1.0.0/24"',
"1 available, best", "2 available, best",
"wait", "wait",
"Ensure 99.0.0.4 shows up", "Ensure 5.1.0.0 shows up on r4",
10, 10,
) )
luCommand( luCommand(
"r4", "r4",
'vtysh -c "show bgp vrf r4-cust1 ipv4 uni 5.1.0.0/24"', 'vtysh -c "show bgp vrf r4-cust1 ipv4 uni 5.1.1.0/24"',
"2 available, best", "2 available, best",
"wait", "wait",
"Ensure 5.1.0.0 shows up", "Ensure 5.1.1.0 shows up on r4",
10,
)
luCommand(
"r4",
'vtysh -c "show bgp vrf r4-cust1 ipv4 uni 6.0.1.0/24"',
"4 available, best",
"wait",
"Ensure 6.0.1.0 shows up on r4",
10,
)
luCommand(
"r4",
'vtysh -c "show bgp vrf r4-cust1 ipv4 uni 6.0.2.0/24"',
"4 available, best",
"wait",
"Ensure 6.0.2.0 shows up on r4",
10,
)
luCommand(
"r4",
'vtysh -c "show bgp vrf r4-cust1 ipv4 uni 99.0.0.1/32"',
"1 available, best",
"wait",
"Ensure 99.0.0.1 shows up on r4",
10, 10,
) )
luCommand( luCommand(
@ -397,7 +583,23 @@ luCommand(
'vtysh -c "show bgp vrf r4-cust1 ipv4 uni 99.0.0.2/32"', 'vtysh -c "show bgp vrf r4-cust1 ipv4 uni 99.0.0.2/32"',
"1 available, best", "1 available, best",
"wait", "wait",
"Ensure 99.0.0.2 shows up", "Ensure 99.0.0.2 shows up on r4",
10,
)
luCommand(
"r4",
'vtysh -c "show bgp vrf r4-cust1 ipv4 uni 99.0.0.3/32"',
"1 available, best",
"wait",
"Ensure 99.0.0.3 shows up on r4",
10,
)
luCommand(
"r4",
'vtysh -c "show bgp vrf r4-cust1 ipv4 uni 99.0.0.4/32"',
"1 available, best",
"wait",
"Ensure 99.0.0.4 shows up on r4",
10, 10,
) )
want_r4_remote_cust1_routes = [ want_r4_remote_cust1_routes = [