Merge pull request FRRouting#15947 from anlancs/isisd/fix-lsp-json

isisd: fix json display for database command
mxyns · May 7, 2024 · 8756def · 8756def
2 parents e941145 + 639d802
commit 8756def
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/isisd/isis_lsp.c b/isisd/isis_lsp.c
@@ -822,15 +822,24 @@ int lsp_print_all(struct vty *vty, struct json_object *json,
 {
 	struct isis_lsp *lsp;
 	int lsp_count = 0;
+	struct json_object *lsp_json = NULL;
 
 	if (detail == ISIS_UI_LEVEL_BRIEF) {
 		frr_each (lspdb, head, lsp) {
-			lsp_print_common(lsp, vty, json, dynhost, isis);
+			if (json) {
+				lsp_json = json_object_new_object();
+				json_object_array_add(json, lsp_json);
+			}
+			lsp_print_common(lsp, vty, lsp_json, dynhost, isis);
 			lsp_count++;
 		}
 	} else if (detail == ISIS_UI_LEVEL_DETAIL) {
 		frr_each (lspdb, head, lsp) {
-			lsp_print_detail(lsp, vty, json, dynhost, isis);
+			if (json) {
+				lsp_json = json_object_new_object();
+				json_object_array_add(json, lsp_json);
+			}
+			lsp_print_detail(lsp, vty, lsp_json, dynhost, isis);
 			lsp_count++;
 		}
 	}

diff --git a/isisd/isisd.c b/isisd/isisd.c
@@ -2651,6 +2651,7 @@ void show_isis_database_lspdb_json(struct json_object *json,
 {
 	struct isis_lsp *lsp;
 	int lsp_count;
+	struct json_object *lsp_arr_json;
 
 	if (lspdb_count(lspdb) > 0) {
 		lsp = lsp_for_sysid(lspdb, sysid_str, area->isis);
@@ -2667,9 +2668,12 @@ void show_isis_database_lspdb_json(struct json_object *json,
 				lsp_print_json(lsp, json, area->dynhostname,
 					       area->isis);
 		} else if (sysid_str == NULL) {
-			lsp_count =
-				lsp_print_all(NULL, json, lspdb, ui_level,
-					      area->dynhostname, area->isis);
+			lsp_arr_json = json_object_new_array();
+			json_object_object_add(json, "lsps", lsp_arr_json);
+
+			lsp_count = lsp_print_all(NULL, lsp_arr_json, lspdb,
+						  ui_level, area->dynhostname,
+						  area->isis);
 
 			json_object_int_add(json, "count", lsp_count);
 		}