Merge pull request FRRouting#16875 from opensourcerouting/fix/depreca…

…te_json isisd: Remove deprecated JSON fields
opensourcerouting · Sep 20, 2024 · ddd1004 · ddd1004
2 parents 74f1285 + 17206eb
commit ddd1004
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 788 deletions.
diff --git a/isisd/isis_lsp.c b/isisd/isis_lsp.c
@@ -711,10 +711,6 @@ void lsp_print_common(struct isis_lsp *lsp, struct vty *vty, struct json_object
 	}
 }
 
-#if CONFDATE > 20240916
-CPP_NOTICE("Remove JSON in '-' format")
-#endif
-
 void lsp_print_json(struct isis_lsp *lsp, struct json_object *json,
 	       char dynhost, struct isis *isis)
 {
@@ -728,19 +724,11 @@ void lsp_print_json(struct isis_lsp *lsp, struct json_object *json,
 	own_json = json_object_new_object();
 	json_object_object_add(json, "lsp", own_json);
 	json_object_string_add(own_json, "id", LSPid);
-#if CONFDATE > 20240916
-	CPP_NOTICE("remove own key")
-#endif
 	json_object_string_add(own_json, "own", lsp->own_lsp ? "*" : " ");
 	if (lsp->own_lsp)
 		json_object_boolean_add(own_json, "ownLSP", true);
-	json_object_int_add(json, "pdu-len", lsp->hdr.pdu_len);
 	json_object_int_add(json, "pduLen", lsp->hdr.pdu_len);
 	snprintfrr(buf, sizeof(buf), "0x%08x", lsp->hdr.seqno);
-#if CONFDATE > 20240916
-	CPP_NOTICE("remove seq-number key")
-#endif
-	json_object_string_add(json, "seq-number", buf);
 	json_object_string_add(json, "seqNumber", buf);
 	snprintfrr(buf, sizeof(buf), "0x%04hx", lsp->hdr.checksum);
 	json_object_string_add(json, "chksum", buf);
@@ -751,11 +739,6 @@ void lsp_print_json(struct isis_lsp *lsp, struct json_object *json,
 	} else {
 		json_object_int_add(json, "holdtime", lsp->hdr.rem_lifetime);
 	}
-#if CONFDATE > 20240916
-	CPP_NOTICE("remove att-p-ol key")
-#endif
-	json_object_string_add(
-		json, "att-p-ol", lsp_bits2string(lsp->hdr.lsp_bits, b, sizeof(b)));
 	json_object_string_add(json, "attPOl",
 			       lsp_bits2string(lsp->hdr.lsp_bits, b, sizeof(b)));
 }