proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-04-28 13:20:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

*: Drop deprecated incorrect JSON fields with wrong naming

Browse Source 
Deprecation cycle already passed.

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
This commit is contained in:
Donatas Abraitis 2023-01-31 10:18:28 +02:00
parent 9eca0bdc02
commit 1ce23106eb
9 changed files with 4 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bgpd/bgp_labelpool.c
View File

@ -743,22 +743,12 @@ DEFUN(show_bgp_labelpool_summary, show_bgp_labelpool_summary_cmd,
if (uj) {
json = json_object_new_object();
#if CONFDATE > 20230131
CPP_NOTICE("Remove JSON object commands with keys starting with capital")
#endif
json_object_int_add(json, "Ledger", skiplist_count(lp->ledger));
json_object_int_add(json, "ledger", skiplist_count(lp->ledger));
json_object_int_add(json, "InUse", skiplist_count(lp->inuse));
json_object_int_add(json, "inUse", skiplist_count(lp->inuse));
json_object_int_add(json, "Requests",
lp_fifo_count(&lp->requests));
json_object_int_add(json, "requests",
lp_fifo_count(&lp->requests));
json_object_int_add(json, "LabelChunks", listcount(lp->chunks));
json_object_int_add(json, "labelChunks", listcount(lp->chunks));
json_object_int_add(json, "Pending", lp->pending_count);
json_object_int_add(json, "pending", lp->pending_count);
json_object_int_add(json, "Reconnects", lp->reconnect_count);
json_object_int_add(json, "reconnects", lp->reconnect_count);
vty_json(vty, json);
} else {

7
bgpd/bgp_route.c
View File

@ -9858,8 +9858,6 @@ void route_vty_out_overlay(struct vty *vty, const struct prefix *p,
if (!json_path) {
vty_out(vty, "?");
} else {
json_object_string_add(json_nexthop, "Error",
"Unsupported address-family");
json_object_string_add(json_nexthop, "error",
"Unsupported address-family");
}
@ -10227,12 +10225,9 @@ void route_vty_out_detail(struct vty *vty, struct bgp *bgp, struct bgp_dest *bn,
if (tag_buf[0] != '\0')
vty_out(vty, " VNI %s", tag_buf);
} else {
if (tag_buf[0]) {
json_object_string_add(json_path, "VNI",
tag_buf);
if (tag_buf[0])
json_object_string_add(json_path, "vni",
tag_buf);
}
}
}
}

4
ldpd/ldp_vty_exec.c
View File

@ -1472,10 +1472,6 @@ show_l2vpn_pw_msg_json(struct imsg *imsg, struct show_params *params,
json_pw = json_object_new_object();
json_object_string_addf(json_pw, "peerId", "%pI4", &pw->lsr_id);
json_object_int_add(json_pw, "vcId", pw->pwid);
#if CONFDATE > 20230131
CPP_NOTICE("Remove JSON object commands with keys starting with capital")
#endif
json_object_string_add(json_pw, "VpnName", pw->l2vpn_name);
json_object_string_add(json_pw, "vpnName", pw->l2vpn_name);
if (pw->status == PW_FORWARDING)
json_object_string_add(json_pw, "status", "up");

17
ospf6d/ospf6_gr_helper.c
View File

@ -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(
@ -1009,18 +1000,12 @@ CPP_NOTICE("Remove JSON object commands with keys starting with capital")
struct ospf6_neighbor *nbr;
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);

4
ospf6d/ospf6_lsa.c
View File

@ -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");

16
ospf6d/ospf6_top.c
View File

@ -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,17 +2057,9 @@ 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"
@ -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));

7
ospfd/ospf_ldp_sync.c
View File

