Revert "tests: Check if OAD peers can exchange non-transitive extended communities"

This reverts commit fa438172d868b0da4c99cd972356dc8ed9f1f016.

diff --git a/tests/topotests/bgp_oad/r3/frr.conf b/tests/topotests/bgp_oad/r3/frr.conf
index 164267d74dcd9e05b6c877836ec813fd5392c631..02dd5adfe190a19829c06abdec98bc43180cc21f 100644 (file)
--- a/tests/topotests/bgp_oad/r3/frr.conf
+++ b/tests/topotests/bgp_oad/r3/frr.conf
@@ -7,14 +7,12 @@ int r3-eth0
 !
 router bgp 65003
  no bgp ebgp-requires-policy
- no bgp network import-check
  neighbor 192.168.2.2 remote-as external
  neighbor 192.168.2.2 timers 1 3
  neighbor 192.168.2.2 timers connect 1
  neighbor 192.168.2.2 oad
  !
  address-family ipv4 unicast
-  network 10.10.10.20/32 route-map static
   redistribute connected route-map connected
  exit-address-family
 !
@@ -22,7 +20,3 @@ route-map connected permit 10
  set local-preference 123
  set metric 123
 !
-route-map static permit 10
- set extcommunity bandwidth 100 non-transitive
-exit
-!

diff --git a/tests/topotests/bgp_oad/test_bgp_oad.py b/tests/topotests/bgp_oad/test_bgp_oad.py
index 9c00422f7d842c342dba9789af84021f8c8c41fe..c21b3793c364622cd8a4affc0563f5eb884a5b72 100644 (file)
--- a/tests/topotests/bgp_oad/test_bgp_oad.py
+++ b/tests/topotests/bgp_oad/test_bgp_oad.py
@@ -60,7 +60,6 @@ def test_bgp_dynamic_capability_role():
     r2 = tgen.gears["r2"]
     r3 = tgen.gears["r3"]
     r4 = tgen.gears["r4"]
-    r5 = tgen.gears["r5"]
 
     def _bgp_converge():
         output = json.loads(r1.vtysh_cmd("show bgp ipv4 unicast 10.10.10.10/32 json"))
@@ -126,38 +125,6 @@ def test_bgp_dynamic_capability_role():
     _, result = topotest.run_and_expect(test_func, None, count=30, wait=1)
     assert result is None, "10.10.10.1/32 should not be advertised to r4 (not OAD peer)"
 
-    def _bgp_check_non_transitive_extended_community(
-        router, arg={"string": "LB:65003:12500000 (100.000 Mbps)"}
-    ):
-        output = json.loads(
-            router.vtysh_cmd("show bgp ipv4 unicast 10.10.10.20/32 json")
-        )
-        expected = {
-            "paths": [
-                {
-                    "extendedCommunity": arg,
-                }
-            ]
-        }
-        return topotest.json_cmp(output, expected)
-
-    test_func = functools.partial(
-        _bgp_check_non_transitive_extended_community,
-        r4,
-    )
-    _, result = topotest.run_and_expect(test_func, None, count=30, wait=1)
-    assert (
-        result is None
-    ), "10.10.10.20/32 should be received at r4 with non-transitive extended community"
-
-    test_func = functools.partial(
-        _bgp_check_non_transitive_extended_community, r5, None
-    )
-    _, result = topotest.run_and_expect(test_func, None, count=30, wait=1)
-    assert (
-        result is None
-    ), "10.10.10.20/32 should NOT be received at r5 with non-transitive extended community"
-
 
 if __name__ == "__main__":
     args = ["-s"] + sys.argv[1:]