proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-11 11:21:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #10837 from opensourcerouting/fix/consistent_JSON_keys_for_ospf_neighbor

Browse Source 
ospfd: Use consistent JSON keys for `show ip ospf neighbor` and detai…
This commit is contained in:
Russ White 2022-03-29 11:14:05 -04:00 committed by GitHub
commit 1f1d8f03de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ospfd/ospf_vty.c
View File

@ -4395,11 +4395,18 @@ static void show_ip_ospf_neighbor_sub(struct vty *vty,
json_neighbor = json_object_new_object();
ospf_nbr_ism_state_message(nbr, msgbuf, 16);
#if CONFDATE > 20230321
CPP_NOTICE("Remove show_ip_ospf_neighbor_sub() JSON keys: priority, state, deadTimeMsecs, address, retransmitCounter, requestCounter, dbSummaryCounter")
#endif
json_object_int_add(json_neighbor, "priority",
nbr->priority);
json_object_string_add(json_neighbor, "state",
msgbuf);
json_object_int_add(json_neighbor,
"nbrPriority",
nbr->priority);
json_object_string_add(json_neighbor,
"nbrState", msgbuf);
json_object_string_add(
json_neighbor, "converged",
@ -4425,6 +4432,10 @@ static void show_ip_ospf_neighbor_sub(struct vty *vty,
json_object_int_add(json_neighbor,
"deadTimeMsecs",
time_store);
json_object_int_add(
json_neighbor,
"routerDeadIntervalTimerDueMsec",
time_store);
json_object_string_add(
json_neighbor, "upTime",
ospf_timeval_dump(
@ -4440,22 +4451,41 @@ static void show_ip_ospf_neighbor_sub(struct vty *vty,
json_object_string_add(json_neighbor,
"deadTimeMsecs",
"inactive");
json_object_string_add(
json_neighbor,
"routerDeadIntervalTimerDueMsec",
"inactive");
}
json_object_string_addf(json_neighbor,
"address", "%pI4",
&nbr->src);
json_object_string_addf(json_neighbor,
"ifaceAddress", "%pI4",
&nbr->src);
json_object_string_add(json_neighbor,
"ifaceName",
IF_NAME(oi));
json_object_int_add(
json_neighbor, "retransmitCounter",
ospf_ls_retransmit_count(nbr));
json_object_int_add(
json_neighbor,
"linkStateRetransmissionListCounter",
ospf_ls_retransmit_count(nbr));
json_object_int_add(json_neighbor,
"requestCounter",
ospf_ls_request_count(nbr));
json_object_int_add(
json_neighbor,
"linkStateRequestListCounter",
ospf_ls_request_count(nbr));
json_object_int_add(json_neighbor,
"dbSummaryCounter",
ospf_db_summary_count(nbr));
json_object_int_add(
json_neighbor,
"databaseSummaryListCounter",
ospf_db_summary_count(nbr));
json_object_array_add(json_neigh_array,
json_neighbor);