Merge pull request FRRouting#18811 from FRRouting/mergify/bp/stable/10.1/pr-18802

bgpd: fix show bgp vpn rd json (backport FRRouting#18802)

Author: donaldsharp

bgpd/bgp_route.c

@@ -11949,6 +11949,17 @@ static int bgp_show_table(struct vty *vty, struct bgp *bgp, afi_t afi, safi_t sa
 	return CMD_SUCCESS;
 }
 
+static struct bgp_dest *bgp_route_find_prd_match(struct bgp_dest *curr, struct prefix_rd *match)
+{
+	const struct prefix *curr_p = bgp_dest_get_prefix(curr);
+
+	while (curr && match && memcmp(curr_p->u.val, match->val, 8) != 0) {
+		curr = bgp_route_next(curr);
+		curr_p = bgp_dest_get_prefix(curr);
+	}
+	return curr;
+}
+
 int bgp_show_table_rd(struct vty *vty, struct bgp *bgp, afi_t afi, safi_t safi,
 		      struct bgp_table *table, struct prefix_rd *prd_match,
 		      enum bgp_show_type type, void *output_arg,
@@ -11964,12 +11975,10 @@ int bgp_show_table_rd(struct vty *vty, struct bgp *bgp, afi_t afi, safi_t safi,
 
 	show_msg = (!use_json && type == bgp_show_type_normal);
 
-	for (dest = bgp_table_top(table); dest; dest = next) {
+	for (dest = bgp_route_find_prd_match(bgp_table_top(table), prd_match); dest; dest = next) {
 		const struct prefix *dest_p = bgp_dest_get_prefix(dest);
 
-		next = bgp_route_next(dest);
-		if (prd_match && memcmp(dest_p->u.val, prd_match->val, 8) != 0)
-			continue;
+		next = bgp_route_find_prd_match(bgp_route_next(dest), prd_match);
 
 		itable = bgp_dest_get_bgp_table_info(dest);
 		if (itable != NULL) {

tests/topotests/bgp_vrf_route_leak_basic/test_bgp-vrf-route-leak-basic.py

@@ -16,6 +16,7 @@
 import sys
 from functools import partial
 import pytest
+import json
 
 CWD = os.path.dirname(os.path.realpath(__file__))
 sys.path.append(os.path.join(CWD, "../"))
@@ -507,6 +508,26 @@ def test_vrf_route_leak_donna_delete_vrf_zita():
     assert result, "BGP VRF DONNA check failed:\n{}".format(diff)
 
 
+def test_show_bgp_rd_json_output():
+    """
+    Test show bgp ipv4 vpn rd XX json output format is correct
+    """
+
+    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"]
+    ouput = r1.vtysh_cmd("show bgp ipv4 vpn json", isjson=True)
+
+    rds = ouput.get("routes", {}).get("routeDistinguishers", {}).keys()
+    assert len(rds) > 1, "Missing routeDistinguishers"
+
+    # will fail with json.decoder.JSONDecodeError if JSON is malformed
+    json.loads(r1.vtysh_cmd(f"show bgp ipv4 vpn rd {list(rds)[0]} json"))
+
+
 def test_memory_leak():
     "Run the memory leak test and report results."
     tgen = get_topogen()