Revert "tests: check as number in show run"

This reverts commit 85c5598bb95aa2eb17e8f617965affa7de627c69.

Signed-off-by: Jafar Al-Gharaibeh <jafar@atcorp.com>

diff --git a/tests/topotests/bgp_vrf_route_leak_basic/r1/bgpd.conf b/tests/topotests/bgp_vrf_route_leak_basic/r1/bgpd.conf
index 8363e2bc9969d8d8aefebab1a74f82cbc3f5e0c8..397f7938d2e0de2c9c17dc02f08e4237c63dd1d1 100644 (file)
--- a/tests/topotests/bgp_vrf_route_leak_basic/r1/bgpd.conf
+++ b/tests/topotests/bgp_vrf_route_leak_basic/r1/bgpd.conf
@@ -1,5 +1,12 @@
 hostname r1
 
+router bgp 99
+  no bgp ebgp-requires-policy
+  address-family ipv4 unicast
+    redistribute connected
+    import vrf DONNA
+  !
+!
 router bgp 99 vrf DONNA
   no bgp ebgp-requires-policy
   address-family ipv4 unicast
@@ -24,10 +31,3 @@ router bgp 99 vrf ZITA
     network 172.16.101.0/24
   !
 !
-router bgp 99
-  no bgp ebgp-requires-policy
-  address-family ipv4 unicast
-    redistribute connected
-    import vrf DONNA
-  !
-!

diff --git a/tests/topotests/bgp_vrf_route_leak_basic/test_bgp-vrf-route-leak-basic.py b/tests/topotests/bgp_vrf_route_leak_basic/test_bgp-vrf-route-leak-basic.py
index 61c62cafa6db9a4785966a63fdd496668c1004f0..6d4b436bccf9360fcae7d271f36029af9c909c9a 100644 (file)
--- a/tests/topotests/bgp_vrf_route_leak_basic/test_bgp-vrf-route-leak-basic.py
+++ b/tests/topotests/bgp_vrf_route_leak_basic/test_bgp-vrf-route-leak-basic.py
@@ -64,16 +64,6 @@ def teardown_module(mod):
     tgen.stop_topology()
 
 
-def test_router_bgp_as_pretty():
-    tgen = get_topogen()
-    # Don't run this test if we have any failure.
-    if tgen.routers_have_failure():
-        pytest.skip(tgen.errors)
-
-    output = tgen.gears["r1"].vtysh_cmd("show run")
-    assert "router bgp 99\n" in output, "router bgp 99 not found in show run"
-
-
 def test_vrf_route_leak_donna():
     logger.info("Ensure that routes are leaked back and forth")
     tgen = get_topogen()