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 /pimd/pim_cmd_common.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 'pimd/pim_cmd_common.c')
| -rw-r--r-- | pimd/pim_cmd_common.c | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/pimd/pim_cmd_common.c b/pimd/pim_cmd_common.c index d220ae082f..9b571415fd 100644 --- a/pimd/pim_cmd_common.c +++ b/pimd/pim_cmd_common.c @@ -1140,42 +1140,24 @@ 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); |