Merge pull request #16906 from opensourcerouting/fix/match_peer_self

bgpd: Return NOMATCH only if both conf_if/group does not exist

bgpd/bgp_routemap.c

@@ -251,7 +251,7 @@ route_match_peer(void *rule, const struct prefix *prefix, void *object)
 	peer = ((struct bgp_path_info *)object)->peer;
 
 	if (pc->interface) {
-		if (!peer->conf_if || !peer->group)
+		if (!peer->conf_if && !peer->group)
 			return RMAP_NOMATCH;
 
 		if (peer->conf_if && strcmp(peer->conf_if, pc->interface) == 0)

tests/topotests/bgp_match_peer/r1/frr.conf

@@ -0,0 +1,37 @@
+!
+int r1-eth0
+ ip address 192.168.1.1/24
+!
+router bgp 65001
+ no bgp ebgp-requires-policy
+ no bgp network import-check
+ neighbor 192.168.1.2 remote-as external
+ neighbor r3 peer-group
+ neighbor r3 remote-as external
+ neighbor 192.168.1.3 peer-group r3
+ neighbor r4 peer-group
+ neighbor r4 remote-as external
+ neighbor 192.168.1.4 peer-group r4
+ address-family ipv4 unicast
+  network 10.0.0.1/32 route-map all
+  neighbor 192.168.1.2 route-map all in
+  neighbor r3 route-map all in
+  neighbor r4 route-map all in
+ exit-address-family
+!
+route-map all permit 5
+ match peer local
+ set metric 1
+!
+route-map all permit 10
+ match peer 192.168.1.2
+ set metric 2
+!
+route-map all permit 15
+ match peer r3
+ set metric 3
+!
+route-map all permit 20
+ match peer r4
+ set metric 4
+!

tests/topotests/bgp_match_peer/r2/frr.conf

@@ -0,0 +1,14 @@
+!
+int r2-eth0
+ ip address 192.168.1.2/24
+!
+router bgp 65002
+ no bgp ebgp-requires-policy
+ no bgp network import-check
+ neighbor 192.168.1.1 remote-as external
+ neighbor 192.168.1.1 timers 1 3
+ neighbor 192.168.1.1 timers connect 1
+ address-family ipv4 unicast
+  network 10.0.0.2/32
+ exit-address-family
+!

tests/topotests/bgp_match_peer/r3/frr.conf

@@ -0,0 +1,14 @@
+!
+int r3-eth0
+ ip address 192.168.1.3/24
+!
+router bgp 65003
+ no bgp ebgp-requires-policy
+ no bgp network import-check
+ neighbor 192.168.1.1 remote-as external
+ neighbor 192.168.1.1 timers 1 3
+ neighbor 192.168.1.1 timers connect 1
+ address-family ipv4 unicast
+  network 10.0.0.3/32
+ exit-address-family
+!

tests/topotests/bgp_match_peer/r4/frr.conf

@@ -0,0 +1,14 @@
+!
+int r4-eth0
+ ip address 192.168.1.4/24
+!
+router bgp 65004
+ no bgp ebgp-requires-policy
+ no bgp network import-check
+ neighbor 192.168.1.1 remote-as external
+ neighbor 192.168.1.1 timers 1 3
+ neighbor 192.168.1.1 timers connect 1
+ address-family ipv4 unicast
+  network 10.0.0.4/32
+ exit-address-family
+!

tests/topotests/bgp_match_peer/test_bgp_match_peer.py

@@ -0,0 +1,88 @@
+#!/usr/bin/env python
+# SPDX-License-Identifier: ISC
+
+# Copyright (c) 2024 by
+# Donatas Abraitis <donatas@opensourcerouting.org>
+#
+
+import os
+import sys
+import json
+import pytest
+import functools
+
+CWD = os.path.dirname(os.path.realpath(__file__))
+sys.path.append(os.path.join(CWD, "../"))
+
+# pylint: disable=C0413
+from lib import topotest
+from lib.topogen import Topogen, get_topogen
+
+pytestmark = [pytest.mark.bgpd]
+
+
+def setup_module(mod):
+    topodef = {"s1": ("r1", "r2", "r3", "r4")}
+    tgen = Topogen(topodef, mod.__name__)
+    tgen.start_topology()
+
+    router_list = tgen.routers()
+
+    for _, (rname, router) in enumerate(router_list.items(), 1):
+        router.load_frr_config(os.path.join(CWD, "{}/frr.conf".format(rname)))
+
+    tgen.start_router()
+
+
+def teardown_module(mod):
+    tgen = get_topogen()
+    tgen.stop_topology()
+
+
+def test_bgp_match_peer():
+    tgen = get_topogen()
+
+    if tgen.routers_have_failure():
+        pytest.skip(tgen.errors)
+
+    r1 = tgen.gears["r1"]
+
+    def _bgp_converge():
+        output = json.loads(r1.vtysh_cmd("show bgp ipv4 unicast json"))
+        expected = {
+            "routes": {
+                "10.0.0.1/32": [
+                    {
+                        "metric": 1,
+                    }
+                ],
+                "10.0.0.2/32": [
+                    {
+                        "metric": 2,
+                    }
+                ],
+                "10.0.0.3/32": [
+                    {
+                        "metric": 3,
+                    }
+                ],
+                "10.0.0.4/32": [
+                    {
+                        "metric": 4,
+                    }
+                ],
+            }
+        }
+
+        return topotest.json_cmp(output, expected)
+
+    test_func = functools.partial(
+        _bgp_converge,
+    )
+    _, result = topotest.run_and_expect(test_func, None, count=30, wait=1)
+    assert result is None, "Can't converge"
+
+
+if __name__ == "__main__":
+    args = ["-s"] + sys.argv[1:]
+    sys.exit(pytest.main(args))