From c0ace6d8e137922f15acbd69c74680da57c01848 Mon Sep 17 00:00:00 2001 From: Lou Berger Date: Sun, 21 Jan 2018 08:55:40 -0500 Subject: [PATCH] bgp_l3vpn_to_bgp_vrf: in progress version Adjacenies up, MPLS configured on interfaces -- right now provides testbed for code changes Signed-off-by: Lou Berger --- .../bgp_l3vpn_to_bgp_vrf/ce1/bgpd.conf | 4 +-- .../bgp_l3vpn_to_bgp_vrf/ce2/bgpd.conf | 4 +-- .../bgp_l3vpn_to_bgp_vrf/ce3/bgpd.conf | 4 +-- .../bgp_l3vpn_to_bgp_vrf/customize.py | 14 +++++---- .../bgp_l3vpn_to_bgp_vrf/r1/bgpd.conf | 29 ++++++++++-------- .../bgp_l3vpn_to_bgp_vrf/r1/ldpd.conf | 1 + .../bgp_l3vpn_to_bgp_vrf/r1/zebra.conf | 1 + .../bgp_l3vpn_to_bgp_vrf/r2/ldpd.conf | 1 + .../bgp_l3vpn_to_bgp_vrf/r2/zebra.conf | 1 + .../bgp_l3vpn_to_bgp_vrf/r3/bgpd.conf | 30 +++++++++++-------- .../bgp_l3vpn_to_bgp_vrf/r3/ldpd.conf | 1 + .../bgp_l3vpn_to_bgp_vrf/r3/zebra.conf | 1 + .../bgp_l3vpn_to_bgp_vrf/r4/bgpd.conf | 30 ++++++++++--------- .../bgp_l3vpn_to_bgp_vrf/r4/ldpd.conf | 1 + .../bgp_l3vpn_to_bgp_vrf/r4/zebra.conf | 1 + .../scripts/add_routes.py | 12 ++------ .../scripts/check_routes.py | 7 +++-- .../scripts/cleanup_all.py | 12 ++++---- .../test_bgp_l3vpn_to_bgp_vrf.py | 4 +-- 19 files changed, 89 insertions(+), 69 deletions(-) diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce1/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce1/bgpd.conf index bd10248d7b..5acc110311 100644 --- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce1/bgpd.conf +++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce1/bgpd.conf @@ -5,9 +5,9 @@ password zebra log stdout notifications log monitor notifications log commands -router bgp 5226 +router bgp 5227 bgp router-id 99.0.0.1 - neighbor 192.168.1.1 remote-as 5226 + neighbor 192.168.1.1 remote-as 5227 neighbor 192.168.1.1 update-source 192.168.1.2 address-family ipv4 unicast network 5.1.0.0/24 route-map rm-nh diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce2/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce2/bgpd.conf index ab86c5e1b8..9f3aad733b 100644 --- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce2/bgpd.conf +++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce2/bgpd.conf @@ -5,9 +5,9 @@ password zebra log stdout notifications log monitor notifications log commands -router bgp 5226 +router bgp 5227 bgp router-id 99.0.0.2 - neighbor 192.168.1.1 remote-as 5226 + neighbor 192.168.1.1 remote-as 5227 neighbor 192.168.1.1 update-source 192.168.1.2 address-family ipv4 unicast network 5.1.0.0/24 route-map rm-nh diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce3/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce3/bgpd.conf index 7d239b0bd5..219a93cfc9 100644 --- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce3/bgpd.conf +++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce3/bgpd.conf @@ -5,9 +5,9 @@ password zebra log stdout notifications log monitor notifications log commands -router bgp 5226 +router bgp 5227 bgp router-id 99.0.0.3 - neighbor 192.168.1.1 remote-as 5226 + neighbor 192.168.1.1 remote-as 5227 neighbor 192.168.1.1 update-source 192.168.1.2 address-family ipv4 unicast network 5.1.2.0/24 route-map rm-nh diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/customize.py b/tests/topotests/bgp_l3vpn_to_bgp_vrf/customize.py index 0d5bc0c24f..7639d9824d 100644 --- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/customize.py +++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/customize.py @@ -133,26 +133,30 @@ def doCmd(tgen, rtr, cmd): if len(output): logger.info('command output: ' + output) -def autogenPreRouterStartHook(): +def ltemplatePreRouterStartHook(): tgen = get_topogen() logger.info('pre router-start hook') #configure r2 mpls interfaces intfs = ['lo', 'r2-eth0', 'r2-eth1', 'r2-eth2'] for intf in intfs: doCmd(tgen, 'r2', 'echo 1 > /proc/sys/net/mpls/conf/{}/input'.format(intf)) - #configure MPLS + #configure VRFs & MPLS rtrs = ['r1', 'r3', 'r4'] - cmds = ['echo 1 > /proc/sys/net/mpls/conf/lo/input'] + cmds = ['ip link add cust1 type vrf table 10', + 'ip ru add oif cust1 table 10', + 'ip ru add iif cust1 table 10', + 'ip link set dev cust1 up'] for rtr in rtrs: for cmd in cmds: doCmd(tgen, rtr, cmd) + doCmd(tgen, rtr, 'ip link set dev {}-eth4 master cust1'.format(rtr)) intfs = ['lo', rtr+'-eth0', rtr+'-eth4'] for intf in intfs: doCmd(tgen, rtr, 'echo 1 > /proc/sys/net/mpls/conf/{}/input'.format(intf)) - logger.info('setup mpls input') + logger.info('setup {0} vrf cust1, {0}-eth4. enabled mpls input.'.format(rtr)) return; -def autogenPostRouterStartHook(): +def ltemplatePostRouterStartHook(): logger.info('post router-start hook') return; diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/bgpd.conf index 7ec941ee6b..cb8a806ebe 100644 --- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/bgpd.conf +++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/bgpd.conf @@ -8,16 +8,10 @@ log commands router bgp 5226 bgp router-id 1.1.1.1 bgp cluster-id 1.1.1.1 - neighbor 192.168.1.2 remote-as 5226 - neighbor 192.168.1.2 update-source 192.168.1.1 - neighbor 192.168.1.2 route-reflector-client neighbor 2.2.2.2 remote-as 5226 neighbor 2.2.2.2 update-source 1.1.1.1 ! address-family ipv4 unicast - redistribute vnc-direct - neighbor 192.168.1.2 activate - neighbor 192.168.1.2 next-hop-self no neighbor 2.2.2.2 activate exit-address-family ! @@ -29,12 +23,23 @@ router bgp 5226 label 101 rd 10:1 rt both 52:100 - nexthop 192.168.1.1 + !nexthop 192.168.1.1 exit-vrf-policy ! - vnc export bgp mode group-nve - vnc export bgp group-nve group cust1 - vnc redistribute mode resolve-nve - vnc redistribute ipv4 bgp-direct - ! + !vnc export bgp mode group-nve + !vnc export bgp group-nve group cust1 + !vnc redistribute mode resolve-nve + !vnc redistribute ipv4 bgp-direct + +router bgp 5227 vrf cust1 + bgp router-id 192.168.1.1 + neighbor 192.168.1.2 remote-as 5227 + neighbor 192.168.1.2 update-source 192.168.1.1 + ! neighbor 192.168.1.2 route-reflector-client + address-family ipv4 unicast +# redistribute vnc-direct + neighbor 192.168.1.2 activate + neighbor 192.168.1.2 next-hop-self + exit-address-family +! end diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/ldpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/ldpd.conf index 428b674106..5dc8201d56 100644 --- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/ldpd.conf +++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/ldpd.conf @@ -1,5 +1,6 @@ hostname r1 log file /tmp/r1-ldpd.log +password zebra ! debug mpls ldp zebra debug mpls ldp event diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/zebra.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/zebra.conf index cddc7b679a..b5490831bc 100644 --- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/zebra.conf +++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/zebra.conf @@ -1,6 +1,7 @@ log file /tmp/r1-zebra.log ! hostname r1 +password zebra ! interface lo ip address 1.1.1.1/32 diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r2/ldpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r2/ldpd.conf index 9bba8d8387..f027ad8620 100644 --- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r2/ldpd.conf +++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r2/ldpd.conf @@ -1,5 +1,6 @@ hostname r2 log file /tmp/r2-ldpd.log +password zebra ! debug mpls ldp zebra debug mpls ldp event diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r2/zebra.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r2/zebra.conf index b74ce318e4..2dce20a7f6 100644 --- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r2/zebra.conf +++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r2/zebra.conf @@ -1,6 +1,7 @@ log file /tmp/r2-zebra.log ! hostname r2 +password zebra ! interface lo ip address 2.2.2.2/32 diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/bgpd.conf index 5591c633c6..d8a94c53e4 100644 --- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/bgpd.conf +++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/bgpd.conf @@ -8,19 +8,14 @@ log commands router bgp 5226 bgp router-id 3.3.3.3 bgp cluster-id 3.3.3.3 - neighbor 192.168.1.2 remote-as 5226 - neighbor 192.168.1.2 update-source 192.168.1.2 - neighbor 192.168.1.2 route-reflector-client neighbor 2.2.2.2 remote-as 5226 neighbor 2.2.2.2 update-source 3.3.3.3 ! address-family ipv4 unicast - redistribute vnc-direct - neighbor 192.168.1.2 activate - neighbor 192.168.1.2 next-hop-self no neighbor 2.2.2.2 activate exit-address-family - address-family ipv4 vpn +! + address-family ipv4 vpn neighbor 2.2.2.2 activate exit-address-family ! @@ -28,13 +23,24 @@ router bgp 5226 label 103 rd 10:3 rt both 52:100 - nexthop 192.168.1.1 +! nexthop 192.168.1.1 exit-vrf-policy ! - vnc export bgp mode group-nve - vnc export bgp group-nve group cust1 - vnc redistribute mode resolve-nve - vnc redistribute ipv4 bgp-direct +! vnc export bgp mode group-nve +! vnc export bgp group-nve group cust1 +! vnc redistribute mode resolve-nve +! vnc redistribute ipv4 bgp-direct +! +router bgp 5227 vrf cust1 + bgp router-id 192.168.1.1 + neighbor 192.168.1.2 remote-as 5227 + neighbor 192.168.1.2 update-source 192.168.1.1 +! neighbor 192.168.1.2 route-reflector-client + address-family ipv4 unicast +# redistribute vnc-direct + neighbor 192.168.1.2 activate + neighbor 192.168.1.2 next-hop-self + exit-address-family ! end diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/ldpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/ldpd.conf index 53ccf9ed17..e0caa9475f 100644 --- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/ldpd.conf +++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/ldpd.conf @@ -1,4 +1,5 @@ hostname r3 +password zebra log file /tmp/r3-ldpd.log ! debug mpls ldp zebra diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/zebra.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/zebra.conf index eff266bcfa..9cb582f7c4 100644 --- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/zebra.conf +++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/zebra.conf @@ -1,6 +1,7 @@ log file /tmp/r3-zebra.log ! hostname r3 +password zebra ! interface lo ip address 3.3.3.3/32 diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/bgpd.conf index 145390d724..2d23008924 100644 --- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/bgpd.conf +++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/bgpd.conf @@ -8,16 +8,10 @@ log commands router bgp 5226 bgp router-id 4.4.4.4 bgp cluster-id 4.4.4.4 - neighbor 192.168.1.2 remote-as 5226 - neighbor 192.168.1.2 update-source 192.168.1.1 - neighbor 192.168.1.2 route-reflector-client neighbor 2.2.2.2 remote-as 5226 neighbor 2.2.2.2 update-source 4.4.4.4 ! address-family ipv4 unicast - redistribute vnc-direct - neighbor 192.168.1.2 activate - neighbor 192.168.1.2 next-hop-self no neighbor 2.2.2.2 activate exit-address-family address-family ipv4 vpn @@ -28,15 +22,23 @@ router bgp 5226 label 104 rd 10:4 rt both 52:100 - nexthop 192.168.1.1 +! nexthop 192.168.1.1 exit-vrf-policy ! - vnc export bgp mode group-nve - vnc export bgp group-nve group cust1 - vnc redistribute mode resolve-nve - vnc redistribute ipv4 bgp-direct +! vnc export bgp mode group-nve +! vnc export bgp group-nve group cust1 +! vnc redistribute mode resolve-nve +! vnc redistribute ipv4 bgp-direct +! +router bgp 5227 vrf cust1 + bgp router-id 192.168.1.1 + neighbor 192.168.1.2 remote-as 5227 + neighbor 192.168.1.2 update-source 192.168.1.1 +! neighbor 192.168.1.2 route-reflector-client + address-family ipv4 unicast +# redistribute vnc-direct + neighbor 192.168.1.2 activate + neighbor 192.168.1.2 next-hop-self + exit-address-family ! end - - - diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/ldpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/ldpd.conf index 7bfdf7f3a8..14fa2e4df5 100644 --- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/ldpd.conf +++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/ldpd.conf @@ -1,4 +1,5 @@ hostname r4 +password zebra log file /tmp/r4-ldpd.log ! debug mpls ldp zebra diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/zebra.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/zebra.conf index 6bcb302336..7f141bfc43 100644 --- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/zebra.conf +++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/zebra.conf @@ -1,6 +1,7 @@ log file /tmp/r4-zebra.log ! hostname r4 +password zebra ! interface lo ip address 4.4.4.4/32 diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/add_routes.py b/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/add_routes.py index 2b853b934a..f3c70ecbed 100644 --- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/add_routes.py +++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/add_routes.py @@ -1,19 +1,13 @@ from lutil import luCommand luCommand('r1','vtysh -c "add vrf cust1 prefix 99.0.0.1/32"','.','none','IP Address') -luCommand('r3','vtysh -c "show bgp ipv4 vpn"','i99.0.0.1/32','wait','See R1s address') -luCommand('r4','vtysh -c "show bgp ipv4 vpn"','i99.0.0.1/32','wait','See R1s address') luCommand('r3','vtysh -c "add vrf cust1 prefix 99.0.0.2/32"','.','none','IP Address') -luCommand('r1','vtysh -c "show bgp ipv4 vpn"','i99.0.0.2/32','wait','See R3s address') -luCommand('r4','vtysh -c "show bgp ipv4 vpn"','i99.0.0.2/32','wait','See R3s address') luCommand('r4','vtysh -c "add vrf cust1 prefix 99.0.0.3/32"','.','none','IP Address') -luCommand('r1','vtysh -c "show bgp ipv4 vpn"','i99.0.0.3/32','wait','See R4s address') -luCommand('r3','vtysh -c "show bgp ipv4 vpn"','i99.0.0.3/32','wait','See R4s address') luCommand('r1','vtysh -c "show vnc registrations local"','99.0.0.1','pass','Local Registration') luCommand('r3','vtysh -c "show vnc registrations local"','99.0.0.2','pass','Local Registration') luCommand('r4','vtysh -c "show vnc registrations local"','99.0.0.3','pass','Local Registration') -luCommand('r1','vtysh -c "show vnc registrations remote"','4 out of 4','wait','Remote Registration') -luCommand('r3','vtysh -c "show vnc registrations remote"','6 out of 6','wait','Remote Registration') -luCommand('r4','vtysh -c "show vnc registrations remote"','4 out of 4','wait','Remote Registration') +luCommand('r1','vtysh -c "show vnc registrations remote"','4 out of 4','wait','Remote Registration', 10) +luCommand('r3','vtysh -c "show vnc registrations remote"','6 out of 6','wait','Remote Registration', 10) +luCommand('r4','vtysh -c "show vnc registrations remote"','4 out of 4','wait','Remote Registration', 10) luCommand('r1','vtysh -c "show vnc registrations"','.','none') luCommand('r3','vtysh -c "show vnc registrations"','.','none') luCommand('r4','vtysh -c "show vnc registrations"','.','none') 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 dab2f8c2cf..8a0a344e9d 100644 --- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/check_routes.py +++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/check_routes.py @@ -1,7 +1,7 @@ from lutil import luCommand -luCommand('ce1','vtysh -c "show bgp ipv4 uni"','7 routes and 7','wait','Local and remote routes') -luCommand('ce2','vtysh -c "show bgp ipv4 uni"','7 routes and 9','wait','Local and remote routes') -luCommand('ce3','vtysh -c "show bgp ipv4 uni"','7 routes and 7','wait','Local and remote routes') +luCommand('ce1','vtysh -c "show bgp ipv4 uni"','7 routes and 7','wait','Local and remote routes', 10) +luCommand('ce2','vtysh -c "show bgp ipv4 uni"','7 routes and 9','wait','Local and remote routes', 10) +luCommand('ce3','vtysh -c "show bgp ipv4 uni"','7 routes and 7','wait','Local and remote routes', 10) luCommand('r1','vtysh -c "show bgp ipv4 uni"','7 routes and 9','pass','Unicast SAFI') luCommand('r2','vtysh -c "show bgp ipv4 uni"','No BGP prefixes displayed','pass','Unicast SAFI') luCommand('r3','vtysh -c "show bgp ipv4 uni"','7 routes and 9','pass','Unicast SAFI') @@ -10,3 +10,4 @@ luCommand('r1','vtysh -c "show bgp ipv4 vpn"','7 routes and 7','pass','VPN SAFI' luCommand('r2','vtysh -c "show bgp ipv4 vpn"','7 routes and 7','pass','VPN SAFI') luCommand('r3','vtysh -c "show bgp ipv4 vpn"','7 routes and 7','pass','VPN SAFI') luCommand('r4','vtysh -c "show bgp ipv4 vpn"','7 routes and 7','pass','VPN SAFI') + diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/cleanup_all.py b/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/cleanup_all.py index 3a2f037833..a57a4f3e88 100644 --- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/cleanup_all.py +++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/cleanup_all.py @@ -5,13 +5,13 @@ luCommand('r4','vtysh -c "clear vrf cust1 prefix 99.0.0.3/32"','.','none','Clear luCommand('r1','vtysh -c "show vnc registrations local"','99.0.0.1','fail','Local Registration cleared') luCommand('r3','vtysh -c "show vnc registrations local"','99.0.0.2','fail','Local Registration cleared') luCommand('r4','vtysh -c "show vnc registrations local"','99.0.0.3','fail','Local Registration cleared') -luCommand('r1','vtysh -c "show bgp ipv4 uni"','2 routes and 2','wait','Unicast SAFI updated') +luCommand('r1','vtysh -c "show bgp ipv4 uni"','2 routes and 2','wait','Unicast SAFI updated', 10) luCommand('r2','vtysh -c "show bgp ipv4 uni"','No BGP prefixes displayed','pass','Unicast SAFI') -luCommand('r3','vtysh -c "show bgp ipv4 uni"','2 routes and 2','wait','Unicast SAFI updated') -luCommand('r4','vtysh -c "show bgp ipv4 uni"','2 routes and 2','wait','Unicast SAFI updated') -luCommand('ce1','vtysh -c "show bgp ipv4 uni"','2 routes and 2','wait','Local and remote routes') -luCommand('ce2','vtysh -c "show bgp ipv4 uni"','2 routes and 2','wait','Local and remote routes') -luCommand('ce3','vtysh -c "show bgp ipv4 uni"','2 routes and 2','wait','Local and remote routes') +luCommand('r3','vtysh -c "show bgp ipv4 uni"','2 routes and 2','wait','Unicast SAFI updated', 10) +luCommand('r4','vtysh -c "show bgp ipv4 uni"','2 routes and 2','wait','Unicast SAFI updated', 10) +luCommand('ce1','vtysh -c "show bgp ipv4 uni"','2 routes and 2','wait','Local and remote routes', 10) +luCommand('ce2','vtysh -c "show bgp ipv4 uni"','2 routes and 2','wait','Local and remote routes', 10) +luCommand('ce3','vtysh -c "show bgp ipv4 uni"','2 routes and 2','wait','Local and remote routes', 10) luCommand('r1','vtysh -c "show vnc registrations remote"','Prefix ','fail','Remote Registration cleared') luCommand('r3','vtysh -c "show vnc registrations remote"','Prefix ','fail','Remote Registration cleared') luCommand('r4','vtysh -c "show vnc registrations remote"','Prefix ','fail','Remote Registration cleared') diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/test_bgp_l3vpn_to_bgp_vrf.py b/tests/topotests/bgp_l3vpn_to_bgp_vrf/test_bgp_l3vpn_to_bgp_vrf.py index 050f222f88..c5dc23b55f 100755 --- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/test_bgp_l3vpn_to_bgp_vrf.py +++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/test_bgp_l3vpn_to_bgp_vrf.py @@ -46,7 +46,7 @@ def test_adjacencies(): def test_add_routes(): CliOnFail = None # For debugging, uncomment the next line - #CliOnFail = 'tgen.mininet_cli' + CliOnFail = 'tgen.mininet_cli' CheckFunc = 'versionCheck(\'3.1\')' #uncomment next line to start cli *before* script is run #CheckFunc = 'versionCheck(\'3.1\', cli=True)' @@ -55,7 +55,7 @@ def test_add_routes(): def test_check_routes(): CliOnFail = None # For debugging, uncomment the next line - #CliOnFail = 'tgen.mininet_cli' + CliOnFail = 'tgen.mininet_cli' CheckFunc = 'versionCheck(\'3.1\')' #uncomment next line to start cli *before* script is run #CheckFunc = 'versionCheck(\'3.1\', cli=True)' -- 2.39.5