summaryrefslogtreecommitdiffstats
path: root/pimd
diff options
context:
space:
mode:
authorQuentin Young <qlyoung@cumulusnetworks.com>2020-04-06 05:53:02 +0200
committerQuentin Young <qlyoung@cumulusnetworks.com>2020-04-06 05:54:12 +0200
commita5f610e4748cc62b2ad74b4185104d9102ac87fc (patch)
tree6e19f6d04456bd5c9b3b910cc813cd33f5f275ee /pimd
parentMerge pull request #6105 from vivek-cumulus/bgp_link_bandwidth_unequal_cost_m... (diff)
downloadfrr-a5f610e4748cc62b2ad74b4185104d9102ac87fc.tar.xz
frr-a5f610e4748cc62b2ad74b4185104d9102ac87fc.zip
pimd: fix BSM JSON keys
We use camelCase keys in FRR. Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Diffstat (limited to 'pimd')
-rw-r--r--pimd/pim_cmd.c23
1 files changed, 9 insertions, 14 deletions
diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index 0c14aff9f..e94d15eff 100644
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -3319,12 +3319,9 @@ static void pim_show_statistics(struct pim_instance *pim, struct vty *vty,
if (uj) {
json = json_object_new_object();
- json_object_int_add(json, "Number of Received BSMs",
- pim->bsm_rcvd);
- json_object_int_add(json, "Number of Forwared BSMs",
- pim->bsm_sent);
- json_object_int_add(json, "Number of Dropped BSMs",
- pim->bsm_dropped);
+ json_object_int_add(json, "bsmRx", pim->bsm_rcvd);
+ json_object_int_add(json, "bsmTx", pim->bsm_sent);
+ json_object_int_add(json, "bsmDropped", pim->bsm_dropped);
} else {
vty_out(vty, "BSM Statistics :\n");
vty_out(vty, "----------------\n");
@@ -3366,15 +3363,13 @@ static void pim_show_statistics(struct pim_instance *pim, struct vty *vty,
json_row = json_object_new_object();
json_object_string_add(json_row, "If Name", ifp->name);
+ json_object_int_add(json_row, "bsmDroppedConfig",
+ pim_ifp->pim_ifstat_bsm_cfg_miss);
json_object_int_add(
- json_row,
- "Number of BSMs dropped due to config miss",
- pim_ifp->pim_ifstat_bsm_cfg_miss);
- json_object_int_add(
- json_row, "Number of unicast BSMs dropped",
+ json_row, "bsmDroppedUnicast",
pim_ifp->pim_ifstat_ucast_bsm_cfg_miss);
json_object_int_add(json_row,
- "Number of BSMs dropped due to invalid scope zone",
+ "bsmDroppedInvalidScopeZone",
pim_ifp->pim_ifstat_bsm_invalid_sz);
json_object_object_add(json, ifp->name, json_row);
}
@@ -3776,11 +3771,11 @@ static void pim_show_bsr(struct pim_instance *pim,
json_object_string_add(json, "bsr", bsr_str);
json_object_int_add(json, "priority",
pim->global_scope.current_bsr_prio);
- json_object_int_add(json, "fragment_tag",
+ json_object_int_add(json, "fragmentTag",
pim->global_scope.bsm_frag_tag);
json_object_string_add(json, "state", bsr_state);
json_object_string_add(json, "upTime", uptime);
- json_object_string_add(json, "last_bsm_seen", last_bsm_seen);
+ json_object_string_add(json, "lastBsmSeen", last_bsm_seen);
}
else {