From 38770d3c9d37e4be1e3bc22b51adfc70f906851a Mon Sep 17 00:00:00 2001 From: "G. Paul Ziemba" Date: Wed, 21 Feb 2018 16:33:13 -0800 Subject: [PATCH] bgp_l3vpn_to_bgp_vrf: comment out route-add commands no longer needed Signed-off-by: G. Paul Ziemba --- .../scripts/check_linux_mpls.py | 24 +++++++++---------- .../test_bgp_l3vpn_to_bgp_vrf.py | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/check_linux_mpls.py b/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/check_linux_mpls.py index 66f116b83f..36841a097e 100644 --- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/check_linux_mpls.py +++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/check_linux_mpls.py @@ -10,10 +10,10 @@ if ret != False and found != None: if ret != False and found != None: label4r1 = found.group(0) luCommand('r2','ip -M route show','.','pass','See %s as label to r1' % label4r1) - luCommand('ce4','ip route add default via 192.168.2.1') - luCommand('ce1','ip route add default via 192.168.1.1') - luCommand('r1','ip route add 99.0.0.1 vrf r1-cust1 dev r1-eth4 via 192.168.1.2') - luCommand('r4','ip route add 99.0.0.4 vrf r4-cust2 dev r4-eth5 via 192.168.2.2') +# luCommand('ce4','ip route add default via 192.168.2.1') +# luCommand('ce1','ip route add default via 192.168.1.1') +# luCommand('r1','ip route add 99.0.0.1 vrf r1-cust1 dev r1-eth4 via 192.168.1.2') +# luCommand('r4','ip route add 99.0.0.4 vrf r4-cust2 dev r4-eth5 via 192.168.2.2') # luCommand('r1','ip -M route add 101 dev r1-cust1') @@ -28,14 +28,14 @@ if ret != False and found != None: luCommand('r4','ip -M route show','104','MPLS->VRF route installed') luCommand('ce1','ping 99.0.0.4 -I 99.0.0.1 -c 1',' 0. packet loss','wait','CE->CE (loopback) ping - l3vpn+zebra case') luCommand('ce4','ping 99.0.0.1 -I 99.0.0.4 -c 1',' 0. packet loss','wait','CE->CE (loopback) ping - l3vpn+zebra case') - luCommand('r1','ip route del 99.0.0.4/32 vrf r1-cust1') - luCommand('r4','ip route del 99.0.0.1/32 vrf r4-cust2') - luCommand('r1','ip route add 99.0.0.4/32 vrf r1-cust1 nexthop encap mpls %s/1004/104 via 10.0.1.2 dev r1-eth0'%label4r4) - luCommand('r4','ip -M route add 1004 dev lo') - luCommand('r4','ip route add 99.0.0.1/32 vrf r4-cust2 nexthop encap mpls %s/1001/101 via 10.0.2.2 dev r4-eth0'%label4r1) - luCommand('r1','ip -M route add 1001 dev lo') - luCommand('r1','ip route show vrf r1-cust1','99.0.0.4.*1004/104','pass', 'VRF->MPLS non-PHP route installed') - luCommand('r4','ip route show vrf r4-cust2','99.0.0.1.*1001/101','pass', 'VRF->MPLS non-PHP route installed') +# luCommand('r1','ip route del 99.0.0.4/32 vrf r1-cust1') +# luCommand('r4','ip route del 99.0.0.1/32 vrf r4-cust2') +# luCommand('r1','ip route add 99.0.0.4/32 vrf r1-cust1 nexthop encap mpls %s/1004/104 via 10.0.1.2 dev r1-eth0'%label4r4) +# luCommand('r4','ip -M route add 1004 dev lo') +# luCommand('r4','ip route add 99.0.0.1/32 vrf r4-cust2 nexthop encap mpls %s/1001/101 via 10.0.2.2 dev r4-eth0'%label4r1) +# luCommand('r1','ip -M route add 1001 dev lo') +# luCommand('r1','ip route show vrf r1-cust1','99.0.0.4.*1004/104','pass', 'VRF->MPLS non-PHP route installed') +# luCommand('r4','ip route show vrf r4-cust2','99.0.0.1.*1001/101','pass', 'VRF->MPLS non-PHP route installed') luCommand('r1','ip -M route show','1001','MPLS "non-PHP" route installed') luCommand('r4','ip -M route show','1004','MPLS "non-PHP" route installed') luCommand('ce1','ping 99.0.0.4 -I 99.0.0.1 -c 1',' 0. packet loss','wait','CE->CE (loopback) ping') 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 2e3b3f056a..5047ac725e 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 @@ -72,7 +72,7 @@ def test_check_linux_mpls(): #CliOnFail = 'tgen.mininet_cli' CheckFunc = 'ltemplateVersionCheck(\'3.1\', iproute2=\'4.9\')' #uncomment next line to start cli *before* script is run - CheckFunc = 'ltemplateVersionCheck(\'3.1\', cli=True, iproute2=\'4.9\')' + #CheckFunc = 'ltemplateVersionCheck(\'3.1\', cli=True, iproute2=\'4.9\')' ltemplateTest('scripts/check_linux_mpls.py', False, CliOnFail, CheckFunc) def SKIP_test_cleanup_all(): -- 2.39.5