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

bgpd: Format properly show bgp neighbors for graceful restart stuff

Browse Source 
Before:

```
  Graceful restart informations:
    End-of-RIB send: IPv4 Unicast
    End-of-RIB received: IPv4 Unicast
    Local GR Mode  : Helper*
    Remote GR Mode : Helper
    R bit          : False
    Timers :
     Configured Restart Time(sec)  : 120
     Received Restart Time(sec)    : 120
    IPv4 Unicast :
     F bit                 : False
     End-of-RIB Received   : Yes
     End-of-RIB Send       : Yes
     EoRSentAfterUpdate   : Yes
     Timers:
      Configured Stale Path Time(sec)        : 360
```

After:

```
  Graceful restart informations:
    End-of-RIB send: IPv4 Unicast
    End-of-RIB received: IPv4 Unicast
    Local GR Mode: Helper*
    Remote GR Mode: Helper
    R bit: False
    Timers:
      Configured Restart Time(sec): 120
      Received Restart Time(sec): 120
    IPv4 Unicast:
      F bit: False
      End-of-RIB sent: Yes
      End-of-RIB sent after update: Yes
      End-of-RIB received: Yes
      Timers:
        Configured Stale Path Time(sec): 360
```

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
This commit is contained in:
Donatas Abraitis 2020-02-10 13:59:05 +02:00
parent f94ed830df
commit a53ca37b89
1 changed files with 54 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
bgpd/bgp_vty.c
View File

@ -9606,7 +9606,41 @@ static void bgp_show_neighbor_graceful_restart_capability_per_afi_safi(
} }
if (!use_json) if (!use_json)
vty_out(vty, " End-of-RIB Received : "); vty_out(vty, " End-of-RIB sent: ");
if (CHECK_FLAG(peer->af_sflags[afi][safi],
PEER_STATUS_EOR_SEND)) {
if (use_json) {
json_object_boolean_true_add(
json_endofrib_status,
"endOfRibSend");
PRINT_EOR_JSON(eor_flag);
} else {
vty_out(vty, "Yes\n");
vty_out(vty,
" End-of-RIB sent after update: ");
PRINT_EOR(eor_flag);
}
} else {
if (use_json) {
json_object_boolean_false_add(
json_endofrib_status,
"endOfRibSend");
json_object_boolean_false_add(
json_endofrib_status,
"endOfRibSentAfterUpdate");
} else {
vty_out(vty, "No\n");
vty_out(vty,
" End-of-RIB sent after update: ");
vty_out(vty, "No\n");
}
}
if (!use_json)
vty_out(vty, " End-of-RIB received: ");
if (CHECK_FLAG(peer->af_sflags[afi][safi], if (CHECK_FLAG(peer->af_sflags[afi][safi],
PEER_STATUS_EOR_RECEIVED)) { PEER_STATUS_EOR_RECEIVED)) {
@ -9625,40 +9659,6 @@ static void bgp_show_neighbor_graceful_restart_capability_per_afi_safi(
vty_out(vty, "No\n"); vty_out(vty, "No\n");
} }
if (!use_json)
vty_out(vty, " End-of-RIB Send : ");
if (CHECK_FLAG(peer->af_sflags[afi][safi],
PEER_STATUS_EOR_SEND)) {
if (use_json) {
json_object_boolean_true_add(
json_endofrib_status,
"endOfRibSend");
PRINT_EOR_JSON(eor_flag);
} else {
vty_out(vty, "Yes\n");
vty_out(vty,
" EoRSentAfterUpdate : ");
PRINT_EOR(eor_flag);
}
} else {
if (use_json) {
json_object_boolean_false_add(
json_endofrib_status,
"endOfRibSend");
json_object_boolean_false_add(
json_endofrib_status,
"endOfRibSentAfterUpdate");
} else {
vty_out(vty, "No\n");
vty_out(vty,
" EoRSentAfterUpdate : ");
vty_out(vty, "No\n");
}
}
if (use_json) { if (use_json) {
json_object_int_add(json_timer, json_object_int_add(json_timer,
"stalePathTimer", "stalePathTimer",
@ -9699,37 +9699,28 @@ static void bgp_show_neighbor_graceful_restart_capability_per_afi_safi(
} }
} else { } else {
vty_out(vty, " Timers:\n"); vty_out(vty, " Timers:\n");
vty_out(vty, "%*s", 6, "");
vty_out(vty, vty_out(vty,
"Configured Stale Path Time(sec)%*s: %u\n", " Configured Stale Path Time(sec): %u\n",
8, "", peer->bgp->stalepath_time); peer->bgp->stalepath_time);
if (peer->t_gr_stale != NULL) { if (peer->t_gr_stale != NULL)
vty_out(vty, "%*s", 6, "");
vty_out(vty, vty_out(vty,
"Stale Path Remaining(sec)%*s: %ld\n", " Stale Path Remaining(sec): %ld\n",
14, "",
thread_timer_remain_second( thread_timer_remain_second(
peer->t_gr_stale)); peer->t_gr_stale));
}
/* Display Configured Selection /* Display Configured Selection
* Deferral only when when * Deferral only when when
* Gr mode is enabled. * Gr mode is enabled.
*/ */
if (CHECK_FLAG(peer->flags, if (CHECK_FLAG(peer->flags,
PEER_FLAG_GRACEFUL_RESTART)) { PEER_FLAG_GRACEFUL_RESTART))
vty_out(vty, "%*s", 6, "");
vty_out(vty, vty_out(vty,
" Configured Selection Deferral Time(sec): %u\n", " Configured Selection Deferral Time(sec): %u\n",
peer->bgp->select_defer_time); peer->bgp->select_defer_time);
}
if (peer->bgp->gr_info[afi][safi] if (peer->bgp->gr_info[afi][safi]
.t_select_deferral .t_select_deferral
!= NULL) { != NULL)
vty_out(vty, "%*s", 6, "");
vty_out(vty, vty_out(vty,
" Selection Deferral Time Remaining(sec): %ld\n", " Selection Deferral Time Remaining(sec): %ld\n",
thread_timer_remain_second( thread_timer_remain_second(
@ -9738,7 +9729,6 @@ static void bgp_show_neighbor_graceful_restart_capability_per_afi_safi(
[safi] [safi]
.t_select_deferral)); .t_select_deferral));
} }
}
if (use_json) { if (use_json) {
json_object_object_add(json_afi_safi, json_object_object_add(json_afi_safi,
"endOfRibStatus", "endOfRibStatus",
@ -9784,12 +9774,10 @@ static void bgp_show_neighbor_graceful_restart_time(struct vty *vty,
vty_out(vty, " Received Restart Time(sec): %u\n", vty_out(vty, " Received Restart Time(sec): %u\n",
p->v_gr_restart); p->v_gr_restart);
if (p->t_gr_restart != NULL) if (p->t_gr_restart != NULL)
vty_out(vty, vty_out(vty, " Restart Time Remaining(sec): %ld\n",
" Restart Time Remaining(sec) : %ld\n",
thread_timer_remain_second(p->t_gr_restart)); thread_timer_remain_second(p->t_gr_restart));
if (p->t_gr_restart != NULL) { if (p->t_gr_restart != NULL) {
vty_out(vty, vty_out(vty, " Restart Time Remaining(sec): %ld\n",
" Restart Time Remaining(sec) : %ld\n",
thread_timer_remain_second(p->t_gr_restart)); thread_timer_remain_second(p->t_gr_restart));
} }
} }