bgpd: Ignore peer GR commands that are effectively not operable

The code used to treat a repeated GR configuration on a peer or some other inappropriate command (e.g., trying to remove 'helper' configuration when it is not present) as errors. Instead, just ignore these. This is more in line with other behavior. Signed-off-by: Vivek Venkatraman <[email protected]> Ticket: #2736244, #2736249 Testing Done: 1. Manual testing - documented in the RM tickets 2. Precommit - user job #15 - 1 failure seen is existing failure
donaldsharp · Dec 16, 2022 · 732d156 · 732d156
1 parent 57f7bfe
commit 732d156
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/bgpd/bgp_evpn_vty.c b/bgpd/bgp_evpn_vty.c
@@ -2883,7 +2883,7 @@ static void evpn_show_route_rd_all_macip(struct vty *vty, struct bgp *bgp,
 				json_path = json_object_new_array();
 
 			route_vty_out_detail(vty, bgp, dest, pi, AFI_L2VPN,
-					     SAFI_EVPN, /* RPKI_NOT_BEING_USED, */
+					     SAFI_EVPN,  RPKI_NOT_BEING_USED,
 					     json_path);
 
 			if (json)

diff --git a/bgpd/bgp_fsm.c b/bgpd/bgp_fsm.c
@@ -2744,7 +2744,11 @@ int bgp_gr_update_all(struct bgp *bgp, int global_gr_cmd)
 				"%s [BGP_GR] global_new_state == global_old_state :%s",
 				__func__,
 				print_global_gr_mode(global_new_state));
-		return BGP_GR_NO_OPERATION;
+        /* Next state 'invalid' is actually an 'ignore' */
+        if (global_new_state == GLOBAL_INVALID)
+            return BGP_GR_NO_OPERATION;
+
+        return BGP_GR_NO_OPERATION;
 	}
 
 	return bgp_gr_lookup_n_update_all_peer(bgp, global_new_state,
@@ -2892,6 +2896,10 @@ int bgp_neighbor_graceful_restart(struct peer *peer, int peer_gr_cmd)
 		return BGP_ERR_GR_INVALID_CMD;
 	}
 
+    /* Next state 'invalid' is actually an 'ignore' */
+	if (peer_new_state == PEER_INVALID)
+		return BGP_GR_NO_OPERATION;
+
 	if (peer_new_state != peer_old_state) {
 		result = peer_state.action_fun(peer, peer_old_state,
 					       peer_new_state);
@@ -2940,6 +2948,9 @@ unsigned int bgp_peer_gr_action(struct peer *peer, int old_peer_state,
 		return BGP_ERR_GR_INVALID_CMD;
 	}
 
+	if (new_peer_state == PEER_INVALID)
+		return BGP_GR_NO_OPERATION;
+
 	bgp_gr_global_mode = bgp_global_gr_mode_get(peer->bgp);
 
 	if ((old_peer_state == PEER_GLOBAL_INHERIT)

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
@@ -14570,7 +14570,7 @@ DEFUN (show_bgp_afi_vpn_rd_route,
 	if (!strcmp(argv[5]->arg, "all"))
 		return bgp_show_route(vty, NULL, argv[6]->arg, afi,
 				      SAFI_MPLS_VPN, NULL, 0, BGP_PATH_SHOW_ALL,
-				      /* RPKI_NOT_BEING_USED,*/
+				       RPKI_NOT_BEING_USED,
 				      use_json(argc, argv));
 
 	ret = str2prefix_rd(argv[5]->arg, &prd);