ospf,ospf6: fix json key typo supoort

Fix json key 'supoort' -> 'support'; add 1-year deprecation
notice; fix topotests to use corrected json key.

Signed-off-by: Mark Stapp <mjs@labn.net>

diff --git a/ospf6d/ospf6_gr_helper.c b/ospf6d/ospf6_gr_helper.c
index d313510cfa31d281f5cd460f5aa62c8dd6b1a39b..216d78c1cc4a3e60efc489261c7427edb4677406 100644 (file)
--- a/ospf6d/ospf6_gr_helper.c
+++ b/ospf6d/ospf6_gr_helper.c
@@ -937,12 +937,22 @@ static void show_ospf6_gr_helper_details(struct vty *vty, struct ospf6 *ospf6,
                        (ospf6->ospf6_helper_cfg.strict_lsa_check)
                                ? "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)
+                               ? "Planned Restart only"
+                               : "Planned and Unplanned Restarts");
+
                json_object_int_add(
                        json, "supportedGracePeriod",
                        ospf6->ospf6_helper_cfg.supported_grace_time);

diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index d3d67ee88446cd99fe8fb64ed2fe76fd9f63dbf8..9398021e97a37d2c8ce52c6e55a8a6b75dc17cad 100644 (file)
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -10080,12 +10080,21 @@ 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)
+                               ? "Planned Restart only"
+                               : "Planned and Unplanned Restarts");
+
                json_object_int_add(json_vrf, "supportedGracePeriod",
                                    ospf->supported_grace_time);
 

diff --git a/tests/topotests/lib/ospf.py b/tests/topotests/lib/ospf.py
index 23b1f2e533cf7ba394d6fe90c9485f557607fc35..4a018a08dbe207298171654fbe0266c793fb49eb 100644 (file)
--- a/tests/topotests/lib/ospf.py
+++ b/tests/topotests/lib/ospf.py
@@ -2477,7 +2477,7 @@ def verify_ospf_gr_helper(tgen, topo, dut, input_dict=None):
     input_dict = {
                     "helperSupport":"Disabled",
                     "strictLsaCheck":"Enabled",
-                    "restartSupoort":"Planned and Unplanned Restarts",
+                    "restartSupport":"Planned and Unplanned Restarts",
                     "supportedGracePeriod":1800
                 }
     result = verify_ospf_gr_helper(tgen, topo, dut, input_dict)

diff --git a/tests/topotests/ospf_gr_helper/test_ospf_gr_helper1.py b/tests/topotests/ospf_gr_helper/test_ospf_gr_helper1.py
index 9dce5a976de41351f04cba5a11c55ec9c300d645..79374281cb7a3ff289c792186f888be22c9b7089 100644 (file)
--- a/tests/topotests/ospf_gr_helper/test_ospf_gr_helper1.py
+++ b/tests/topotests/ospf_gr_helper/test_ospf_gr_helper1.py
@@ -188,7 +188,7 @@ def test_ospf_gr_helper_tc1_p0(request):
     input_dict = {
         "helperSupport": "Disabled",
         "strictLsaCheck": "Enabled",
-        "restartSupoort": "Planned and Unplanned Restarts",
+        "restartSupport": "Planned and Unplanned Restarts",
         "supportedGracePeriod": 1800,
     }
     dut = "r0"
@@ -220,7 +220,7 @@ def test_ospf_gr_helper_tc1_p0(request):
     input_dict = {
         "helperSupport": "Enabled",
         "strictLsaCheck": "Enabled",
-        "restartSupoort": "Planned and Unplanned Restarts",
+        "restartSupport": "Planned and Unplanned Restarts",
         "supportedGracePeriod": 1800,
     }
     dut = "r0"