Merge pull request #20274 from FRRouting/mergify/bp/stable/10.3/pr-20268

riw777 · web-flow · commit 14e2deb26a70 · 2025-12-16T09:50:27.000-05:00
bgpd: correction in json output structure for no data case (backport #20268)
diff --git a/bgpd/bgp_evpn_vty.c b/bgpd/bgp_evpn_vty.c
@@ -3324,13 +3324,9 @@ static void evpn_show_vni(struct vty *vty, struct bgp *bgp, vni_t vni,
 		}
 	}
 
-	if (!found) {
-		if (json) {
-			vty_out(vty, "{}\n");
-		} else {
-			vty_out(vty, "VNI not found\n");
-			return;
-		}
+	if (!found && !json) {
+		vty_out(vty, "VNI not found\n");
+		return;
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -3324,13 +3324,9 @@ static void evpn_show_vni(struct vty vty, struct bgp bgp, vni_t vni,`
`3324`	`3324`	`}`
`3325`	`3325`	`}`
`3326`	`3326`
`3327`		`- if (!found) {`
`3328`		`- if (json) {`
`3329`		`- vty_out(vty, "{}\n");`
`3330`		`- } else {`
`3331`		`- vty_out(vty, "VNI not found\n");`
`3332`		`- return;`
`3333`		`- }`
	`3327`	`+ if (!found && !json) {`
	`3328`	`+ vty_out(vty, "VNI not found\n");`
	`3329`	`+ return;`
`3334`	`3330`	`}`
`3335`	`3331`	`}`
`3336`	`3332`