proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-27 11:44:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #6714 from ton31337/feature/bgp_show_only_established_sessions_7.4

Browse Source 
bgpd: [7.4] Add command to show only established sessions
This commit is contained in:
Donald Sharp 2020-07-10 16:09:08 -04:00 committed by GitHub
commit 0615c09282
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 47 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bgpd/bgp_evpn_vty.c
View File

@ -4077,7 +4077,7 @@ DEFUN(show_bgp_l2vpn_evpn_es,
*/ */
DEFUN(show_bgp_l2vpn_evpn_summary, DEFUN(show_bgp_l2vpn_evpn_summary,
show_bgp_l2vpn_evpn_summary_cmd, show_bgp_l2vpn_evpn_summary_cmd,
"show bgp [vrf VRFNAME] l2vpn evpn summary [failed] [json]", "show bgp [vrf VRFNAME] l2vpn evpn summary [established|failed] [json]",
SHOW_STR SHOW_STR
BGP_STR BGP_STR
"bgp vrf\n" "bgp vrf\n"
@ -4085,6 +4085,7 @@ DEFUN(show_bgp_l2vpn_evpn_summary,
L2VPN_HELP_STR L2VPN_HELP_STR
EVPN_HELP_STR EVPN_HELP_STR
"Summary of BGP neighbor status\n" "Summary of BGP neighbor status\n"
"Show only sessions in Established state\n"
"Show only sessions not in Established state\n" "Show only sessions not in Established state\n"
JSON_STR) JSON_STR)
{ {
@ -4092,13 +4093,17 @@ DEFUN(show_bgp_l2vpn_evpn_summary,
bool uj = use_json(argc, argv); bool uj = use_json(argc, argv);
char *vrf = NULL; char *vrf = NULL;
bool show_failed = false; bool show_failed = false;
bool show_established = false;
if (argv_find(argv, argc, "vrf", &idx_vrf)) if (argv_find(argv, argc, "vrf", &idx_vrf))
vrf = argv[++idx_vrf]->arg; vrf = argv[++idx_vrf]->arg;
if (argv_find(argv, argc, "failed", &idx_vrf)) if (argv_find(argv, argc, "failed", &idx_vrf))
show_failed = true; show_failed = true;
return bgp_show_summary_vty(vty, vrf, AFI_L2VPN, SAFI_EVPN, if (argv_find(argv, argc, "established", &idx_vrf))
show_failed, uj); show_established = true;
return bgp_show_summary_vty(vty, vrf, AFI_L2VPN, SAFI_EVPN, show_failed,
show_established, uj);
} }
/* /*

41
bgpd/bgp_vty.c
View File

@ -8772,7 +8772,8 @@ static void bgp_show_failed_summary(struct vty *vty, struct bgp *bgp,
/* Show BGP peer's summary information. */ /* Show BGP peer's summary information. */
static int bgp_show_summary(struct vty *vty, struct bgp *bgp, int afi, int safi, static int bgp_show_summary(struct vty *vty, struct bgp *bgp, int afi, int safi,
bool show_failed, bool use_json) bool show_failed, bool show_established,
bool use_json)
{ {
struct peer *peer; struct peer *peer;
struct listnode *node, *nnode; struct listnode *node, *nnode;
@ -9104,6 +9105,10 @@ static int bgp_show_summary(struct vty *vty, struct bgp *bgp, int afi, int safi,
bgp_show_failed_summary(vty, bgp, peer, bgp_show_failed_summary(vty, bgp, peer,
json_peer, 0, use_json); json_peer, 0, use_json);
} else if (!show_failed) { } else if (!show_failed) {
if (show_established
&& bgp_has_peer_failed(peer, afi, safi))
continue;
json_peer = json_object_new_object(); json_peer = json_object_new_object();
if (peer_dynamic_neighbor(peer)) { if (peer_dynamic_neighbor(peer)) {
json_object_boolean_true_add(json_peer, json_object_boolean_true_add(json_peer,
@ -9193,6 +9198,10 @@ static int bgp_show_summary(struct vty *vty, struct bgp *bgp, int afi, int safi,
max_neighbor_width, max_neighbor_width,
use_json); use_json);
} else if (!show_failed) { } else if (!show_failed) {
if (show_established
&& bgp_has_peer_failed(peer, afi, safi))
continue;
memset(dn_flag, '\0', sizeof(dn_flag)); memset(dn_flag, '\0', sizeof(dn_flag));
if (peer_dynamic_neighbor(peer)) { if (peer_dynamic_neighbor(peer)) {
dn_flag[0] = '*'; dn_flag[0] = '*';
@ -9315,7 +9324,8 @@ static int bgp_show_summary(struct vty *vty, struct bgp *bgp, int afi, int safi,
} }
static void bgp_show_summary_afi_safi(struct vty *vty, struct bgp *bgp, int afi, static void bgp_show_summary_afi_safi(struct vty *vty, struct bgp *bgp, int afi,
int safi, bool show_failed, bool use_json) int safi, bool show_failed,
bool show_established, bool use_json)
{ {
int is_first = 1; int is_first = 1;
int afi_wildcard = (afi == AFI_MAX); int afi_wildcard = (afi == AFI_MAX);
@ -9358,7 +9368,8 @@ static void bgp_show_summary_afi_safi(struct vty *vty, struct bgp *bgp, int afi,
false)); false));
} }
} }
bgp_show_summary(vty, bgp, afi, safi, show_failed, bgp_show_summary(vty, bgp, afi, safi,
show_failed, show_established,
use_json); use_json);
} }
safi++; safi++;
@ -9382,6 +9393,7 @@ static void bgp_show_summary_afi_safi(struct vty *vty, struct bgp *bgp, int afi,
static void bgp_show_all_instances_summary_vty(struct vty *vty, afi_t afi, static void bgp_show_all_instances_summary_vty(struct vty *vty, afi_t afi,
safi_t safi, bool show_failed, safi_t safi, bool show_failed,
bool show_established,
bool use_json) bool use_json)
{ {
struct listnode *node, *nnode; struct listnode *node, *nnode;
@ -9411,7 +9423,7 @@ static void bgp_show_all_instances_summary_vty(struct vty *vty, afi_t afi,
: bgp->name); : bgp->name);
} }
bgp_show_summary_afi_safi(vty, bgp, afi, safi, show_failed, bgp_show_summary_afi_safi(vty, bgp, afi, safi, show_failed,
use_json); show_established, use_json);
} }
if (use_json) if (use_json)
@ -9421,14 +9433,15 @@ static void bgp_show_all_instances_summary_vty(struct vty *vty, afi_t afi,
} }
int bgp_show_summary_vty(struct vty *vty, const char *name, afi_t afi, int bgp_show_summary_vty(struct vty *vty, const char *name, afi_t afi,
safi_t safi, bool show_failed, bool use_json) safi_t safi, bool show_failed, bool show_established,
bool use_json)
{ {
struct bgp *bgp; struct bgp *bgp;
if (name) { if (name) {
if (strmatch(name, "all")) { if (strmatch(name, "all")) {
bgp_show_all_instances_summary_vty(vty, afi, safi, bgp_show_all_instances_summary_vty(
show_failed, vty, afi, safi, show_failed, show_established,
use_json); use_json);
return CMD_SUCCESS; return CMD_SUCCESS;
} else { } else {
@ -9444,7 +9457,8 @@ int bgp_show_summary_vty(struct vty *vty, const char *name, afi_t afi,
} }
bgp_show_summary_afi_safi(vty, bgp, afi, safi, bgp_show_summary_afi_safi(vty, bgp, afi, safi,
show_failed, use_json); show_failed, show_established,
use_json);
return CMD_SUCCESS; return CMD_SUCCESS;
} }
} }
@ -9453,7 +9467,7 @@ int bgp_show_summary_vty(struct vty *vty, const char *name, afi_t afi,
if (bgp) if (bgp)
bgp_show_summary_afi_safi(vty, bgp, afi, safi, show_failed, bgp_show_summary_afi_safi(vty, bgp, afi, safi, show_failed,
use_json); show_established, use_json);
else { else {
if (use_json) if (use_json)
vty_out(vty, "{}\n"); vty_out(vty, "{}\n");
@ -9468,7 +9482,7 @@ int bgp_show_summary_vty(struct vty *vty, const char *name, afi_t afi,
/* `show [ip] bgp summary' commands. */ /* `show [ip] bgp summary' commands. */
DEFUN (show_ip_bgp_summary, DEFUN (show_ip_bgp_summary,
show_ip_bgp_summary_cmd, show_ip_bgp_summary_cmd,
"show [ip] bgp [<view|vrf> VIEWVRFNAME] ["BGP_AFI_CMD_STR" ["BGP_SAFI_WITH_LABEL_CMD_STR"]] summary [failed] [json]", "show [ip] bgp [<view|vrf> VIEWVRFNAME] ["BGP_AFI_CMD_STR" ["BGP_SAFI_WITH_LABEL_CMD_STR"]] summary [established|failed] [json]",
SHOW_STR SHOW_STR
IP_STR IP_STR
BGP_STR BGP_STR
@ -9476,6 +9490,7 @@ DEFUN (show_ip_bgp_summary,
BGP_AFI_HELP_STR BGP_AFI_HELP_STR
BGP_SAFI_WITH_LABEL_HELP_STR BGP_SAFI_WITH_LABEL_HELP_STR
"Summary of BGP neighbor status\n" "Summary of BGP neighbor status\n"
"Show only sessions in Established state\n"
"Show only sessions not in Established state\n" "Show only sessions not in Established state\n"
JSON_STR) JSON_STR)
{ {
@ -9483,6 +9498,7 @@ DEFUN (show_ip_bgp_summary,
afi_t afi = AFI_MAX; afi_t afi = AFI_MAX;
safi_t safi = SAFI_MAX; safi_t safi = SAFI_MAX;
bool show_failed = false; bool show_failed = false;
bool show_established = false;
int idx = 0; int idx = 0;
@ -9504,10 +9520,13 @@ DEFUN (show_ip_bgp_summary,
if (argv_find(argv, argc, "failed", &idx)) if (argv_find(argv, argc, "failed", &idx))
show_failed = true; show_failed = true;
if (argv_find(argv, argc, "established", &idx))
show_established = true;
bool uj = use_json(argc, argv); bool uj = use_json(argc, argv);
return bgp_show_summary_vty(vty, vrf, afi, safi, show_failed, uj); return bgp_show_summary_vty(vty, vrf, afi, safi, show_failed,
show_established, uj);
} }
const char *get_afi_safi_str(afi_t afi, safi_t safi, bool for_json) const char *get_afi_safi_str(afi_t afi, safi_t safi, bool for_json)

3
bgpd/bgp_vty.h
View File

@ -178,6 +178,7 @@ extern int bgp_vty_find_and_parse_afi_safi_bgp(struct vty *vty,
int bgp_vty_find_and_parse_bgp(struct vty *vty, struct cmd_token **argv, int bgp_vty_find_and_parse_bgp(struct vty *vty, struct cmd_token **argv,
int argc, struct bgp **bgp, bool use_json); int argc, struct bgp **bgp, bool use_json);
extern int bgp_show_summary_vty(struct vty *vty, const char *name, afi_t afi, extern int bgp_show_summary_vty(struct vty *vty, const char *name, afi_t afi,
safi_t safi, bool show_failed, bool use_json); safi_t safi, bool show_failed,
bool show_established, bool use_json);
#endif /* _QUAGGA_BGP_VTY_H */ #endif /* _QUAGGA_BGP_VTY_H */

6
doc/user/bgp.rst
View File

@ -2710,6 +2710,12 @@ structure is extended with :clicmd:`show bgp [afi] [safi]`.
Show a bgp peer summary for peers that are not succesfully exchanging routes Show a bgp peer summary for peers that are not succesfully exchanging routes
for the specified address family, and subsequent address-family. for the specified address family, and subsequent address-family.
.. index:: show bgp [afi] [safi] summary established [json]
.. clicmd:: show bgp [afi] [safi] summary established [json]
Show a bgp peer summary for peers that are succesfully exchanging routes
for the specified address family, and subsequent address-family.
.. index:: show bgp [afi] [safi] neighbor [PEER] .. index:: show bgp [afi] [safi] neighbor [PEER]
.. clicmd:: show bgp [afi] [safi] neighbor [PEER] .. clicmd:: show bgp [afi] [safi] neighbor [PEER]