Merge pull request #20273 from FRRouting/mergify/bp/stable/10.4/pr-20268

riw777 · web-flow · commit 501e1686bfa5 · 2025-12-16T09:50:20.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
@@ -3331,13 +3331,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
`@@ -3331,13 +3331,9 @@ static void evpn_show_vni(struct vty vty, struct bgp bgp, vni_t vni,`
`3331`	`3331`	`}`
`3332`	`3332`	`}`
`3333`	`3333`
`3334`		`- if (!found) {`
`3335`		`- if (json) {`
`3336`		`- vty_out(vty, "{}\n");`
`3337`		`- } else {`
`3338`		`- vty_out(vty, "VNI not found\n");`
`3339`		`- return;`
`3340`		`- }`
	`3334`	`+ if (!found && !json) {`
	`3335`	`+ vty_out(vty, "VNI not found\n");`
	`3336`	`+ return;`
`3341`	`3337`	`}`
`3342`	`3338`	`}`
`3343`	`3339`