diff options
Diffstat (limited to 'ospf6d')
| -rw-r--r-- | ospf6d/ospf6_gr_helper.c | 17 | ||||
| -rw-r--r-- | ospf6d/ospf6_lsa.c | 4 | ||||
| -rw-r--r-- | ospf6d/ospf6_top.c | 16 |
3 files changed, 1 insertions, 36 deletions
diff --git a/ospf6d/ospf6_gr_helper.c b/ospf6d/ospf6_gr_helper.c index 771a71024..661d37e63 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); } diff --git a/ospf6d/ospf6_lsa.c b/ospf6d/ospf6_lsa.c index 55ac7c88a..cd918d747 100644 --- a/ospf6d/ospf6_lsa.c +++ b/ospf6d/ospf6_lsa.c @@ -83,11 +83,7 @@ static int ospf6_unknown_lsa_show(struct vty *vty, struct ospf6_lsa *lsa, start = (uint8_t *)lsa->header + sizeof(struct ospf6_lsa_header); end = (uint8_t *)lsa->header + ntohs(lsa->header->length); -#if CONFDATE > 20230131 -CPP_NOTICE("Remove JSON object commands with keys starting with capital") -#endif if (use_json) { - json_object_string_add(json_obj, "LsaType", "unknown"); json_object_string_add(json_obj, "lsaType", "unknown"); } else { vty_out(vty, " Unknown contents:\n"); diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c index db45fa5f5..785a48a0a 100644 --- a/ospf6d/ospf6_top.c +++ b/ospf6d/ospf6_top.c @@ -2015,9 +2015,6 @@ ospf6_show_vrf_name(struct vty *vty, struct ospf6 *ospf6, } } -#if CONFDATE > 20230131 -CPP_NOTICE("Remove JSON object commands with keys containing whitespaces") -#endif static int ospf6_show_summary_address(struct vty *vty, struct ospf6 *ospf6, json_object *json, @@ -2037,8 +2034,6 @@ ospf6_show_summary_address(struct vty *vty, struct ospf6 *ospf6, ospf6_show_vrf_name(vty, ospf6, json_vrf); - json_object_int_add(json_vrf, "aggregation delay interval", - ospf6->aggr_delay_interval); json_object_int_add(json_vrf, "aggregationDelayInterval", ospf6->aggr_delay_interval); } @@ -2062,18 +2057,10 @@ ospf6_show_summary_address(struct vty *vty, struct ospf6 *ospf6, buf, json_aggr); - json_object_string_add(json_aggr, - "Summary address", - buf); json_object_string_add(json_aggr, "summaryAddress", buf); json_object_string_add( - json_aggr, "Metric-type", - (aggr->mtype == DEFAULT_METRIC_TYPE) - ? "E2" - : "E1"); - json_object_string_add( json_aggr, "metricType", (aggr->mtype == DEFAULT_METRIC_TYPE) ? "E2" : "E1"); @@ -2086,9 +2073,6 @@ ospf6_show_summary_address(struct vty *vty, struct ospf6 *ospf6, json_object_int_add(json_aggr, "Tag", aggr->tag); - json_object_int_add(json_aggr, - "External route count", - OSPF6_EXTERNAL_RT_COUNT(aggr)); json_object_int_add(json_aggr, "externalRouteCount", OSPF6_EXTERNAL_RT_COUNT(aggr)); |