@ -507,15 +507,8 @@ void ospf_ldp_sync_show_info(struct vty *vty, struct ospf *ospf,
if (CHECK_FLAG(ospf->ldp_sync_cmd.flags, LDP_SYNC_FLAG_ENABLE)) {
if (use_json) {
#if CONFDATE > 20230131
CPP_NOTICE("Remove JSON object commands with keys starting with capital")
#endif
json_object_boolean_true_add(json_vrf,
"MplsLdpIgpSyncEnabled");
json_object_boolean_true_add(json_vrf,
"mplsLdpIgpSyncEnabled");
json_object_int_add(json_vrf, "MplsLdpIgpSyncHolddown",
ospf->ldp_sync_cmd.holddown);
json_object_int_add(json_vrf, "mplsLdpIgpSyncHolddown",
ospf->ldp_sync_cmd.holddown);
} else {

57
ospfd/ospf_vty.c
View File

@ -10214,17 +10214,10 @@ static int ospf_show_gr_helper_details(struct vty *vty, struct ospf *ospf,
json_object_int_add(json_vrf, "supportedGracePeriod",
ospf->supported_grace_time);
#if CONFDATE > 20230131
CPP_NOTICE("Remove JSON object commands with keys starting with capital")
#endif
if (ospf->last_exit_reason != OSPF_GR_HELPER_EXIT_NONE) {
json_object_string_add(
json_vrf, "LastExitReason",
ospf_exit_reason2str(ospf->last_exit_reason));
if (ospf->last_exit_reason != OSPF_GR_HELPER_EXIT_NONE)
json_object_string_add(
json_vrf, "lastExitReason",
ospf_exit_reason2str(ospf->last_exit_reason));
}
if (ospf->active_restarter_cnt)
json_object_int_add(json_vrf, "activeRestarterCnt",
@ -10257,16 +10250,11 @@ CPP_NOTICE("Remove JSON object commands with keys starting with capital")
continue;
if (uj) {
json_object_object_get_ex(json_vrf, "Neighbors",
&json_neighbors);
json_object_object_get_ex(json_vrf, "neighbors",
&json_neighbors);
if (!json_neighbors) {
json_neighbors =
json_object_new_object();
json_object_object_add(json_vrf,
"Neighbors",
json_neighbors);
json_object_object_add(json_vrf,
"neighbors",
json_neighbors);
@ -10563,9 +10551,6 @@ static void config_write_stub_router(struct vty *vty, struct ospf *ospf)
return;
}
#if CONFDATE > 20230131
CPP_NOTICE("Remove JSON object commands with keys containing whitespaces")
#endif
static void show_ip_ospf_route_network(struct vty *vty, struct ospf *ospf,
struct route_table *rt,
json_object *json)
@ -10667,12 +10652,6 @@ static void show_ip_ospf_route_network(struct vty *vty, struct ospf *ospf,
json_object_string_add(
json_nexthop,
"ip", " ");
json_object_string_add(
json_nexthop,
"directly attached to",
ifindex2ifname(
path->ifindex,
ospf->vrf_id));
json_object_string_add(
json_nexthop,
"directlyAttachedTo",
@ -10816,12 +10795,6 @@ static void show_ip_ospf_route_router(struct vty *vty, struct ospf *ospf,
json_object_string_add(
json_nexthop,
"ip", " ");
json_object_string_add(
json_nexthop,
"directly attached to",
ifindex2ifname(
path->ifindex,
ospf->vrf_id));
json_object_string_add(
json_nexthop,
"directlyAttachedTo",
@ -10948,12 +10921,6 @@ static void show_ip_ospf_route_external(struct vty *vty, struct ospf *ospf,
json_object_string_add(
json_nexthop, "ip",
" ");
json_object_string_add(
json_nexthop,
"directly attached to",
ifindex2ifname(
path->ifindex,
ospf->vrf_id));
json_object_string_add(
json_nexthop,
"directlyAttachedTo",
@ -11664,8 +11631,6 @@ static int ospf_show_summary_address(struct vty *vty, struct ospf *ospf,
vty_out(vty, "aggregation delay interval :%u(in seconds)\n\n",
ospf->aggr_delay_interval);
} else {
json_object_int_add(json_vrf, "aggregation delay interval",
ospf->aggr_delay_interval);
json_object_int_add(json_vrf, "aggregationDelayInterval",
ospf->aggr_delay_interval);
}
@ -11684,37 +11649,17 @@ static int ospf_show_summary_address(struct vty *vty, struct ospf *ospf,
json_object_object_add(json_vrf, 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",
(mtype == EXTERNAL_METRIC_TYPE_1)
? "E1"
: "E2");
json_object_string_add(
json_aggr, "metricType",
(mtype == EXTERNAL_METRIC_TYPE_1)
? "E1"
: "E2");
#if CONFDATE > 20230131
CPP_NOTICE("Remove JSON object commands with keys starting with capital")
#endif
json_object_int_add(json_aggr, "Metric", mval);
json_object_int_add(json_aggr, "metric", mval);
json_object_int_add(json_aggr, "Tag",
aggr->tag);
json_object_int_add(json_aggr, "tag",
aggr->tag);
json_object_int_add(
json_aggr, "External route count",
OSPF_EXTERNAL_RT_COUNT(aggr));
json_object_int_add(
json_aggr, "externalRouteCount",
OSPF_EXTERNAL_RT_COUNT(aggr));

28
pimd/pim_cmd_common.c
View File

@ -1140,41 +1140,23 @@ void pim_show_state(struct pim_instance *pim, struct vty *vty,
json_ifp_in = json_object_new_object();
json_object_object_add(json_source, in_ifname,
json_ifp_in);
json_object_int_add(json_source, "Installed",
c_oil->installed);
json_object_int_add(json_source, "installed",
c_oil->installed);
json_object_boolean_add(json_source, "isRpt",
isRpt);
json_object_int_add(json_source, "RefCount",
c_oil->oil_ref_count);
json_object_int_add(json_source, "refCount",
c_oil->oil_ref_count);
json_object_int_add(json_source, "OilListSize",
c_oil->oil_size);
json_object_int_add(json_source, "oilListSize",
c_oil->oil_size);
json_object_int_add(
json_source, "OilRescan",
c_oil->oil_inherited_rescan);
json_object_int_add(
json_source, "oilRescan",
c_oil->oil_inherited_rescan);
json_object_int_add(json_source, "LastUsed",
c_oil->cc.lastused);
json_object_int_add(json_source, "lastUsed",
c_oil->cc.lastused);
json_object_int_add(json_source, "PacketCount",
c_oil->cc.pktcnt);
json_object_int_add(json_source, "packetCount",
c_oil->cc.pktcnt);
json_object_int_add(json_source, "ByteCount",
c_oil->cc.bytecnt);
json_object_int_add(json_source, "byteCount",
c_oil->cc.bytecnt);
json_object_int_add(json_source,
"WrongInterface",
c_oil->cc.wrong_if);
json_object_int_add(json_source,
"wrongInterface",
c_oil->cc.wrong_if);
@ -1728,14 +1710,8 @@ static void pim_show_join_helper(struct pim_interface *pim_ifp,
json_object_string_add(
json_row, "channelJoinName",
pim_ifchannel_ifjoin_name(ch->ifjoin_state, ch->flags));
if (PIM_IF_FLAG_TEST_S_G_RPT(ch->flags)) {
#if CONFDATE > 20230131
CPP_NOTICE(
"Remove JSON object commands with keys starting with capital")
#endif
json_object_int_add(json_row, "SGRpt", 1);
if (PIM_IF_FLAG_TEST_S_G_RPT(ch->flags))
json_object_int_add(json_row, "sgRpt", 1);
}
if (PIM_IF_FLAG_TEST_PROTO_PIM(ch->flags))
json_object_int_add(json_row, "protocolPim", 1);
if (PIM_IF_FLAG_TEST_PROTO_IGMP(ch->flags))
@ -3786,8 +3762,6 @@ void show_mroute(struct pim_instance *pim, struct vty *vty, pim_sgaddr *sg,
c_oil->oil_ref_count);
json_object_int_add(json_source, "oilSize",
c_oil->oil_size);
json_object_int_add(json_source, "OilInheritedRescan",
c_oil->oil_inherited_rescan);
json_object_int_add(json_source, "oilInheritedRescan",
c_oil->oil_inherited_rescan);
json_object_string_add(json_source, "iif", in_ifname);