bgpd: show BGP GR Neighbor mode as “NotApplicable”,when local mode is “Disable”.

BGP GR Neighbor mode is showing the default string as “NotRecieved”,
as the bgp gr neighbour capability was not processed,
since the local mode is “Disable”.
However now it would be changed to  “NotApplicable”.

Signed-off-by: Biswajit Sadhu <sadhub@vmware.com>
This commit is contained in:
bisdhdh 2019-10-24 09:04:05 +05:30
parent 5f9c1aa29e
commit 2bb5d39b14

View file

@ -9368,13 +9368,12 @@ static void bgp_show_neighbor_graceful_restart_remote_mode(
bool use_json,
json_object *json)
{
const char *mode = "NotReceived";
const char *mode = "NotApplicable";
if (!use_json)
vty_out(vty, "\n Remote GR Mode : ");
if (CHECK_FLAG(peer->cap, PEER_CAP_RESTART_ADV) &&
(CHECK_FLAG(peer->cap, PEER_CAP_RESTART_RCV)) &&
(peer->status == Established)) {
if ((peer->nsf_af_count == 0) &&
@ -9383,12 +9382,14 @@ static void bgp_show_neighbor_graceful_restart_remote_mode(
/*Gr disabled case*/
mode = "Disable";
} else if (peer->nsf_af_count == 0) {
} else if (peer->nsf_af_count == 0 &&
CHECK_FLAG(peer->cap, PEER_CAP_RESTART_RCV)) {
/* Helper */
mode = "Helper";
} else if (peer->nsf_af_count != 0) {
} else if (peer->nsf_af_count != 0 &&
CHECK_FLAG(peer->cap, PEER_CAP_RESTART_RCV)) {
/* Restart */
mode = "Restart";