Merge pull request #15724 from opensourcerouting/fix/ospfd_cleanup_de…

…precation ospfd, ospf6d: Remove deprecated JSON fields
FRRouting · Apr 15, 2024 · 572b6f3 · 572b6f3
2 parents 2b813ab + 8f7bc62
commit 572b6f3
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 18 deletions.
diff --git a/ospf6d/ospf6_gr_helper.c b/ospf6d/ospf6_gr_helper.c
@@ -938,15 +938,6 @@ static void show_ospf6_gr_helper_details(struct vty *vty, struct ospf6 *ospf6,
 				? "Enabled"
 				: "Disabled");
 
-#if CONFDATE > 20240401
-		CPP_NOTICE("Remove deprecated json key: restartSupoort")
-#endif
-		json_object_string_add(
-			json, "restartSupoort",
-			(ospf6->ospf6_helper_cfg.only_planned_restart)
-				? "Planned Restart only"
-				: "Planned and Unplanned Restarts");
-
 		json_object_string_add(
 			json, "restartSupport",
 			(ospf6->ospf6_helper_cfg.only_planned_restart)

diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
@@ -10446,15 +10446,6 @@ static int ospf_show_gr_helper_details(struct vty *vty, struct ospf *ospf,
 		json_object_string_add(json_vrf, "strictLsaCheck",
 				       (ospf->strict_lsa_check) ? "Enabled"
 								: "Disabled");
-#if CONFDATE > 20240401
-		CPP_NOTICE("Remove deprecated json key: restartSupoort")
-#endif
-		json_object_string_add(
-			json_vrf, "restartSupoort",
-			(ospf->only_planned_restart)
-				? "Planned Restart only"
-				: "Planned and Unplanned Restarts");
-
 		json_object_string_add(
 			json_vrf, "restartSupport",
 			(ospf->only_planned_restart)