]> git.puffer.fish Git - matthieu/frr.git/commitdiff
bgpd: changing graceful-restart parameters should not be considered as error
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:33:19 +0000 (23:33 +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>
(cherry picked from commit 5b899e99fe25f3edba1fdba2b6686a9aa8c56b6b)

bgpd/bgp_vty.c

index 40dd3681255247405ea662c0f33e8e9455c85f7a..af7113c97462f914b20e1df6e9572fe155be691e 100644 (file)
@@ -731,9 +731,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);