bgp_l3vpn_to_bgp_vrf: comment out route-add commands no longer needed

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

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 66f116b83fe74b2fa27b794213eb53bd06a96d39..36841a097e8cea2fd337238f14e22ea6c269653e 100644 (file)
--- 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 2e3b3f056a1ee8cda96bcf94f11a452cdf4dcecf..5047ac725e9f0ec2e096be720cbaa115447dd15a 100755 (executable)
--- 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():