diff options
| author | Donald Sharp <donaldsharp72@gmail.com> | 2023-02-01 15:39:18 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-01 15:39:18 -0500 |
| commit | 33303f08bf179431326a65f394b76f5c0ca1e71e (patch) | |
| tree | b1d2c5e517de3658dd5e3d90beda169d485d27c1 /ospf6d/ospf6_gr_helper.c | |
| parent | b54ec1733b4cbf52911a3922026bc5112e2810be (diff) | |
| parent | f932966b02478cf3a3dd443d98eea7cc95c8379a (diff) | |
Merge pull request #12713 from opensourcerouting/fix/json_naming_deprecation
*: Drop deprecated incorrect JSON fields with wrong naming
Diffstat (limited to 'ospf6d/ospf6_gr_helper.c')
| -rw-r--r-- | ospf6d/ospf6_gr_helper.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/ospf6d/ospf6_gr_helper.c b/ospf6d/ospf6_gr_helper.c index 771a710240..661d37e637 100644 --- a/ospf6d/ospf6_gr_helper.c +++ b/ospf6d/ospf6_gr_helper.c @@ -963,22 +963,13 @@ static void show_ospf6_gr_helper_details(struct vty *vty, struct ospf6 *ospf6, json, "supportedGracePeriod", ospf6->ospf6_helper_cfg.supported_grace_time); -#if CONFDATE > 20230131 -CPP_NOTICE("Remove JSON object commands with keys starting with capital") -#endif if (ospf6->ospf6_helper_cfg.last_exit_reason != - OSPF6_GR_HELPER_EXIT_NONE) { - json_object_string_add( - json, "LastExitReason", - ospf6_exit_reason_desc - [ospf6->ospf6_helper_cfg - .last_exit_reason]); + OSPF6_GR_HELPER_EXIT_NONE) json_object_string_add( json, "lastExitReason", ospf6_exit_reason_desc [ospf6->ospf6_helper_cfg .last_exit_reason]); - } if (ospf6->ospf6_helper_cfg.active_restarter_cnt) json_object_int_add( @@ -1010,18 +1001,12 @@ CPP_NOTICE("Remove JSON object commands with keys starting with capital") if (uj) { json_object_object_get_ex( - json, "Neighbors", - &json_neighbors); - json_object_object_get_ex( json, "neighbors", &json_neighbors); if (!json_neighbors) { json_neighbors = json_object_new_object(); json_object_object_add( - json, "Neighbors", - json_neighbors); - json_object_object_add( json, "neighbors", json_neighbors); } |