diff options
| -rw-r--r-- | bgpd/bgp_packet.c | 7 | ||||
| -rw-r--r-- | tests/topotests/bgp_gr_notification/r1/bgpd.conf | 1 | ||||
| -rw-r--r-- | tests/topotests/bgp_gr_notification/r2/bgpd.conf | 1 | ||||
| -rw-r--r-- | tests/topotests/bgp_gr_notification/test_bgp_gr_notification.py | 43 |
4 files changed, 35 insertions, 17 deletions
diff --git a/bgpd/bgp_packet.c b/bgpd/bgp_packet.c index 9ebb2b21be..482e905636 100644 --- a/bgpd/bgp_packet.c +++ b/bgpd/bgp_packet.c @@ -1042,6 +1042,13 @@ static void bgp_notify_send_internal(struct peer_connection *connection, /* Add packet to peer's output queue */ stream_fifo_push(connection->obuf, s); + /* If Graceful-Restart N-bit (Notification) is exchanged, + * and it's not a Hard Reset, let's retain the routes. + */ + if (bgp_has_graceful_restart_notification(peer) && !hard_reset && + CHECK_FLAG(peer->sflags, PEER_STATUS_NSF_MODE)) + SET_FLAG(peer->sflags, PEER_STATUS_NSF_WAIT); + bgp_peer_gr_flags_update(peer); BGP_GR_ROUTER_DETECT_AND_SEND_CAPABILITY_TO_ZEBRA(peer->bgp, peer->bgp->peer); diff --git a/tests/topotests/bgp_gr_notification/r1/bgpd.conf b/tests/topotests/bgp_gr_notification/r1/bgpd.conf index 0af042f6be..bca5c33bc3 100644 --- a/tests/topotests/bgp_gr_notification/r1/bgpd.conf +++ b/tests/topotests/bgp_gr_notification/r1/bgpd.conf @@ -3,7 +3,6 @@ router bgp 65001 bgp graceful-restart neighbor 192.168.255.2 remote-as external neighbor 192.168.255.2 timers 1 3 - neighbor 192.168.255.2 timers delayopen 10 address-family ipv4 redistribute connected exit-address-family diff --git a/tests/topotests/bgp_gr_notification/r2/bgpd.conf b/tests/topotests/bgp_gr_notification/r2/bgpd.conf index 8325e21d2c..5e47f9dee3 100644 --- a/tests/topotests/bgp_gr_notification/r2/bgpd.conf +++ b/tests/topotests/bgp_gr_notification/r2/bgpd.conf @@ -4,7 +4,6 @@ router bgp 65002 bgp graceful-restart neighbor 192.168.255.1 remote-as external neighbor 192.168.255.1 timers 1 3 - neighbor 192.168.255.1 timers delayopen 10 address-family ipv4 redistribute connected exit-address-family diff --git a/tests/topotests/bgp_gr_notification/test_bgp_gr_notification.py b/tests/topotests/bgp_gr_notification/test_bgp_gr_notification.py index 7e39b83d8f..874ad09264 100644 --- a/tests/topotests/bgp_gr_notification/test_bgp_gr_notification.py +++ b/tests/topotests/bgp_gr_notification/test_bgp_gr_notification.py @@ -165,8 +165,8 @@ def test_bgp_administrative_reset_gr(): } return topotest.json_cmp(output, expected) - def _bgp_check_gr_notification_stale(): - output = json.loads(r1.vtysh_cmd("show bgp ipv4 unicast 172.16.255.2/32 json")) + def _bgp_check_gr_notification_stale(router, prefix): + output = json.loads(router.vtysh_cmd(f"show bgp ipv4 unicast {prefix} json")) expected = { "paths": [ { @@ -177,16 +177,6 @@ def test_bgp_administrative_reset_gr(): } return topotest.json_cmp(output, expected) - def _bgp_clear_r1_and_shutdown(): - r2.vtysh_cmd( - """ - clear ip bgp 192.168.255.1 - configure terminal - router bgp - neighbor 192.168.255.1 shutdown - """ - ) - def _bgp_verify_show_bgp_router_json(): output = json.loads(r1.vtysh_cmd("show bgp router json")) expected = { @@ -202,14 +192,37 @@ def test_bgp_administrative_reset_gr(): _, result = topotest.run_and_expect(test_func, None, count=60, wait=0.5) assert result is None, "Failed to see BGP convergence on R2" - step("Reset and shutdown R1") - _bgp_clear_r1_and_shutdown() + step("Reset and delay the session establishement for R1") + r1.vtysh_cmd( + """ + configure terminal" + router bgp + neighbor 192.168.255.2 timers delayopen 60 + """ + ) + r2.vtysh_cmd( + """ + configure terminal" + router bgp + neighbor 192.168.255.1 timers delayopen 60 + """ + ) + r2.vtysh_cmd("clear ip bgp 192.168.255.1") step("Check if stale routes are retained on R1") - test_func = functools.partial(_bgp_check_gr_notification_stale) + test_func = functools.partial( + _bgp_check_gr_notification_stale, r1, "172.16.255.2/32" + ) _, result = topotest.run_and_expect(test_func, None, count=60, wait=0.5) assert result is None, "Failed to see retained stale routes on R1" + step("Check if stale routes are retained on R2") + test_func = functools.partial( + _bgp_check_gr_notification_stale, r2, "172.16.255.1/32" + ) + _, result = topotest.run_and_expect(test_func, None, count=60, wait=0.5) + assert result is None, "Failed to see retained stale routes on R2" + step("Check if Hard Reset notification wasn't sent from R2") test_func = functools.partial(_bgp_check_hard_reset) _, result = topotest.run_and_expect(test_func, None, count=60, wait=0.5) |