tests: fix duplicates in bgp_vrf_route_leak_basic

Test functions were duplicated by mistakes. They were identical.

Fixes: 8af61c8a34 ("topotests: test leak from the default vrf")
Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com>

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 a92b8a473a0130e0d0000dc58f299e3acdfc789a..13c38a9c6654814328c4902eab7ceaaa69cd24dc 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
@@ -214,149 +214,6 @@ def test_vrf_route_leak_eva():
     assert result, "BGP VRF EVA check failed:\n{}".format(diff)
 
 
-def test_vrf_route_leak_donna():
-    logger.info("Ensure that routes are leaked back and forth")
-    tgen = get_topogen()
-    # Don't run this test if we have any failure.
-    if tgen.routers_have_failure():
-        pytest.skip(tgen.errors)
-
-    r1 = tgen.gears["r1"]
-
-    # Test DONNA VRF.
-    expect = {
-        "10.0.0.0/24": [
-            {
-                "protocol": "connected",
-            }
-        ],
-        "10.0.1.0/24": [
-            {
-                "protocol": "bgp",
-                "selected": True,
-                "nexthops": [
-                    {
-                        "fib": True,
-                        "interfaceName": "EVA",
-                        "vrf": "EVA",
-                        "active": True,
-                    },
-                ],
-            },
-        ],
-        "10.0.2.0/24": [{"protocol": "connected"}],
-        "10.0.3.0/24": [
-            {
-                "protocol": "bgp",
-                "selected": True,
-                "nexthops": [
-                    {
-                        "fib": True,
-                        "interfaceName": "EVA",
-                        "vrf": "EVA",
-                        "active": True,
-                    },
-                ],
-            },
-        ],
-        "10.0.4.0/24": [
-            {
-                "protocol": "bgp",
-                "selected": True,
-                "nexthops": [
-                    {
-                        "fib": True,
-                        "interfaceName": "lo",
-                        "vrf": "default",
-                        "active": True,
-                    },
-                ],
-            },
-        ],
-        "172.16.101.0/24": [
-            {
-                "protocol": "bgp",
-                "nexthops": [
-                    {
-                        "interfaceIndex": 0,
-                        "interfaceName": "unknown",
-                        "vrf": "Unknown",
-                    },
-                ],
-            },
-        ],
-    }
-
-    test_func = partial(
-        topotest.router_json_cmp, r1, "show ip route vrf DONNA json", expect
-    )
-    result, diff = topotest.run_and_expect(test_func, None, count=10, wait=0.5)
-    assert result, "BGP VRF DONNA check failed:\n{}".format(diff)
-
-
-def test_vrf_route_leak_eva():
-    logger.info("Ensure that routes are leaked back and forth")
-    tgen = get_topogen()
-    # Don't run this test if we have any failure.
-    if tgen.routers_have_failure():
-        pytest.skip(tgen.errors)
-
-    r1 = tgen.gears["r1"]
-
-    # Test EVA VRF.
-    expect = {
-        "10.0.0.0/24": [
-            {
-                "protocol": "bgp",
-                "selected": True,
-                "nexthops": [
-                    {
-                        "fib": True,
-                        "interfaceName": "DONNA",
-                        "vrf": "DONNA",
-                        "active": True,
-                    },
-                ],
-            },
-        ],
-        "10.0.1.0/24": [
-            {
-                "protocol": "connected",
-            }
-        ],
-        "10.0.2.0/24": [
-            {
-                "protocol": "bgp",
-                "selected": True,
-                "nexthops": [
-                    {
-                        "fib": True,
-                        "interfaceName": "DONNA",
-                        "vrf": "DONNA",
-                        "active": True,
-                    },
-                ],
-            },
-        ],
-        "10.0.3.0/24": [
-            {
-                "protocol": "connected",
-            }
-        ],
-        "172.16.101.0/24": [
-            {
-                "protocol": "bgp",
-                "nexthops": [
-                    {
-                        "interfaceIndex": 0,
-                        "interfaceName": "unknown",
-                        "vrf": "Unknown",
-                    },
-                ],
-            },
-        ],
-    }
-
 
 def test_vrf_route_leak_default():
     logger.info("Ensure that routes are leaked back and forth")