Merge pull request #16945 from opensourcerouting/fix/bgp_received-routes_with_soft_inbound

bgpd: Show unmodified version of received-routes per neighbor

5 files changed, 138 insertions, 4 deletions

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 8dbb4e3b0..475b709a0 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -14506,7 +14506,7 @@ show_adj_route(struct vty *vty, struct peer *peer, struct bgp_table *table,
 	struct bgp_adj_out *adj = NULL;
 	struct bgp_dest *dest;
 	struct bgp *bgp;
-	struct attr attr;
+	struct attr attr, attr_unchanged;
 	int ret;
 	struct update_subgroup *subgrp;
 	struct peer_af *paf = NULL;
@@ -14686,6 +14686,7 @@ show_adj_route(struct vty *vty, struct peer *peer, struct bgp_table *table,
 				}
 
 				attr = *ain->attr;
+				attr_unchanged = *ain->attr;
 				route_filtered = false;
 
 				/* Filter prefix using distribute list,
@@ -14741,9 +14742,8 @@ show_adj_route(struct vty *vty, struct peer *peer, struct bgp_table *table,
 							json_ar, json_net,
 							"%pFX", rn_p);
 				} else
-					route_vty_out_tmp(vty, bgp, dest, rn_p,
-							  &attr, safi, use_json,
-							  json_ar, wide);
+					route_vty_out_tmp(vty, bgp, dest, rn_p, &attr_unchanged,
+							  safi, use_json, json_ar, wide);
 				bgp_attr_flush(&attr);
 				(*output_count)++;
 			}
diff --git a/tests/topotests/bgp_received_routes_with_soft_inbound/__init__.py b/tests/topotests/bgp_received_routes_with_soft_inbound/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/tests/topotests/bgp_received_routes_with_soft_inbound/__init__.py
diff --git a/tests/topotests/bgp_received_routes_with_soft_inbound/r1/frr.conf b/tests/topotests/bgp_received_routes_with_soft_inbound/r1/frr.conf
new file mode 100644
index 000000000..01dd4f3c5
--- /dev/null
+++ b/tests/topotests/bgp_received_routes_with_soft_inbound/r1/frr.conf
@@ -0,0 +1,17 @@
+!
+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
+ address-family ipv4 unicast
+  neighbor 192.168.1.2 route-map r2 in
+  neighbor 192.168.1.2 soft-reconfiguration inbound
+ exit-address-family
+!
+route-map r2 permit 10
+ set as-path prepend 65000 65000 65000
+exit
+!
diff --git a/tests/topotests/bgp_received_routes_with_soft_inbound/r2/frr.conf b/tests/topotests/bgp_received_routes_with_soft_inbound/r2/frr.conf
new file mode 100644
index 000000000..86dd8e338
--- /dev/null
+++ b/tests/topotests/bgp_received_routes_with_soft_inbound/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
+!
diff --git a/tests/topotests/bgp_received_routes_with_soft_inbound/test_bgp_received_routes_with_soft_inbound.py b/tests/topotests/bgp_received_routes_with_soft_inbound/test_bgp_received_routes_with_soft_inbound.py
new file mode 100644
index 000000000..0b933add2
--- /dev/null
+++ b/tests/topotests/bgp_received_routes_with_soft_inbound/test_bgp_received_routes_with_soft_inbound.py
@@ -0,0 +1,103 @@
+#!/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")}
+    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_received_routes_with_soft_inbound():
+    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.2/32": [
+                    {
+                        "valid": True,
+                        "path": "65000 65000 65000 65002",
+                        "nexthops": [
+                            {
+                                "ip": "192.168.1.2",
+                            }
+                        ],
+                    }
+                ]
+            }
+        }
+
+        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"
+
+    def _bgp_check_receveived_routes():
+        output = json.loads(
+            r1.vtysh_cmd(
+                "show bgp ipv4 unicast neighbors 192.168.1.2 received-routes json"
+            )
+        )
+        expected = {
+            "receivedRoutes": {
+                "10.0.0.2/32": {
+                    "valid": True,
+                    "path": "65002",
+                    "nextHop": "192.168.1.2",
+                }
+            }
+        }
+
+        return topotest.json_cmp(output, expected)
+
+    test_func = functools.partial(
+        _bgp_check_receveived_routes,
+    )
+    _, 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))