proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-17 08:23:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #15023 from opensourcerouting/fix/drop_redundant_vrf_name

Browse Source 
bgpd: Drop redundant VRF name printing for `show bgp summary`
This commit is contained in:
Donald Sharp 2023-12-14 20:26:52 -05:00 committed by GitHub
commit db4bdf7a3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bgpd/bgp_vty.c
View File

@ -12278,12 +12278,10 @@ static void bgp_show_summary_afi_safi(struct vty *vty, struct bgp *bgp, int afi,
safi,
true));
} else {
vty_out(vty,
"\n%s Summary (%s):\n",
vty_out(vty, "\n%s Summary:\n",
get_afi_safi_str(afi,
safi,
false),
bgp->name_pretty);
false));
}
}
bgp_show_summary(vty, bgp, afi, safi, fpeer,

8
doc/developer/topotests.rst
View File

@ -227,8 +227,8 @@ the number of the test we are interested in along with ``--errmsg`` option.
~/frr/tests/topotests# ./analyze.py -Ar run-save -T0 --errmsg
bgp_multiview_topo1/test_bgp_multiview_topo1.py::test_bgp_converge: AssertionError: BGP did not converge:
IPv4 Unicast Summary (VIEW 1):
BGP router identifier 172.30.1.1, local AS number 100 vrf-id -1
IPv4 Unicast Summary:
BGP router identifier 172.30.1.1, local AS number 100 VIEW 1 vrf-id -1
BGP table version 1
RIB entries 1, using 184 bytes of memory
Peers 3, using 2169 KiB of memory
@ -263,8 +263,8 @@ select the first failed test case.
> assert False, "BGP did not converge:\n%s" % bgpStatus
E AssertionError: BGP did not converge:
E
E IPv4 Unicast Summary (VIEW 1):
E BGP router identifier 172.30.1.1, local AS number 100 vrf-id -1
E IPv4 Unicast Summary:
E BGP router identifier 172.30.1.1, local AS number 100 VIEW 1 vrf-id -1
[...]
E Neighbor V AS MsgRcvd MsgSent TblVer InQ OutQ Up/Down State/PfxRcd PfxSnt Desc
E 172.16.1.1 4 65001 0 0 0 0 0 never Connect 0 N/A

12
doc/user/bgp.rst
View File

@ -494,8 +494,8 @@ Require policy on EBGP
exit1# show bgp summary
IPv4 Unicast Summary (VRF default):
BGP router identifier 10.10.10.1, local AS number 65001 vrf-id 0
IPv4 Unicast Summary:
BGP router identifier 10.10.10.1, local AS number 65001 VRF default vrf-id 0
BGP table version 4
RIB entries 7, using 1344 bytes of memory
Peers 2, using 43 KiB of memory
@ -1922,8 +1922,8 @@ Configuring Peers
.. code-block:: frr
IPv4 Unicast Summary (VRF default):
BGP router identifier 10.0.0.6, local AS number 65001 vrf-id 0
IPv4 Unicast Summary:
BGP router identifier 10.0.0.6, local AS number 65001 VRF default vrf-id 0
BGP table version 12
RIB entries 23, using 4600 bytes of memory
Peers 3, using 2174 KiB of memory
@ -4157,8 +4157,8 @@ structure is extended with :clicmd:`show bgp [afi] [safi]`.
exit1# show ip bgp summary wide
IPv4 Unicast Summary (VRF default):
BGP router identifier 192.168.100.1, local AS number 65534 vrf-id 0
IPv4 Unicast Summary:
BGP router identifier 192.168.100.1, local AS number 65534 VRF default vrf-id 0
BGP table version 3
RIB entries 5, using 920 bytes of memory
Peers 1, using 27 KiB of memory

28
tests/topotests/all_protocol_startup/test_all_protocol_startup.py
View File

@ -951,26 +951,24 @@ def test_bgp_summary():
actual = re.sub(r"Total number.*", "", actual)
actual = re.sub(r"Displayed.*", "", actual)
# Remove IPv4 Unicast Summary (Title only)
actual = re.sub(r"IPv4 Unicast Summary \(VRF default\):", "", actual)
actual = re.sub(r"IPv4 Unicast Summary:", "", actual)
# Remove IPv4 Multicast Summary (all of it)
actual = re.sub(r"IPv4 Multicast Summary \(VRF default\):", "", actual)
actual = re.sub(r"IPv4 Multicast Summary:", "", actual)
actual = re.sub(r"No IPv4 Multicast neighbor is configured", "", actual)
# Remove IPv4 VPN Summary (all of it)
actual = re.sub(r"IPv4 VPN Summary \(VRF default\):", "", actual)
actual = re.sub(r"IPv4 VPN Summary:", "", actual)
actual = re.sub(r"No IPv4 VPN neighbor is configured", "", actual)
# Remove IPv4 Encap Summary (all of it)
actual = re.sub(r"IPv4 Encap Summary \(VRF default\):", "", actual)
actual = re.sub(r"IPv4 Encap Summary:", "", actual)
actual = re.sub(r"No IPv4 Encap neighbor is configured", "", actual)
# Remove Unknown Summary (all of it)
actual = re.sub(r"Unknown Summary \(VRF default\):", "", actual)
actual = re.sub(r"Unknown Summary:", "", actual)
actual = re.sub(r"No Unknown neighbor is configured", "", actual)
# Make Connect/Active/Idle the same (change them all to Active)
actual = re.sub(r" Connect ", " Active ", actual)
actual = re.sub(r" Idle ", " Active ", actual)
actual = re.sub(
r"IPv4 labeled-unicast Summary \(VRF default\):", "", actual
)
actual = re.sub(r"IPv4 labeled-unicast Summary:", "", actual)
actual = re.sub(
r"No IPv4 labeled-unicast neighbor is configured", "", actual
)
@ -1108,27 +1106,25 @@ def test_bgp_ipv6_summary():
actual = re.sub(r"Total number.*", "", actual)
actual = re.sub(r"Displayed.*", "", actual)
# Remove IPv4 Unicast Summary (Title only)
actual = re.sub(r"IPv6 Unicast Summary \(VRF default\):", "", actual)
actual = re.sub(r"IPv6 Unicast Summary:", "", actual)
# Remove IPv4 Multicast Summary (all of it)
actual = re.sub(r"IPv6 Multicast Summary \(VRF default\):", "", actual)
actual = re.sub(r"IPv6 Multicast Summary:", "", actual)
actual = re.sub(r"No IPv6 Multicast neighbor is configured", "", actual)
# Remove IPv4 VPN Summary (all of it)
actual = re.sub(r"IPv6 VPN Summary \(VRF default\):", "", actual)
actual = re.sub(r"IPv6 VPN Summary:", "", actual)
actual = re.sub(r"No IPv6 VPN neighbor is configured", "", actual)
# Remove IPv4 Encap Summary (all of it)
actual = re.sub(r"IPv6 Encap Summary \(VRF default\):", "", actual)
actual = re.sub(r"IPv6 Encap Summary:", "", actual)
actual = re.sub(r"No IPv6 Encap neighbor is configured", "", actual)
# Remove Unknown Summary (all of it)
actual = re.sub(r"Unknown Summary \(VRF default\):", "", actual)
actual = re.sub(r"Unknown Summary:", "", actual)
actual = re.sub(r"No Unknown neighbor is configured", "", actual)
# Make Connect/Active/Idle the same (change them all to Active)
actual = re.sub(r" Connect ", " Active ", actual)
actual = re.sub(r" Idle ", " Active ", actual)
# Remove Labeled Unicast Summary (all of it)
actual = re.sub(
r"IPv6 labeled-unicast Summary \(VRF default\):", "", actual
)
actual = re.sub(r"IPv6 labeled-unicast Summary:", "", actual)
actual = re.sub(
r"No IPv6 labeled-unicast neighbor is configured", "", actual
)