isisd: Remove deprecated JSON fields

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>

2 files changed, 26 insertions, 788 deletions

diff --git a/isisd/isis_lsp.c b/isisd/isis_lsp.c
index 391d42fba..d588af314 100644
--- 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)));
 }
diff --git a/isisd/isis_tlvs.c b/isisd/isis_tlvs.c
index eca944759..b5caf396c 100644
--- a/isisd/isis_tlvs.c
+++ b/isisd/isis_tlvs.c
@@ -565,10 +565,6 @@ static void format_item_asla_subtlvs(struct isis_asla_subtlvs *asla,
 			  asla->use_bw);
 }
 
-#if CONFDATE > 20240916
-CPP_NOTICE("Remove JSON in '-' format")
-#endif
-
 /* mtid parameter is used to manage multi-topology i.e. IPv4 / IPv6 */
 static void format_item_ext_subtlvs(struct isis_ext_subtlvs *exts,
 				    struct sbuf *buf, struct json_object *json,
@@ -585,10 +581,6 @@ static void format_item_ext_subtlvs(struct isis_ext_subtlvs *exts,
 		if (json) {
 			snprintfrr(aux_buf, sizeof(aux_buf), "0x%x",
 				   exts->adm_group);
-#if CONFDATE > 20240916
-			CPP_NOTICE("remove deprecated key format with -")
-#endif
-			json_object_string_add(json, "adm-group", aux_buf);
 			json_object_string_add(json, "admGroup", aux_buf);
 		} else {
 			sbuf_push(buf, indent, "Admin Group: 0x%08x\n",
@@ -639,13 +631,6 @@ static void format_item_ext_subtlvs(struct isis_ext_subtlvs *exts,
 	}
 	if (IS_SUBTLV(exts, EXT_LLRI)) {
 		if (json) {
-#if CONFDATE > 20240916
-			CPP_NOTICE("remove deprecated key format with -")
-#endif
-			json_object_int_add(json, "link-local-id",
-					    exts->local_llri);
-			json_object_int_add(json, "link-remote-id",
-					    exts->remote_llri);
 			json_object_int_add(json, "linkLocalId",
 					    exts->local_llri);
 			json_object_int_add(json, "linkRemoteId",
@@ -661,10 +646,6 @@ static void format_item_ext_subtlvs(struct isis_ext_subtlvs *exts,
 		if (json) {
 			inet_ntop(AF_INET, &exts->local_addr, aux_buf,
 				  sizeof(aux_buf));
-#if CONFDATE > 20240916
-			CPP_NOTICE("remove deprecated key format with -")
-#endif
-			json_object_string_add(json, "local-iface-ip", aux_buf);
 			json_object_string_add(json, "localIfaceIp", aux_buf);
 		} else
 			sbuf_push(buf, indent,
@@ -675,11 +656,6 @@ static void format_item_ext_subtlvs(struct isis_ext_subtlvs *exts,
 		if (json) {
 			inet_ntop(AF_INET, &exts->neigh_addr, aux_buf,
 				  sizeof(aux_buf));
-#if CONFDATE > 20240916
-			CPP_NOTICE("remove deprecated key format with -")
-#endif
-			json_object_string_add(json, "remote-iface-ip",
-					       aux_buf);
 			json_object_string_add(json, "remoteIfaceIp", aux_buf);
 		} else
 			sbuf_push(buf, indent,
@@ -690,11 +666,6 @@ static void format_item_ext_subtlvs(struct isis_ext_subtlvs *exts,
 		if (json) {
 			inet_ntop(AF_INET6, &exts->local_addr6, aux_buf,
 				  sizeof(aux_buf));
-#if CONFDATE > 20240916
-			CPP_NOTICE("remove deprecated key format with -")
-#endif
-			json_object_string_add(json, "local-iface-ipv6",
-					       aux_buf);
 			json_object_string_add(json, "localIfaceIpv6", aux_buf);
 		} else
 			sbuf_push(buf, indent,
@@ -705,11 +676,6 @@ static void format_item_ext_subtlvs(struct isis_ext_subtlvs *exts,
 		if (json) {
 			inet_ntop(AF_INET6, &exts->neigh_addr6, aux_buf,
 				  sizeof(aux_buf));
-#if CONFDATE > 20240916
-			CPP_NOTICE("remove deprecated key format with -")
-#endif
-			json_object_string_add(json, "remote-iface-ipv6",
-					       aux_buf);
 			json_object_string_add(json, "remoteIfaceIpv6", aux_buf);
 		} else
 			sbuf_push(buf, indent,
@@ -720,11 +686,6 @@ static void format_item_ext_subtlvs(struct isis_ext_subtlvs *exts,
 		if (json) {
 			snprintfrr(aux_buf, sizeof(aux_buf), "%g",
 				   exts->max_bw);
-#if CONFDATE > 20240916
-			CPP_NOTICE("remove deprecated key format with -")
-#endif
-			json_object_string_add(json, "max-bandwith-bytes-sec",
-					       aux_buf);
 			json_object_string_add(json, "maxBandwithBytesSec",
 					       aux_buf);
 		} else
@@ -736,11 +697,6 @@ static void format_item_ext_subtlvs(struct isis_ext_subtlvs *exts,
 		if (json) {
 			snprintfrr(aux_buf, sizeof(aux_buf), "%g",
 				   exts->max_rsv_bw);
-#if CONFDATE > 20240916
-			CPP_NOTICE("remove deprecated key format with -")
-#endif
-			json_object_string_add(
-				json, "max-res-bandwith-bytes-sec", aux_buf);
 			json_object_string_add(json, "maxResBandwithBytesSec",
 					       aux_buf);
 		} else
@@ -763,22 +719,6 @@ static void format_item_ext_subtlvs(struct isis_ext_subtlvs *exts,
 				json_object_string_add(unrsv_json, cnt_buf,
 						       aux_buf);
 			}
-
-#if CONFDATE > 20240916
-			CPP_NOTICE("remove deprecated key format with -")
-#endif
-			/* old deprecated key format */
-			unrsv_json = json_object_new_object();
-			json_object_object_add(json, "unrsv-bandwith-bytes-sec",
-					       unrsv_json);
-			for (int j = 0; j < MAX_CLASS_TYPE; j += 1) {
-				snprintfrr(cnt_buf, sizeof(cnt_buf), "%d", j);
-				snprintfrr(aux_buf, sizeof(aux_buf), "%g",
-					   exts->unrsv_bw[j]);
-				json_object_string_add(unrsv_json, cnt_buf,
-						       aux_buf);
-			}
-			/* end old deprecated key format */
 		} else {
 			sbuf_push(buf, indent, "Unreserved Bandwidth:\n");
 			for (int j = 0; j < MAX_CLASS_TYPE; j += 2) {
@@ -791,27 +731,18 @@ static void format_item_ext_subtlvs(struct isis_ext_subtlvs *exts,
 		}
 	}
 	if (IS_SUBTLV(exts, EXT_TE_METRIC)) {
-		if (json) {
-#if CONFDATE > 20240916
-			CPP_NOTICE("remove deprecated key format with -")
-#endif
-			json_object_int_add(json, "te-metric", exts->te_metric);
+		if (json)
 			json_object_int_add(json, "teMetric", exts->te_metric);
-		} else
+		else
 			sbuf_push(buf, indent,
 				  "Traffic Engineering Metric: %u\n",
 				  exts->te_metric);
 	}
 	if (IS_SUBTLV(exts, EXT_RMT_AS)) {
-		if (json) {
-#if CONFDATE > 20240916
-			CPP_NOTICE("remove deprecated key format with -")
-#endif
-			json_object_int_add(json, "inter-as-te-remote-as",
-					    exts->remote_as);
+		if (json)
 			json_object_int_add(json, "interAsTeRemoteAs",
 					    exts->remote_as);
-		} else
+		else
 			sbuf_push(buf, indent,
 				  "Inter-AS TE Remote AS number: %u\n",
 				  exts->remote_as);
@@ -820,11 +751,6 @@ static void format_item_ext_subtlvs(struct isis_ext_subtlvs *exts,
 		if (json) {
 			inet_ntop(AF_INET6, &exts->remote_ip, aux_buf,
 				  sizeof(aux_buf));
-#if CONFDATE > 20240916
-			CPP_NOTICE("remove deprecated key format with -")
-#endif
-			json_object_string_add(
-				json, "inter-as-te-remote-asbr-ip", aux_buf);
 			json_object_string_add(json, "interAsTeRemoteAsbrIp",
 					       aux_buf);
 		} else
@@ -836,16 +762,6 @@ static void format_item_ext_subtlvs(struct isis_ext_subtlvs *exts,
 	if (IS_SUBTLV(exts, EXT_DELAY)) {
 		if (json) {
 			struct json_object *avg_json;
-			avg_json = json_object_new_object();
-#if CONFDATE > 20240916
-			CPP_NOTICE("remove deprecated key format with -")
-#endif
-			json_object_object_add(json, "avg-delay", avg_json);
-			json_object_string_add(avg_json, "delay",
-					       IS_ANORMAL(exts->delay)
-						       ? "Anomalous"
-						       : "Normal");
-			json_object_int_add(avg_json, "micro-sec", exts->delay);
 
 			avg_json = json_object_new_object();
 			json_object_object_add(json, "avgDelay", avg_json);
@@ -864,19 +780,6 @@ static void format_item_ext_subtlvs(struct isis_ext_subtlvs *exts,
 	if (IS_SUBTLV(exts, EXT_MM_DELAY)) {
 		if (json) {
 			struct json_object *avg_json;
-			avg_json = json_object_new_object();
-#if CONFDATE > 20240916
-			CPP_NOTICE("remove deprecated key format with -")
-#endif
-			json_object_object_add(json, "max-min-delay", avg_json);
-			json_object_string_add(avg_json, "delay",
-					       IS_ANORMAL(exts->min_delay)
-						       ? "Anomalous"
-						       : "Normal");
-			snprintfrr(aux_buf, sizeof(aux_buf), "%u / %u",
-				   exts->min_delay & TE_EXT_MASK,
-				   exts->max_delay & TE_EXT_MASK);
-			json_object_string_add(avg_json, "micro-sec", aux_buf);
 
 			avg_json = json_object_new_object();
 			json_object_object_add(json, "maxMinDelay", avg_json);
@@ -899,15 +802,10 @@ static void format_item_ext_subtlvs(struct isis_ext_subtlvs *exts,
 				exts->max_delay & TE_EXT_MASK);
 	}
 	if (IS_SUBTLV(exts, EXT_DELAY_VAR)) {
-		if (json) {
-#if CONFDATE > 20240916
-			CPP_NOTICE("remove deprecated key format with -")
-#endif
-			json_object_int_add(json, "delay-variation-micro-sec",
-					    exts->delay_var & TE_EXT_MASK);
+		if (json)
 			json_object_int_add(json, "delayVariationMicroSec",
 					    exts->delay_var & TE_EXT_MASK);
-		} else
+		else
 			sbuf_push(buf, indent,
 				  "Delay Variation: %u (micro-sec)\n",
 				  exts->delay_var & TE_EXT_MASK);
@@ -919,20 +817,6 @@ static void format_item_ext_subtlvs(struct isis_ext_subtlvs *exts,
 					   LOSS_PRECISION));
 			struct json_object *link_json;
 
-#if CONFDATE > 20240916
-			CPP_NOTICE("remove deprecated key format with -")
-#endif
-			link_json = json_object_new_object();
-			json_object_object_add(json, "link-packet-loss",
-					       link_json);
-			json_object_string_add(link_json, "loss",
-					       IS_ANORMAL(exts->pkt_loss)
-						       ? "Anomalous"
-						       : "Normal");
-			/* typo */
-			json_object_string_add(link_json, "percentaje",
-					       aux_buf);
-
 			link_json = json_object_new_object();
 			json_object_object_add(json, "linkPacketLoss",
 					       link_json);
@@ -952,12 +836,6 @@ static void format_item_ext_subtlvs(struct isis_ext_subtlvs *exts,
 		if (json) {
 			snprintfrr(aux_buf, sizeof(aux_buf), "%g",
 				   (exts->res_bw));
-#if CONFDATE > 20240916
-			CPP_NOTICE("remove deprecated key format with -")
-#endif
-			json_object_string_add(json,
-					       "unidir-residual-band-bytes-sec",
-					       aux_buf);
 			json_object_string_add(json,
 					       "unidirResidualBandBytesSec",
 					       aux_buf);
@@ -971,12 +849,6 @@ static void format_item_ext_subtlvs(struct isis_ext_subtlvs *exts,
 		if (json) {
 			snprintfrr(aux_buf, sizeof(aux_buf), "%g",
 				   (exts->ava_bw));
-#if CONFDATE > 20240916
-			CPP_NOTICE("remove deprecated key format with -")
-#endif
-			json_object_string_add(
-				json, "unidir-available-band-bytes-sec",
-				aux_buf);
 			json_object_string_add(json,
 					       "unidirAvailableBandBytesSec",
 					       aux_buf);
@@ -991,12 +863,6 @@ static void format_item_ext_subtlvs(struct isis_ext_subtlvs *exts,
 			snprintfrr(aux_buf, sizeof(aux_buf), "%g",
 				   (exts->use_bw));
 			json_object_string_add(json,
-					       "unidir-utilized-band-bytes-sec",
-					       aux_buf);
-#if CONFDATE > 20240916
-			CPP_NOTICE("remove deprecated key format with -")
-#endif
-			json_object_string_add(json,
 					       "unidirUtilizedBandBytesSec",
 					       aux_buf);
 		} else
@@ -1012,50 +878,6 @@ static void format_item_ext_subtlvs(struct isis_ext_subtlvs *exts,
 		if (json) {
 			struct json_object *arr_adj_json, *adj_sid_json;
 
-#if CONFDATE > 20240916
-			CPP_NOTICE("remove deprecated key format with -")
-#endif
-			/* old deprecated key format */
-			arr_adj_json = json_object_new_array();
-			json_object_object_add(json, "adj-sid", arr_adj_json);
-			for (adj = (struct isis_adj_sid *)exts->adj_sid.head;
-			     adj; adj = adj->next) {
-				snprintfrr(cnt_buf, sizeof(cnt_buf), "%d",
-					   adj->sid);
-				adj_sid_json = json_object_new_object();
-				json_object_int_add(adj_sid_json, "sid",
-						    adj->sid);
-				json_object_int_add(adj_sid_json, "weight",
-						    adj->weight);
-				json_object_string_add(adj_sid_json, "flag-f",
-						       adj->flags & EXT_SUBTLV_LINK_ADJ_SID_FFLG
-							       ? "1"
-							       : "0");
-				json_object_string_add(adj_sid_json, "flag-b",
-						       adj->flags & EXT_SUBTLV_LINK_ADJ_SID_BFLG
-							       ? "1"
-							       : "0");
-				json_object_string_add(adj_sid_json, "flag-v",
-						       adj->flags & EXT_SUBTLV_LINK_ADJ_SID_VFLG
-							       ? "1"
-							       : "0");
-				json_object_string_add(adj_sid_json, "flag-l",
-						       adj->flags & EXT_SUBTLV_LINK_ADJ_SID_LFLG
-							       ? "1"
-							       : "0");
-				json_object_string_add(adj_sid_json, "flag-s",
-						       adj->flags & EXT_SUBTLV_LINK_ADJ_SID_SFLG
-							       ? "1"
-							       : "0");
-				json_object_string_add(adj_sid_json, "flag-p",
-						       adj->flags & EXT_SUBTLV_LINK_ADJ_SID_PFLG
-							       ? "1"
-							       : "0");
-				json_object_array_add(arr_adj_json,
-						      adj_sid_json);
-			}
-			/* end old deprecated key format */
-
 			arr_adj_json = json_object_new_array();
 			json_object_object_add(json, "adjSid", arr_adj_json);
 			for (adj = (struct isis_adj_sid *)exts->adj_sid.head;
@@ -1127,57 +949,6 @@ static void format_item_ext_subtlvs(struct isis_ext_subtlvs *exts,
 		if (json) {
 			struct json_object *arr_adj_json, *lan_adj_json;
 
-#if CONFDATE > 20240916
-			CPP_NOTICE("remove deprecated key format with -")
-#endif
-			/* old deprecated key format */
-			arr_adj_json = json_object_new_array();
-			json_object_object_add(json, "lan-adj-sid",
-					       arr_adj_json);
-			for (lan = (struct isis_lan_adj_sid *)
-					   exts->adj_sid.head;
-			     lan; lan = lan->next) {
-				if (((mtid == ISIS_MT_IPV4_UNICAST) &&
-				     (lan->family != AF_INET)) ||
-				    ((mtid == ISIS_MT_IPV6_UNICAST) &&
-				     (lan->family != AF_INET6)))
-					continue;
-				snprintfrr(cnt_buf, sizeof(cnt_buf), "%d",
-					   lan->sid);
-				lan_adj_json = json_object_new_object();
-				json_object_int_add(lan_adj_json, "sid",
-						    lan->sid);
-				json_object_int_add(lan_adj_json, "weight",
-						    lan->weight);
-				json_object_string_add(lan_adj_json, "flag-f",
-						       lan->flags & EXT_SUBTLV_LINK_ADJ_SID_FFLG
-							       ? "1"
-							       : "0");
-				json_object_string_add(lan_adj_json, "flag-b",
-						       lan->flags & EXT_SUBTLV_LINK_ADJ_SID_BFLG
-							       ? "1"
-							       : "0");
-				json_object_string_add(lan_adj_json, "flag-v",
-						       lan->flags & EXT_SUBTLV_LINK_ADJ_SID_VFLG
-							       ? "1"
-							       : "0");
-				json_object_string_add(lan_adj_json, "flag-l",
-						       lan->flags & EXT_SUBTLV_LINK_ADJ_SID_LFLG
-							       ? "1"
-							       : "0");
-				json_object_string_add(lan_adj_json, "flag-s",
-						       lan->flags & EXT_SUBTLV_LINK_ADJ_SID_SFLG
-							       ? "1"
-							       : "0");
-				json_object_string_add(lan_adj_json, "flag-p",
-						       lan->flags & EXT_SUBTLV_LINK_ADJ_SID_PFLG
-							       ? "1"
-							       : "0");
-				json_object_array_add(arr_adj_json,
-						      lan_adj_json);
-			}
-			/* end old deprecated key format */
-
 			arr_adj_json = json_object_new_array();
 			json_object_object_add(json, "lanAdjSid", arr_adj_json);
 			for (lan = (struct isis_lan_adj_sid *)exts->adj_sid.head;
@@ -1264,57 +1035,6 @@ static void format_item_ext_subtlvs(struct isis_ext_subtlvs *exts,
 		if (json) {
 			struct json_object *arr_adj_json, *srv6_endx_sid_json;
 
-#if CONFDATE > 20240916
-			CPP_NOTICE("remove deprecated key format with -")
-#endif
-			/* old deprecated key format */
-			arr_adj_json = json_object_new_array();
-			json_object_object_add(json, "srv6-endx-sid",
-					       arr_adj_json);
-			for (adj = (struct isis_srv6_endx_sid_subtlv *)
-					   exts->srv6_endx_sid.head;
-			     adj; adj = adj->next) {
-				snprintfrr(cnt_buf, sizeof(cnt_buf), "%pI6",
-					   &adj->sid);
-				srv6_endx_sid_json = json_object_new_object();
-				json_object_string_addf(srv6_endx_sid_json,
-							"sid", "%pI6",
-							&adj->sid);
-				json_object_string_add(srv6_endx_sid_json,
-						       "algorithm",
-						       sr_algorithm_string(
-							       adj->algorithm));
-				json_object_int_add(srv6_endx_sid_json,
-						    "weight", adj->weight);
-				json_object_string_add(srv6_endx_sid_json,
-						       "behavior",
-						       seg6local_action2str(
-							       adj->behavior));
-				json_object_string_add(srv6_endx_sid_json,
-						       "flag-b",
-						       adj->flags & EXT_SUBTLV_LINK_SRV6_ENDX_SID_BFLG
-							       ? "1"
-							       : "0");
-				json_object_string_add(srv6_endx_sid_json,
-						       "flag-s",
-						       adj->flags & EXT_SUBTLV_LINK_SRV6_ENDX_SID_SFLG
-							       ? "1"
-							       : "0");
-				json_object_string_add(srv6_endx_sid_json,
-						       "flag-p",
-						       adj->flags & EXT_SUBTLV_LINK_SRV6_ENDX_SID_PFLG
-							       ? "1"
-							       : "0");
-				json_object_array_add(arr_adj_json,
-						      srv6_endx_sid_json);
-				if (adj->subsubtlvs)
-					isis_format_subsubtlvs(adj->subsubtlvs,
-							       NULL,
-							       srv6_endx_sid_json,
-							       indent + 4);
-			}
-			/* end old deprecated key format */
-
 			arr_adj_json = json_object_new_array();
 			json_object_object_add(json, "srv6EndXSID",
 					       arr_adj_json);
@@ -1390,63 +1110,6 @@ static void format_item_ext_subtlvs(struct isis_ext_subtlvs *exts,
 			struct json_object *arr_adj_json,
 				*srv6_lan_endx_sid_json;
 
-#if CONFDATE > 20240916
-			CPP_NOTICE("remove deprecated key format with -")
-#endif
-			/* old deprecated key format */
-			arr_adj_json = json_object_new_array();
-			json_object_object_add(json, "srv6-lan-endx-sid",
-					       arr_adj_json);
-			for (lan = (struct isis_srv6_lan_endx_sid_subtlv *)
-					   exts->srv6_lan_endx_sid.head;
-			     lan; lan = lan->next) {
-				snprintfrr(cnt_buf, sizeof(cnt_buf), "%pI6",
-					   &lan->sid);
-				srv6_lan_endx_sid_json =
-					json_object_new_object();
-				json_object_string_addf(srv6_lan_endx_sid_json,
-							"sid", "%pI6",
-							&lan->sid);
-				json_object_int_add(srv6_lan_endx_sid_json,
-						    "weight", lan->weight);
-				json_object_string_add(srv6_lan_endx_sid_json,
-						       "algorithm",
-						       sr_algorithm_string(
-							       lan->algorithm));
-				json_object_int_add(srv6_lan_endx_sid_json,
-						    "weight", lan->weight);
-				json_object_string_add(srv6_lan_endx_sid_json,
-						       "behavior",
-						       seg6local_action2str(
-							       lan->behavior));
-				json_object_string_add(srv6_lan_endx_sid_json,
-						       "flag-b",
-						       lan->flags & EXT_SUBTLV_LINK_SRV6_ENDX_SID_BFLG
-							       ? "1"
-							       : "0");
-				json_object_string_add(srv6_lan_endx_sid_json,
-						       "flag-s",
-						       lan->flags & EXT_SUBTLV_LINK_SRV6_ENDX_SID_SFLG
-							       ? "1"
-							       : "0");
-				json_object_string_add(srv6_lan_endx_sid_json,
-						       "flag-p",
-						       lan->flags & EXT_SUBTLV_LINK_SRV6_ENDX_SID_PFLG
-							       ? "1"
-							       : "0");
-				json_object_string_addf(srv6_lan_endx_sid_json,
-							"neighbor-id", "%pSY",
-							lan->neighbor_id);
-				json_object_array_add(arr_adj_json,
-						      srv6_lan_endx_sid_json);
-				if (lan->subsubtlvs)
-					isis_format_subsubtlvs(lan->subsubtlvs,
-							       NULL,
-							       srv6_lan_endx_sid_json,
-							       indent + 4);
-			}
-			/* end old deprecated key format */
-
 			arr_adj_json = json_object_new_array();
 			json_object_object_add(json, "srv6LanEndxSID",
 					       arr_adj_json);
@@ -2613,33 +2276,6 @@ static void format_item_prefix_sid(uint16_t mtid, struct isis_item *i,
 		}
 		json_object_int_add(sr_json, "alg", sid->algorithm);
 
-#if CONFDATE > 20240916
-		CPP_NOTICE("remove deprecated non boolean json")
-#endif
-		/* old deprecated keys (no booleans) */
-		json_object_string_add(
-			sr_json, "readvertised",
-			((sid->flags & ISIS_PREFIX_SID_READVERTISED) ? "yes"
-								     : ""));
-		json_object_string_add(
-			sr_json, "node",
-			((sid->flags & ISIS_PREFIX_SID_NODE) ? "yes" : ""));
-		json_object_string_add(sr_json, "php",
-				       ((sid->flags & ISIS_PREFIX_SID_NO_PHP)
-						? "no-php"
-						: "php"));
-		json_object_string_add(
-			sr_json, "explicit-null",
-			((sid->flags & ISIS_PREFIX_SID_EXPLICIT_NULL) ? "yes"
-								      : ""));
-		json_object_string_add(
-			sr_json, "value",
-			((sid->flags & ISIS_PREFIX_SID_VALUE) ? "yes" : ""));
-		json_object_string_add(
-			sr_json, "local",
-			((sid->flags & ISIS_PREFIX_SID_LOCAL) ? "yes" : ""));
-		/* end deprecated keys (no booleans) */
-
 		struct json_object *flags_json;
 
 		flags_json = json_object_new_object();
@@ -2788,10 +2424,6 @@ static void format_subtlv_ipv6_source_prefix(struct prefix_ipv6 *p,
 	char prefixbuf[PREFIX2STR_BUFFER];
 	if (json) {
 		prefix2str(p, prefixbuf, sizeof(prefixbuf));
-#if CONFDATE > 20240916
-		CPP_NOTICE("remove deprecated key format with -")
-#endif
-		json_object_string_add(json, "ipv6-src-prefix", prefixbuf);
 		json_object_string_add(json, "ipv6SrcPrefix", prefixbuf);
 	} else {
 		sbuf_push(buf, indent, "IPv6 Source Prefix: %s\n",
@@ -2895,23 +2527,6 @@ static void format_subsubtlv_srv6_sid_structure(
 	if (json) {
 		struct json_object *sid_struct_json;
 
-#if CONFDATE > 20240916
-		CPP_NOTICE("remove deprecated key format with -")
-#endif
-		/* old deprecated key format */
-		sid_struct_json = json_object_new_object();
-		json_object_object_add(json, "srv6-sid-structure",
-				       sid_struct_json);
-		json_object_int_add(sid_struct_json, "loc-block-len",
-				    sid_struct->loc_block_len);
-		json_object_int_add(sid_struct_json, "loc-node-len",
-				    sid_struct->loc_node_len);
-		json_object_int_add(sid_struct_json, "func-len",
-				    sid_struct->func_len);
-		json_object_int_add(sid_struct_json, "arg-len",
-				    sid_struct->arg_len);
-		/* end old deprecated key format */
-
 		sid_struct_json = json_object_new_object();
 		json_object_object_add(json, "srv6SidStructure",
 				       sid_struct_json);
@@ -3205,26 +2820,6 @@ static void format_item_srv6_end_sid(uint16_t mtid, struct isis_item *i,
 	if (json) {
 		struct json_object *sid_json;
 
-#if CONFDATE > 20240916
-		CPP_NOTICE("remove deprecated key format with -")
-#endif
-		/* old deprecated key format */
-		sid_json = json_object_new_object();
-		json_object_object_add(json, "srv6-end-sid", sid_json);
-		json_object_string_add(sid_json, "endpoint-behavior",
-				       seg6local_action2str(sid->behavior));
-		json_object_string_addf(sid_json, "sid-value", "%pI6",
-					&sid->sid);
-		if (sid->subsubtlvs) {
-			struct json_object *subtlvs_json;
-			subtlvs_json = json_object_new_object();
-			json_object_object_add(sid_json, "subsubtlvs",
-					       subtlvs_json);
-			isis_format_subsubtlvs(sid->subsubtlvs, NULL,
-					       subtlvs_json, 0);
-		}
-		/* end old deprecated key format */
-
 		sid_json = json_object_new_object();
 		json_object_object_add(json, "srv6EndSid", sid_json);
 		json_object_string_add(sid_json, "endpointBehavior",
@@ -3385,13 +2980,9 @@ static void format_item_area_address(uint16_t mtid, struct isis_item *i,
 
 	memcpy(iso_addr.area_addr, addr->addr, ISO_ADDR_SIZE);
 	iso_addr.addr_len = addr->len;
-	if (json) {
-#if CONFDATE > 20240916
-		CPP_NOTICE("remove deprecated key format with -")
-#endif
-		json_object_string_addf(json, "area-addr", "%pIS", &iso_addr);
+	if (json)
 		json_object_string_addf(json, "areaAddr", "%pIS", &iso_addr);
-	} else
+	else
 		sbuf_push(buf, indent, "Area Address: %pIS\n", &iso_addr);
 }
 
@@ -3479,22 +3070,6 @@ static void format_item_oldstyle_reach(uint16_t mtid, struct isis_item *i,
 	if (json) {
 		struct json_object *old_json, *array_json;
 
-#if CONFDATE > 20240916
-		CPP_NOTICE("remove deprecated key format with -")
-#endif
-		/* old deprecated key format */
-		old_json = json_object_new_object();
-		json_object_object_get_ex(json, "old-reach-style", &array_json);
-		if (!array_json) {
-			array_json = json_object_new_array();
-			json_object_object_add(json, "old-reach-style",
-					       array_json);
-		}
-		json_object_array_add(array_json, old_json);
-		json_object_string_add(old_json, "is-reach", sys_id);
-		json_object_int_add(old_json, "metric", r->metric);
-		/* end old deprecated key format */
-
 		old_json = json_object_new_object();
 		json_object_object_get_ex(json, "oldReachStyle", &array_json);
 		if (!array_json) {
@@ -3582,13 +3157,9 @@ static void format_item_lan_neighbor(uint16_t mtid, struct isis_item *i,
 	char sys_id[ISO_SYSID_STRLEN];
 
 	snprintfrr(sys_id, ISO_SYSID_STRLEN, "%pSY", n->mac);
-	if (json) {
-#if CONFDATE > 20240916
-		CPP_NOTICE("remove deprecated key format with -")
-#endif
-		json_object_string_add(json, "lan-neighbor", sys_id);
+	if (json)
 		json_object_string_add(json, "lanNeighbor", sys_id);
-	} else
+	else
 		sbuf_push(buf, indent, "LAN Neighbor: %s\n", sys_id);
 }
 
@@ -3660,17 +3231,6 @@ static void format_item_lsp_entry(uint16_t mtid, struct isis_item *i,
 	if (json) {
 		char buf[255];
 		struct json_object *lsp_json;
-		lsp_json = json_object_new_object();
-#if CONFDATE > 20240916
-		CPP_NOTICE("remove deprecated key format with -")
-#endif
-		json_object_object_add(json, "lsp-entry", lsp_json);
-		json_object_string_add(lsp_json, "id", sys_id);
-		snprintfrr(buf,sizeof(buf),"0x%08x",e->seqno);
-		json_object_string_add(lsp_json, "seq", buf);
-		snprintfrr(buf,sizeof(buf),"0x%04hx",e->checksum);
-		json_object_string_add(lsp_json, "chksum", buf);
-		json_object_int_add(lsp_json, "lifetime", e->checksum);
 
 		lsp_json = json_object_new_object();
 		json_object_object_add(json, "lspEntry", lsp_json);
@@ -3762,31 +3322,6 @@ static void format_item_extended_reach(uint16_t mtid, struct isis_item *i,
 	if (json) {
 		struct json_object *reach_json, *array_json;
 
-#if CONFDATE > 20240916
-		CPP_NOTICE("remove deprecated key format with -")
-#endif
-		/* old deprecated key format */
-		reach_json = json_object_new_object();
-		json_object_object_get_ex(json, "ext-reach", &array_json);
-		if (!array_json) {
-			array_json = json_object_new_array();
-			json_object_object_add(json, "ext-reach", array_json);
-		}
-		json_object_array_add(array_json, reach_json);
-		json_object_string_add(
-			reach_json, "mt-id",
-			(mtid == ISIS_MT_IPV4_UNICAST) ? "Extended" : "MT");
-		json_object_string_add(reach_json, "id", sys_id);
-		json_object_int_add(reach_json, "metric", r->metric);
-		if (mtid != ISIS_MT_IPV4_UNICAST)
-			json_object_string_add(reach_json, "mt-name",
-					       isis_mtid2str(mtid));
-
-		if (r->subtlvs)
-			format_item_ext_subtlvs(r->subtlvs, NULL, reach_json,
-						indent + 2, mtid);
-		/* end old deprecated key format */
-
 		reach_json = json_object_new_object();
 		json_object_object_get_ex(json, "extReach", &array_json);
 		if (!array_json) {
@@ -3935,24 +3470,6 @@ static void format_item_oldstyle_ip_reach(uint16_t mtid, struct isis_item *i,
 	if (json) {
 		struct json_object *old_json, *array_json;
 
-#if CONFDATE > 20240916
-		CPP_NOTICE("remove deprecated key format with -")
-#endif
-		/* old deprecated key format */
-		old_json = json_object_new_object();
-		json_object_object_get_ex(json, "old-ip-reach-style",
-					  &array_json);
-		if (!array_json) {
-			array_json = json_object_new_array();
-			json_object_object_add(json, "old-ip-reach-style",
-					       old_json);
-		}
-		json_object_array_add(array_json, old_json);
-		json_object_string_add(old_json, "prefix",
-				       prefix2str(&r->prefix, prefixbuf, sizeof(prefixbuf)));
-		json_object_int_add(old_json, "metric", r->metric);
-		/* end old deprecated key format */
-
 		old_json = json_object_new_object();
 		json_object_object_get_ex(json, "oldIpReachStyle", &array_json);
 		if (!array_json) {
@@ -4058,19 +3575,6 @@ static void format_tlv_protocols_supported(struct isis_protocols_supported *p,
 		struct json_object *protocol_json;
 		char buf[255];
 
-#if CONFDATE > 20240916
-		CPP_NOTICE("remove deprecated key format with -")
-#endif
-		/* old deprecated key format */
-		protocol_json = json_object_new_object();
-		json_object_object_add(json, "protocols-supported",
-				       protocol_json);
-		for (uint8_t i = 0; i < p->count; i++) {
-			snprintfrr(buf, sizeof(buf), "%d", i);
-			json_object_string_add(protocol_json, buf,
-					       nlpid2str(p->protocols[i]));
-		}
-
 		protocol_json = json_object_new_object();
 		json_object_object_add(json, "supportedProtocols",
 				       protocol_json);
@@ -4079,7 +3583,6 @@ static void format_tlv_protocols_supported(struct isis_protocols_supported *p,
 			json_object_string_add(protocol_json, buf,
 					       nlpid2str(p->protocols[i]));
 		}
-		/* end old deprecated key format */
 	} else {
 		sbuf_push(buf, indent, "Protocols Supported: ");
 		for (uint8_t i = 0; i < p->count; i++) {
@@ -4295,13 +3798,9 @@ static void format_item_global_ipv6_address(uint16_t mtid, struct isis_item *i,
 	char addrbuf[INET6_ADDRSTRLEN];
 
 	inet_ntop(AF_INET6, &a->addr, addrbuf, sizeof(addrbuf));
-	if (json) {
-#if CONFDATE > 20240916
-		CPP_NOTICE("remove deprecated key format with -")
-#endif
-		json_object_string_add(json, "global-ipv6", addrbuf);
+	if (json)
 		json_object_string_add(json, "globalIpv6", addrbuf);
-	} else
+	else
 		sbuf_push(buf, indent, "Global IPv6 Interface Address: %s\n",
 			  addrbuf);
 }
@@ -4383,12 +3882,6 @@ static void format_item_mt_router_info(uint16_t mtid, struct isis_item *i,
 		json_object_string_add(mt_json, "mtDescription",
 				       isis_mtid2str(mtid));
 
-#if CONFDATE > 20240916
-		CPP_NOTICE("remove deprecated non boolean format")
-#endif
-		json_object_string_add(mt_json, "overload", info->overload?"true":"false");
-		json_object_string_add(mt_json, "attached", info->attached?"true":"false");
-
 		json_object_boolean_add(mt_json, "overloadBit",
 					!!info->overload);
 		json_object_boolean_add(mt_json, "attachedbit",
@@ -4475,13 +3968,9 @@ static void format_tlv_te_router_id(const struct in_addr *id, struct sbuf *buf,
 
 	char addrbuf[INET_ADDRSTRLEN];
 	inet_ntop(AF_INET, id, addrbuf, sizeof(addrbuf));
-	if (json) {
-#if CONFDATE > 20240916
-		CPP_NOTICE("remove deprecated key format with -")
-#endif
-		json_object_string_add(json, "te-router-id", addrbuf);
+	if (json)
 		json_object_string_add(json, "teRouterId", addrbuf);
-	} else
+	else
 		sbuf_push(buf, indent, "TE Router ID: %s\n", addrbuf);
 }
 
@@ -4556,37 +4045,6 @@ static void format_item_extended_ip_reach(uint16_t mtid, struct isis_item *i,
 	char prefixbuf[PREFIX2STR_BUFFER];
 
 	if (json) {
-#if CONFDATE > 20240916
-		CPP_NOTICE("remove deprecated key format with -")
-#endif
-		/* old deprecated key format */
-		ext_json = json_object_new_object();
-		json_object_object_get_ex(json, "ext-ip-reach", &array_json);
-		if (!array_json) {
-			array_json = json_object_new_array();
-			json_object_object_add(json, "ext-ip-reach", array_json);
-		}
-		json_object_array_add(array_json, ext_json);
-		json_object_string_add(ext_json, "mt-id",
-				       (mtid == ISIS_MT_IPV4_UNICAST)
-					       ? "Extended"
-					       : "MT");
-		json_object_string_add(ext_json, "ip-reach",
-				       prefix2str(&r->prefix, prefixbuf,
-						  sizeof(prefixbuf)));
-		json_object_int_add(ext_json, "ip-reach-metric", r->metric);
-		json_object_string_add(ext_json, "down", r->down ? "yes" : "");
-		if (mtid != ISIS_MT_IPV4_UNICAST)
-			json_object_string_add(ext_json, "mt-name",
-					       isis_mtid2str(mtid));
-		if (r->subtlvs) {
-			struct json_object *subtlv_json;
-			subtlv_json = json_object_new_object();
-			json_object_object_add(ext_json, "subtlvs", subtlv_json);
-			format_subtlvs(r->subtlvs, NULL, subtlv_json, 0);
-		}
-		/* end old deprecated key format */
-
 		ext_json = json_object_new_object();
 		json_object_object_get_ex(json, "extIpReach", &array_json);
 		if (!array_json) {
@@ -4869,13 +4327,9 @@ static void format_tlv_te_router_id_ipv6(const struct in6_addr *id,
 
 	char addrbuf[INET6_ADDRSTRLEN];
 	inet_ntop(AF_INET6, id, addrbuf, sizeof(addrbuf));
-	if (json) {
-#if CONFDATE > 20240916
-		CPP_NOTICE("remove deprecated key format with -")
-#endif
-		json_object_string_add(json, "ipv6-te-router-id", addrbuf);
+	if (json)
 		json_object_string_add(json, "ipv6TeRouterId", addrbuf);
-	} else
+	else
 		sbuf_push(buf, indent, "IPv6 TE Router ID: %s\n", addrbuf);
 }
 
@@ -4953,30 +4407,6 @@ static void format_tlv_spine_leaf(const struct isis_spine_leaf *spine_leaf,
 	if (json) {
 		struct json_object *spine_json;
 
-#if CONFDATE > 20240916
-		CPP_NOTICE("remove deprecated key format with -")
-#endif
-		/* old deprecated format */
-		spine_json = json_object_new_object();
-		json_object_object_add(json, "spine-leaf-extension",
-				       spine_json);
-		if (spine_leaf->has_tier) {
-			snprintfrr(aux_buf, sizeof(aux_buf), "%hhu",
-				   spine_leaf->tier);
-			json_object_string_add(
-				spine_json, "tier",
-				(spine_leaf->tier == ISIS_TIER_UNDEFINED)
-					? "undefined"
-					: aux_buf);
-		}
-		json_object_string_add(spine_json, "flag-leaf",
-				       spine_leaf->is_leaf ? "yes" : "");
-		json_object_string_add(spine_json, "flag-spine",
-				       spine_leaf->is_spine ? "yes" : "");
-		json_object_string_add(spine_json, "flag-backup",
-				       spine_leaf->is_backup ? "yes" : "");
-		/* end old deprecated format */
-
 		spine_json = json_object_new_object();
 		json_object_object_add(json, "spineLeafExtension", spine_json);
 		if (spine_leaf->has_tier) {
@@ -5136,26 +4566,6 @@ format_tlv_threeway_adj(const struct isis_threeway_adj *threeway_adj,
 	if (json) {
 		struct json_object *three_json;
 
-#if CONFDATE > 20240916
-		CPP_NOTICE("remove deprecated key format with -")
-#endif
-		/* old deprecated key format */
-		three_json = json_object_new_object();
-		json_object_object_add(json, "p2p-three-way-adj", three_json);
-		json_object_string_add(
-			three_json, "state-name",
-			isis_threeway_state_name(threeway_adj->state));
-		json_object_int_add(three_json, "state", threeway_adj->state);
-		json_object_int_add(three_json, "ext-local-circuit-id",
-				    threeway_adj->local_circuit_id);
-		if (threeway_adj->neighbor_set) {
-			json_object_string_add(three_json, "neigh-system-id",
-					       sys_id);
-			json_object_int_add(three_json, "neigh-ext-circuit-id",
-					    threeway_adj->neighbor_circuit_id);
-		}
-		/* end old deprecated key format */
-
 		three_json = json_object_new_object();
 		json_object_object_add(json, "p2pThreeWayAdj", three_json);
 		json_object_string_add(three_json, "stateName",
@@ -5306,40 +4716,6 @@ static void format_item_ipv6_reach(uint16_t mtid, struct isis_item *i,
 					       subtlvs_json);
 			format_subtlvs(r->subtlvs, NULL, subtlvs_json, 0);
 		}
-
-#if CONFDATE > 20240916
-		CPP_NOTICE("remove deprecated key format with -")
-#endif
-		/* old deprecated JSON key format */
-		reach_json = json_object_new_object();
-		json_object_object_get_ex(json, "ipv6-reach", &array_json);
-		if (!array_json) {
-			array_json = json_object_new_array();
-			json_object_object_add(json, "ipv6-reach", array_json);
-		}
-		json_object_array_add(array_json, reach_json);
-		json_object_string_add(reach_json, "mt-id",
-				       (mtid == ISIS_MT_IPV4_UNICAST) ? ""
-								      : "mt");
-		json_object_string_add(
-			reach_json, "prefix",
-			prefix2str(&r->prefix, prefixbuf, sizeof(prefixbuf)));
-		json_object_int_add(reach_json, "metric", r->metric);
-		json_object_string_add(reach_json, "down",
-				       r->down ? "yes" : "");
-		json_object_string_add(reach_json, "external",
-				       r->external ? "yes" : "");
-		if (mtid != ISIS_MT_IPV4_UNICAST)
-			json_object_string_add(reach_json, "mt-name",
-					       isis_mtid2str(mtid));
-		if (r->subtlvs) {
-			struct json_object *subtlvs_json;
-			subtlvs_json = json_object_new_object();
-			json_object_object_add(reach_json, "subtlvs",
-					       subtlvs_json);
-			format_subtlvs(r->subtlvs, NULL, subtlvs_json, 0);
-		}
-		/* end deprecated key format */
 	} else {
 		sbuf_push(buf, indent,
 			  "%sIPv6 Reachability: %s (Metric: %u)%s%s",
@@ -5552,22 +4928,6 @@ static void format_tlv_router_cap_json(const struct isis_router_cap *router_cap,
 	/* Router ID and Flags */
 	struct json_object *cap_json;
 
-#if CONFDATE > 20240916
-	CPP_NOTICE("remove deprecated key format with -")
-#endif
-	/* deprecated JSON key format */
-	cap_json = json_object_new_object();
-	json_object_object_add(json, "router-capability", cap_json);
-	inet_ntop(AF_INET, &router_cap->router_id, addrbuf, sizeof(addrbuf));
-	json_object_string_add(cap_json, "id", addrbuf);
-	json_object_string_add(
-		cap_json, "flag-d",
-		router_cap->flags & ISIS_ROUTER_CAP_FLAG_D ? "1" : "0");
-	json_object_string_add(
-		cap_json, "flag-s",
-		router_cap->flags & ISIS_ROUTER_CAP_FLAG_S ? "1" : "0");
-	/* end deprecated JSON key format */
-
 	cap_json = json_object_new_object();
 	json_object_object_add(json, "routerCapability", cap_json);
 	inet_ntop(AF_INET, &router_cap->router_id, addrbuf, sizeof(addrbuf));
@@ -5582,23 +4942,6 @@ static void format_tlv_router_cap_json(const struct isis_router_cap *router_cap,
 	if (router_cap->srgb.range_size != 0) {
 		struct json_object *gb_json;
 
-#if CONFDATE > 20240916
-		CPP_NOTICE("remove deprecated key format with -")
-#endif
-		/* deprecated old key format */
-		gb_json = json_object_new_object();
-		json_object_object_add(json, "segment-routing-gb", gb_json);
-		json_object_string_add(gb_json, "ipv4",
-				       IS_SR_IPV4(&router_cap->srgb) ? "1"
-								     : "0");
-		json_object_string_add(gb_json, "ipv6",
-				       IS_SR_IPV6(&router_cap->srgb) ? "1"
-								     : "0");
-		json_object_int_add(gb_json, "global-block-base",
-				    router_cap->srgb.lower_bound);
-		json_object_int_add(gb_json, "global-block-range",
-				    router_cap->srgb.range_size);
-
 		gb_json = json_object_new_object();
 		json_object_object_add(json, "segmentRoutingGb", gb_json);
 		json_object_boolean_add(gb_json, "ipv4",
@@ -5615,18 +4958,6 @@ static void format_tlv_router_cap_json(const struct isis_router_cap *router_cap,
 	if (router_cap->srlb.range_size != 0) {
 		struct json_object *lb_json;
 
-#if CONFDATE > 20240916
-		CPP_NOTICE("remove deprecated key format with -")
-#endif
-		/* old deprecated key format */
-		lb_json = json_object_new_object();
-		json_object_object_add(json, "segment-routing-lb", lb_json);
-		json_object_int_add(lb_json, "global-block-base",
-				    router_cap->srlb.lower_bound);
-		json_object_int_add(lb_json, "global-block-range",
-				    router_cap->srlb.range_size);
-		/* end old deprecated key format */
-
 		lb_json = json_object_new_object();
 		json_object_object_add(json, "segmentRoutingLb", lb_json);
 		json_object_int_add(lb_json, "globalBlockBase",
@@ -5640,23 +4971,6 @@ static void format_tlv_router_cap_json(const struct isis_router_cap *router_cap,
 		char buf[255];
 		struct json_object *alg_json;
 
-#if CONFDATE > 20240916
-		CPP_NOTICE("remove deprecated key format with -")
-#endif
-		/* old deprecated key format */
-		alg_json = json_object_new_object();
-		json_object_object_add(json, "segment-routing-algorithm",
-				       alg_json);
-		for (int i = 0; i < SR_ALGORITHM_COUNT; i++)
-			if (router_cap->algo[i] != SR_ALGORITHM_UNSET) {
-				snprintfrr(buf, sizeof(buf), "%d", i);
-				json_object_string_add(alg_json, buf,
-						       router_cap->algo[i] == 0
-							       ? "SPF"
-							       : "Strict SPF");
-			}
-		/* end old deprecated key format */
-
 		alg_json = json_object_new_object();
 		json_object_object_add(json, "segmentRoutingAlgorithm",
 				       alg_json);
@@ -6511,24 +5825,16 @@ static void format_item_auth(uint16_t mtid, struct isis_item *i,
 	struct isis_auth *auth = (struct isis_auth *)i;
 	char obuf[768];
 
-	if (json) {
-#if CONFDATE > 20240916
-		CPP_NOTICE("remove deprecated key format with -")
-#endif
-		json_object_string_add(json, "test-auth", "ok");
+	if (json)
 		json_object_string_add(json, "testAuth", "ok");
-	} else
+	else
 		sbuf_push(buf, indent, "Authentication:\n");
 	switch (auth->type) {
 	case ISIS_PASSWD_TYPE_CLEARTXT:
 		zlog_sanitize(obuf, sizeof(obuf), auth->value, auth->length);
-		if (json) {
-#if CONFDATE > 20240916
-			CPP_NOTICE("remove deprecated key format with -")
-#endif
-			json_object_string_add(json, "auth-pass", obuf);
+		if (json)
 			json_object_string_add(json, "authPass", obuf);
-		} else
+		else
 			sbuf_push(buf, indent, "  Password: %s\n", obuf);
 		break;
 	case ISIS_PASSWD_TYPE_HMAC_MD5:
@@ -6536,23 +5842,15 @@ static void format_item_auth(uint16_t mtid, struct isis_item *i,
 			snprintf(obuf + 2 * j, sizeof(obuf) - 2 * j, "%02hhx",
 				 auth->value[j]);
 		}
-		if (json) {
-#if CONFDATE > 20240916
-			CPP_NOTICE("remove deprecated key format with -")
-#endif
-			json_object_string_add(json, "auth-hmac-md5", obuf);
+		if (json)
 			json_object_string_add(json, "authHmacMd5", obuf);
-		} else
+		else
 			sbuf_push(buf, indent, "  HMAC-MD5: %s\n", obuf);
 		break;
 	default:
-		if (json) {
-#if CONFDATE > 20240916
-			CPP_NOTICE("remove deprecated key format with -")
-#endif
-			json_object_int_add(json, "auth-unknown", auth->type);
+		if (json)
 			json_object_int_add(json, "authUnknown", auth->type);
-		} else
+		else
 			sbuf_push(buf, indent, "  Unknown (%hhu)\n",
 				  auth->type);
 		break;
@@ -6668,18 +5966,6 @@ static void format_tlv_purge_originator(struct isis_purge_originator *poi,
 	if (json) {
 		struct json_object *purge_json;
 
-#if CONFDATE > 20240916
-		CPP_NOTICE("remove deprecated key format with -")
-#endif
-		/* old deprecated key format */
-		purge_json = json_object_new_object();
-		json_object_object_add(json, "purge_originator", purge_json);
-
-		json_object_string_add(purge_json, "id", gen_id);
-		if (poi->sender_set)
-			json_object_string_add(purge_json, "rec-from", sen_id);
-		/* end old deprecated key format */
-
 		purge_json = json_object_new_object();
 		json_object_object_add(json, "purgeOriginator", purge_json);
 
@@ -7229,33 +6515,6 @@ static void format_item_srv6_locator(uint16_t mtid, struct isis_item *i,
 	if (json) {
 		struct json_object *loc_json;
 
-#if CONFDATE > 20240916
-		CPP_NOTICE("remove deprecated key format with -")
-#endif
-		/* old json key format */
-		loc_json = json_object_new_object();
-		json_object_object_add(json, "srv6-locator", loc_json);
-		json_object_int_add(loc_json, "mt-id", mtid);
-		json_object_string_addf(loc_json, "prefix", "%pFX",
-					&loc->prefix);
-		json_object_int_add(loc_json, "metric", loc->metric);
-		json_object_string_add(
-			loc_json, "d-flag",
-			CHECK_FLAG(loc->flags, ISIS_TLV_SRV6_LOCATOR_FLAG_D)
-				? "yes"
-				: "");
-		json_object_int_add(loc_json, "algorithm", loc->algorithm);
-		json_object_string_add(loc_json, "mt-name",
-				       isis_mtid2str(mtid));
-		if (loc->subtlvs) {
-			struct json_object *subtlvs_json;
-			subtlvs_json = json_object_new_object();
-			json_object_object_add(loc_json, "subtlvs",
-					       subtlvs_json);
-			format_subtlvs(loc->subtlvs, NULL, subtlvs_json, 0);
-		}
-		/* old deprecated key format */
-
 		loc_json = json_object_new_object();
 		json_object_object_add(json, "srv6Locator", loc_json);
 		json_object_int_add(loc_json, "mtId", mtid);
@@ -7557,13 +6816,9 @@ static void format_tlvs(struct isis_tlvs *tlvs, struct sbuf *buf, struct json_ob
 		     &tlvs->area_addresses, buf, json, indent);
 
 	if (tlvs->mt_router_info_empty) {
-		if (json) {
-#if CONFDATE > 20240916
-			CPP_NOTICE("remove deprecated key format with -")
-#endif
-			json_object_string_add(json, "mt-router-info", "none");
+		if (json)
 			json_object_object_add(json, "mtRouterInfo", NULL);
-		} else
+		else
 			sbuf_push(buf, indent, "MT Router Info: None\n");
 	} else {
 		format_items(ISIS_CONTEXT_LSP, ISIS_TLV_MT_ROUTER_INFO,