]> git.puffer.fish Git - mirror/frr.git/commitdiff
bgpd: changing graceful-restart parameters should not be considered as error 8625/head
authorChristian Poessinger <christian@poessinger.com>
Tue, 4 May 2021 21:19:29 +0000 (23:19 +0200)
committerChristian Poessinger <christian@poessinger.com>
Tue, 4 May 2021 21:32:41 +0000 (23:32 +0200)
vtysh will return an informational message to the user that changing any
graceful-shutdown related parameter will require a peer reset. This is should
not be treated as an error message (resulting in a return code of 1) but
rather as a simple information to the user.

This fixes GitHub issue https://github.com/FRRouting/frr/issues/8403

$ vtysh -c configure -c 'router bgp 100' -c 'bgp graceful-restart'
Graceful restart configuration changed, reset all peers to take effect
$ echo $?
0

Signed-off-by: Christian Poessinger <christian@poessinger.com>
bgpd/bgp_vty.c

index 1e465d2620f91f1dc20795db56c541843b6cd341..78f3ccf6fa7d4fb1e4ebdf9260cfa2467a496879 100644 (file)
@@ -840,9 +840,6 @@ int bgp_vty_return(struct vty *vty, int ret)
        case BGP_ERR_GR_OPERATION_FAILED:
                str = "The Graceful Restart Operation failed due to an err.";
                break;
-       case BGP_GR_NO_OPERATION:
-               str = GR_NO_OPER;
-               break;
        }
        if (str) {
                vty_out(vty, "%% %s\n", str);