]>
git.puffer.fish Git - matthieu/frr.git/log
Donald Sharp [Fri, 26 Jul 2024 11:34:08 +0000 (07:34 -0400)]
Merge pull request #16473 from opensourcerouting/fix/add_soft_version_in_summary
bgpd: Show software version in bgp summary
Donatas Abraitis [Thu, 25 Jul 2024 18:09:39 +0000 (21:09 +0300)]
Merge pull request #16416 from raja-rajasekar/rajasekarr/fix_logs_bp
bgpd: backpressure - fix ret value and log err for evpn
Donatas Abraitis [Thu, 25 Jul 2024 18:09:19 +0000 (21:09 +0300)]
Merge pull request #16472 from donaldsharp/msdp_bug
pimd: Fix msdp setting of sa->rp
Donald Sharp [Thu, 25 Jul 2024 17:49:55 +0000 (13:49 -0400)]
Merge pull request #16470 from opensourcerouting/fix/keep_last_reset_reasons
bgpd: Keep the last reset reason before we reset the peer
mobash-rasool [Thu, 25 Jul 2024 17:06:17 +0000 (22:36 +0530)]
Merge pull request #16041 from sri-mohan1/srib-24-zebra-d
zebra: changes for code maintainability
Donatas Abraitis [Thu, 25 Jul 2024 12:07:57 +0000 (15:07 +0300)]
bgpd: Show software version in bgp summary
E.g.:
```
$ vtysh -c 'show bgp summary json' | jq '.ipv4Unicast.peers'
{
"127.0.0.1": {
"hostname": "donatas.net",
"softwareVersion": "GoBGP/3.26.0",
"remoteAs": 65001,
"localAs": 65001,
"version": 4,
"msgRcvd": 12,
"msgSent": 16,
"tableVersion": 0,
"outq": 0,
"inq": 0,
"peerUptime": "00:00:10",
"peerUptimeMsec": 10000,
"peerUptimeEstablishedEpoch":
1721908563 ,
"pfxRcd": 0,
"pfxSnt": 0,
"state": "Established",
"peerState": "OK",
"connectionsEstablished": 1,
"connectionsDropped": 0,
"idType": "ipv4"
},
"127.0.0.3": {
"hostname": "putin-xujlo",
"domainname": "donatas.net",
"softwareVersion": "ExaBGP/5.0.0-
20240725 +main-
a56c70e84a ",
"remoteAs": 65003,
"localAs": 65001,
"version": 4,
"msgRcvd": 3,
"msgSent": 7,
"tableVersion": 0,
"outq": 0,
"inq": 0,
"peerUptime": "00:00:13",
"peerUptimeMsec": 13000,
"peerUptimeEstablishedEpoch":
1721908560 ,
"pfxRcd": 0,
"pfxSnt": 0,
"state": "Established",
"peerState": "OK",
"connectionsEstablished": 1,
"connectionsDropped": 0,
"idType": "ipv4"
}
}
```
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
Donald Sharp [Thu, 25 Jul 2024 12:05:19 +0000 (08:05 -0400)]
Merge pull request #16464 from cscarpitta/fix/remove-duplicate-include
zebra: Remove duplicate `#include`s
Donald Sharp [Thu, 25 Jul 2024 11:50:32 +0000 (07:50 -0400)]
pimd: Fix msdp setting of sa->rp
The code is clearly incorrect. After consultation with
the original author this is the decided change.
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Donald Sharp [Thu, 25 Jul 2024 11:17:03 +0000 (07:17 -0400)]
Merge pull request #16449 from opensourcerouting/py-invalid-escapes
build: fix a few python string escape warnings
Donald Sharp [Thu, 25 Jul 2024 11:16:13 +0000 (07:16 -0400)]
Merge pull request #16469 from opensourcerouting/fix/add_5701_supported
doc: Add RFC 5701 to the supported RFCs list
Donatas Abraitis [Thu, 25 Jul 2024 10:22:27 +0000 (13:22 +0300)]
bgpd: Keep the last reset reason before we reset the peer
If we send a notification, there is no point setting the last_reset, because
bgp_notify_send() sets last_reset to PEER_DOWN_NOTIFY_SEND (almost everywhere).
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
Donatas Abraitis [Thu, 25 Jul 2024 10:06:46 +0000 (13:06 +0300)]
bgpd: Set the last_reset if we change the password also
```
donatas.net(config-router)# do show ip bgp summary failed
IPv4 Unicast Summary:
BGP router identifier 1.1.1.1, local AS number 65001 VRF default vrf-id 0
BGP table version 0
RIB entries 0, using 0 bytes of memory
Peers 1, using 24 KiB of memory
Neighbor EstdCnt DropCnt ResetTime Reason
127.0.0.1 2 2 00:02:02 Password config change (GoBGP/3.26.0)
Displayed neighbors 1
Total number of neighbors 1
```
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
Donatas Abraitis [Thu, 25 Jul 2024 08:52:45 +0000 (11:52 +0300)]
doc: Add RFC 5701 to the supported RFCs list
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
Carmine Scarpitta [Wed, 24 Jul 2024 21:50:02 +0000 (23:50 +0200)]
zebra: Remove duplicate `#include "zebra/interface.h"`
Signed-off-by: Carmine Scarpitta <cscarpit@cisco.com>
Carmine Scarpitta [Wed, 24 Jul 2024 21:41:29 +0000 (23:41 +0200)]
zebra: Remove duplicate `#include "zebra/interface.h"`
Signed-off-by: Carmine Scarpitta <cscarpit@cisco.com>
Carmine Scarpitta [Wed, 24 Jul 2024 21:41:09 +0000 (23:41 +0200)]
zebra: Remove duplicate `#include "zebra/debug.h"`
Signed-off-by: Carmine Scarpitta <cscarpit@cisco.com>
Carmine Scarpitta [Wed, 24 Jul 2024 21:39:34 +0000 (23:39 +0200)]
zebra: Remove duplicate `#include <stdio.h>`
Signed-off-by: Carmine Scarpitta <cscarpit@cisco.com>
Carmine Scarpitta [Wed, 24 Jul 2024 21:39:14 +0000 (23:39 +0200)]
zebra: Remove duplicate `#include <string.h>`
Signed-off-by: Carmine Scarpitta <cscarpit@cisco.com>
Carmine Scarpitta [Wed, 24 Jul 2024 21:38:55 +0000 (23:38 +0200)]
zebra: Remove duplicate `#include <stdlib.h>`
Signed-off-by: Carmine Scarpitta <cscarpit@cisco.com>
Carmine Scarpitta [Wed, 24 Jul 2024 21:38:27 +0000 (23:38 +0200)]
zebra: Remove duplicate `#include <arpa/inet.h>`
Signed-off-by: Carmine Scarpitta <cscarpit@cisco.com>
Carmine Scarpitta [Wed, 24 Jul 2024 21:38:04 +0000 (23:38 +0200)]
zebra: Remove duplicate `#include <netinet/in.h>`
Signed-off-by: Carmine Scarpitta <cscarpit@cisco.com>
Donald Sharp [Wed, 24 Jul 2024 17:17:31 +0000 (13:17 -0400)]
Merge pull request #16455 from opensourcerouting/fix/bgp_gr_notifications_timing_flake
tests: Delay initial OPEN after we do `clear bgp`
Donald Sharp [Wed, 24 Jul 2024 17:17:12 +0000 (13:17 -0400)]
Merge pull request #16456 from opensourcerouting/fix/delay_open_when_open_received
bgpd: Pass a connection struct directly for EVENT_OFF()
Donald Sharp [Wed, 24 Jul 2024 14:30:34 +0000 (10:30 -0400)]
Merge pull request #16232 from zhou-run/
202406171755
isisd: Even after configuring "no hostname dynamic", the topology still displays the hostname.
Donald Sharp [Wed, 24 Jul 2024 14:28:43 +0000 (10:28 -0400)]
Merge pull request #16240 from y-bharath14/srib-topotest-f
tests: Avoid using unused modules and variables at FRR test suites
Donald Sharp [Wed, 24 Jul 2024 14:22:53 +0000 (10:22 -0400)]
Merge pull request #16451 from LabNConsulting/chopps/fix-early-mgmtd-detach
lib: mgmtd: fix too early daemon detach of mgmtd
Donatas Abraitis [Wed, 24 Jul 2024 12:30:43 +0000 (15:30 +0300)]
bgpd: Pass a connection struct directly for EVENT_OFF()
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
Donatas Abraitis [Wed, 24 Jul 2024 11:30:32 +0000 (14:30 +0300)]
tests: Delay initial OPEN after we do `clear bgp`
Under some circumstances it might happen that the session is quickly UP in the
middle of `clear bgp ...` and `shutdown`. That leads to session be UP, and
the stale routes being cleared quickly.
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
Christian Hopps [Wed, 24 Jul 2024 10:35:01 +0000 (03:35 -0700)]
Merge pull request #16428 from y-bharath14/srib-yang-c
yang: Added missed prefix to the frr-deviations-ietf-routing yang file
Christian Hopps [Tue, 23 Jul 2024 21:42:07 +0000 (17:42 -0400)]
lib: mgmtd: fix too early daemon detach of mgmtd
Correct FRR startup counts on a daemon's vty socket to be open when the
parent process exits. The parent process waits for `frr_check_detach()`
to be called by the child before exiting. The problem is when the
`FRR_MANUAL_VTY_START` flag is set the vty socket was not opened but
`frr_check_detach()` was called anyway.
Instead add a bool option for `frr_check_detach()` to be called when the
socket is opened with `frr_vty_serv_start()`, and do so when "manually"
calling said function (i.e., when FRR_MANUAL_VTY_START is set).
The `FRR_MANUAL_VTY_START` flag is only set by mgmtd. The reason we
wait to open the vty socket is so that mgmtd can parse the various
daemon specific config files it has taken over, after the event loop has
started, but before we receive any possible new config from `vtysh`.
fixes #16362
Signed-off-by: Christian Hopps <chopps@labn.net>
Russ White [Tue, 23 Jul 2024 20:42:41 +0000 (16:42 -0400)]
Merge pull request #16410 from pguibert6WIND/show_zebra_dplane_nexthop
zebra: add nexthop counter to 'show zebra dplane' command
David Lamparter [Tue, 23 Jul 2024 17:21:42 +0000 (10:21 -0700)]
build: fix a few python string escape warnings
When using a regex (or anything that uses `\?` escapes) in python, raw
strings (`r"content"`) should be used so python doesn't consume the
escapes itself. Otherwise we get either broken behavior and/or
`SyntaxWarning: invalid escape sequence '\['`
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Russ White [Tue, 23 Jul 2024 14:54:12 +0000 (10:54 -0400)]
Merge pull request #16403 from lsang6WIND/vpn_leak_label
bgpd: fix label lost when vrf loopback comes back
Russ White [Tue, 23 Jul 2024 14:51:46 +0000 (10:51 -0400)]
Merge pull request #16376 from c-po/ospfd-ldp-sync
ospfd: fix internal ldp-sync state flags when feature is disabled
Russ White [Tue, 23 Jul 2024 14:49:49 +0000 (10:49 -0400)]
Merge pull request #16330 from donaldsharp/nhg_going_down
zebra: Properly note that a nhg's nexthop has gone down
Donatas Abraitis [Tue, 23 Jul 2024 14:46:43 +0000 (17:46 +0300)]
Merge pull request #16437 from raja-rajasekar/rajasekarr/use_after_free_4001204
bgpd: backpressure - Avoid use after free
Mark Stapp [Tue, 23 Jul 2024 12:08:14 +0000 (08:08 -0400)]
Merge pull request #16432 from Jafaral/pim-warn
pimd: fix compile warnings
Jafar Al-Gharaibeh [Mon, 22 Jul 2024 19:03:23 +0000 (15:03 -0400)]
Merge pull request #16407 from opensourcerouting/fix/ignore_alias_for_clang-formatter
tools: Ignore ALIAS_* macros for clang-formatter
Rajasekar Raja [Mon, 22 Jul 2024 17:13:19 +0000 (10:13 -0700)]
bgpd: backpressure - Avoid use after free
Coverity complains there is a use after free (
1598495 and
1598496 )
At this point, most likely dest->refcount cannot go 1 and free up
the dest, but there might be some code path where this can happen.
Fixing this with a simple order change (no harm fix).
Ticket :#
4001204
Signed-off-by: Rajasekar Raja <rajasekarr@nvidia.com>
Donald Sharp [Mon, 22 Jul 2024 16:37:51 +0000 (12:37 -0400)]
Merge pull request #16309 from louis-6wind/fix-pim-crash
pimd: fix crash on non-existent interface
Jafar Al-Gharaibeh [Mon, 22 Jul 2024 16:19:50 +0000 (11:19 -0500)]
pimd: fix compile warnings
Signed-off-by: Jafar Al-Gharaibeh <jafar@atcorp.com>
Donald Sharp [Mon, 22 Jul 2024 14:35:43 +0000 (10:35 -0400)]
Merge pull request #16429 from LabNConsulting/chopps/fix-bad-log
lib: move non-error from __log_err to __dbg
Christian Hopps [Mon, 22 Jul 2024 11:52:10 +0000 (07:52 -0400)]
lib: move non-error from __log_err to __dbg
Additionally, print `errmsg_if_any` in successful debug messages
if non-NULL.
fixes #16386 #16043
Signed-off-by: Christian Hopps <chopps@labn.net>
Y Bharath [Mon, 22 Jul 2024 11:17:54 +0000 (16:47 +0530)]
yang: Added missed prefix to the yang file
Corrected warning by including the module
Signed-off-by: y-bharath14 <y.bharath@samsung.com>
Donatas Abraitis [Mon, 22 Jul 2024 10:48:59 +0000 (03:48 -0700)]
Merge pull request #16408 from sri-mohan1/srib-24-zebra-e
bgpd: changes for code maintainability
Donatas Abraitis [Mon, 22 Jul 2024 09:53:26 +0000 (02:53 -0700)]
Merge pull request #16341 from crosser/preserve-needed-rmacs
zebra: evpn: not coerce VTEP IP to IPv4 in nh_list
sri-mohan1 [Wed, 17 Jul 2024 07:02:53 +0000 (12:32 +0530)]
bgpd: changes for code maintainability
these changes are for improving the code maintainability and readability
Signed-off-by: sri-mohan1 <sri.mohan@samsung.com>
Jafar Al-Gharaibeh [Sun, 21 Jul 2024 18:01:16 +0000 (14:01 -0400)]
Merge pull request #16425 from opensourcerouting/fix/do_not_prepend_an_empty_list_for_pim_vrfs
tools: Do not append an empty list (pim_vrfs) to the config lines
Jafar Al-Gharaibeh [Sun, 21 Jul 2024 18:00:10 +0000 (14:00 -0400)]
Merge pull request #16426 from cscarpitta/fix/remove-annoying-topotest-warnings
tests: Fix topotest warnings
Carmine Scarpitta [Sun, 21 Jul 2024 07:37:06 +0000 (09:37 +0200)]
tests: Fix warnings in `bgp_srv6l3vpn_to_bgp_vrf3`
When performing the `bgp_srv6l3vpn_to_bgp_vrf3` topotest, the following
warnings are observed:
```
2024-07-21 08:01:51,390 WARNING: r1: Router(r1): proc failed: rc 127 pid 52974
args: /usr/bin/nsenter --mount=/proc/52322/ns/mnt --net=/proc/52322/ns/net --uts=/proc/52322/ns/uts -F /bin/bash -c /bin/bash /media/workspace/frr/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r1/setup.sh
stdout: /bin/bash: /media/workspace/frr/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r1/setup.sh: No such file or directory
stderr: *empty*
2024-07-21 08:01:51,522 WARNING: r2: Router(r2): proc failed: rc 127 pid 52984
args: /usr/bin/nsenter --mount=/proc/52397/ns/mnt --net=/proc/52397/ns/net --uts=/proc/52397/ns/uts -F /bin/bash -c /bin/bash /media/workspace/frr/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r2/setup.sh
stdout: /bin/bash: /media/workspace/frr/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r2/setup.sh: No such file or directory
stderr: *empty*
2024-07-21 08:01:51,632 WARNING: ce1: Router(ce1): proc failed: rc 127 pid 52994
args: /usr/bin/nsenter --mount=/proc/52472/ns/mnt --net=/proc/52472/ns/net --uts=/proc/52472/ns/uts -F /bin/bash -c /bin/bash /media/workspace/frr/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/ce1/setup.sh
stdout: /bin/bash: /media/workspace/frr/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/ce1/setup.sh: No such file or directory
stderr: *empty*
2024-07-21 08:01:51,757 WARNING: ce2: Router(ce2): proc failed: rc 127 pid 53004
args: /usr/bin/nsenter --mount=/proc/52547/ns/mnt --net=/proc/52547/ns/net --uts=/proc/52547/ns/uts -F /bin/bash -c /bin/bash /media/workspace/frr/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/ce2/setup.sh
stdout: /bin/bash: /media/workspace/frr/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/ce2/setup.sh: No such file or directory
stderr: *empty*
2024-07-21 08:01:51,878 WARNING: ce3: Router(ce3): proc failed: rc 127 pid 53014
args: /usr/bin/nsenter --mount=/proc/52622/ns/mnt --net=/proc/52622/ns/net --uts=/proc/52622/ns/uts -F /bin/bash -c /bin/bash /media/workspace/frr/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/ce3/setup.sh
stdout: /bin/bash: /media/workspace/frr/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/ce3/setup.sh: No such file or directory
stderr: *empty*
2024-07-21 08:01:51,997 WARNING: ce4: Router(ce4): proc failed: rc 127 pid 53024
args: /usr/bin/nsenter --mount=/proc/52697/ns/mnt --net=/proc/52697/ns/net --uts=/proc/52697/ns/uts -F /bin/bash -c /bin/bash /media/workspace/frr/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/ce4/setup.sh
stdout: /bin/bash: /media/workspace/frr/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/ce4/setup.sh: No such file or directory
stderr: *empty*
2024-07-21 08:01:52,109 WARNING: ce5: Router(ce5): proc failed: rc 127 pid 53034
args: /usr/bin/nsenter --mount=/proc/52772/ns/mnt --net=/proc/52772/ns/net --uts=/proc/52772/ns/uts -F /bin/bash -c /bin/bash /media/workspace/frr/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/ce5/setup.sh
stdout: /bin/bash: /media/workspace/frr/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/ce5/setup.sh: No such file or directory
stderr: *empty*
2024-07-21 08:01:52,225 WARNING: ce6: Router(ce6): proc failed: rc 127 pid 53044
args: /usr/bin/nsenter --mount=/proc/52847/ns/mnt --net=/proc/52847/ns/net --uts=/proc/52847/ns/uts -F /bin/bash -c /bin/bash /media/workspace/frr/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/ce6/setup.sh
stdout: /bin/bash: /media/workspace/frr/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/ce6/setup.sh: No such file or directory
stderr: *empty*
````
This occurs because the topotest attempts to execute the `setup.sh`
file, and the file does not exist.
Let's fix the issue by checking if the `setup.sh` file exists and
executing it only if it does.
Signed-off-by: Carmine Scarpitta <cscarpit@cisco.com>
Carmine Scarpitta [Sun, 21 Jul 2024 07:36:47 +0000 (09:36 +0200)]
tests: Fix warnings in `bgp_srv6l3vpn_to_bgp_vrf2`
When performing the `bgp_srv6l3vpn_to_bgp_vrf2` topotest, the following
warnings are observed:
```
2024-07-21 08:01:51,390 WARNING: r1: Router(r1): proc failed: rc 127 pid 52974
args: /usr/bin/nsenter --mount=/proc/52322/ns/mnt --net=/proc/52322/ns/net --uts=/proc/52322/ns/uts -F /bin/bash -c /bin/bash /media/workspace/frr/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/r1/setup.sh
stdout: /bin/bash: /media/workspace/frr/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/r1/setup.sh: No such file or directory
stderr: *empty*
2024-07-21 08:01:51,522 WARNING: r2: Router(r2): proc failed: rc 127 pid 52984
args: /usr/bin/nsenter --mount=/proc/52397/ns/mnt --net=/proc/52397/ns/net --uts=/proc/52397/ns/uts -F /bin/bash -c /bin/bash /media/workspace/frr/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/r2/setup.sh
stdout: /bin/bash: /media/workspace/frr/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/r2/setup.sh: No such file or directory
stderr: *empty*
2024-07-21 08:01:51,632 WARNING: ce1: Router(ce1): proc failed: rc 127 pid 52994
args: /usr/bin/nsenter --mount=/proc/52472/ns/mnt --net=/proc/52472/ns/net --uts=/proc/52472/ns/uts -F /bin/bash -c /bin/bash /media/workspace/frr/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/ce1/setup.sh
stdout: /bin/bash: /media/workspace/frr/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/ce1/setup.sh: No such file or directory
stderr: *empty*
2024-07-21 08:01:51,757 WARNING: ce2: Router(ce2): proc failed: rc 127 pid 53004
args: /usr/bin/nsenter --mount=/proc/52547/ns/mnt --net=/proc/52547/ns/net --uts=/proc/52547/ns/uts -F /bin/bash -c /bin/bash /media/workspace/frr/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/ce2/setup.sh
stdout: /bin/bash: /media/workspace/frr/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/ce2/setup.sh: No such file or directory
stderr: *empty*
2024-07-21 08:01:51,878 WARNING: ce3: Router(ce3): proc failed: rc 127 pid 53014
args: /usr/bin/nsenter --mount=/proc/52622/ns/mnt --net=/proc/52622/ns/net --uts=/proc/52622/ns/uts -F /bin/bash -c /bin/bash /media/workspace/frr/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/ce3/setup.sh
stdout: /bin/bash: /media/workspace/frr/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/ce3/setup.sh: No such file or directory
stderr: *empty*
2024-07-21 08:01:51,997 WARNING: ce4: Router(ce4): proc failed: rc 127 pid 53024
args: /usr/bin/nsenter --mount=/proc/52697/ns/mnt --net=/proc/52697/ns/net --uts=/proc/52697/ns/uts -F /bin/bash -c /bin/bash /media/workspace/frr/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/ce4/setup.sh
stdout: /bin/bash: /media/workspace/frr/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/ce4/setup.sh: No such file or directory
stderr: *empty*
2024-07-21 08:01:52,109 WARNING: ce5: Router(ce5): proc failed: rc 127 pid 53034
args: /usr/bin/nsenter --mount=/proc/52772/ns/mnt --net=/proc/52772/ns/net --uts=/proc/52772/ns/uts -F /bin/bash -c /bin/bash /media/workspace/frr/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/ce5/setup.sh
stdout: /bin/bash: /media/workspace/frr/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/ce5/setup.sh: No such file or directory
stderr: *empty*
2024-07-21 08:01:52,225 WARNING: ce6: Router(ce6): proc failed: rc 127 pid 53044
args: /usr/bin/nsenter --mount=/proc/52847/ns/mnt --net=/proc/52847/ns/net --uts=/proc/52847/ns/uts -F /bin/bash -c /bin/bash /media/workspace/frr/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/ce6/setup.sh
stdout: /bin/bash: /media/workspace/frr/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/ce6/setup.sh: No such file or directory
stderr: *empty*
````
This occurs because the topotest attempts to execute the `setup.sh`
file, and the file does not exist.
Let's fix the issue by checking if the `setup.sh` file exists and
executing it only if it does.
Signed-off-by: Carmine Scarpitta <cscarpit@cisco.com>
Carmine Scarpitta [Sun, 21 Jul 2024 07:36:28 +0000 (09:36 +0200)]
tests: Fix warnings in `bgp_srv6l3vpn_to_bgp_vrf`
When performing the `bgp_srv6l3vpn_to_bgp_vrf` topotest, the following
warnings are observed:
```
2024-07-21 08:01:51,390 WARNING: r1: Router(r1): proc failed: rc 127 pid 52974
args: /usr/bin/nsenter --mount=/proc/52322/ns/mnt --net=/proc/52322/ns/net --uts=/proc/52322/ns/uts -F /bin/bash -c /bin/bash /media/workspace/frr/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/setup.sh
stdout: /bin/bash: /media/workspace/frr/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/setup.sh: No such file or directory
stderr: *empty*
2024-07-21 08:01:51,522 WARNING: r2: Router(r2): proc failed: rc 127 pid 52984
args: /usr/bin/nsenter --mount=/proc/52397/ns/mnt --net=/proc/52397/ns/net --uts=/proc/52397/ns/uts -F /bin/bash -c /bin/bash /media/workspace/frr/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/setup.sh
stdout: /bin/bash: /media/workspace/frr/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/setup.sh: No such file or directory
stderr: *empty*
2024-07-21 08:01:51,632 WARNING: ce1: Router(ce1): proc failed: rc 127 pid 52994
args: /usr/bin/nsenter --mount=/proc/52472/ns/mnt --net=/proc/52472/ns/net --uts=/proc/52472/ns/uts -F /bin/bash -c /bin/bash /media/workspace/frr/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce1/setup.sh
stdout: /bin/bash: /media/workspace/frr/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce1/setup.sh: No such file or directory
stderr: *empty*
2024-07-21 08:01:51,757 WARNING: ce2: Router(ce2): proc failed: rc 127 pid 53004
args: /usr/bin/nsenter --mount=/proc/52547/ns/mnt --net=/proc/52547/ns/net --uts=/proc/52547/ns/uts -F /bin/bash -c /bin/bash /media/workspace/frr/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce2/setup.sh
stdout: /bin/bash: /media/workspace/frr/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce2/setup.sh: No such file or directory
stderr: *empty*
2024-07-21 08:01:51,878 WARNING: ce3: Router(ce3): proc failed: rc 127 pid 53014
args: /usr/bin/nsenter --mount=/proc/52622/ns/mnt --net=/proc/52622/ns/net --uts=/proc/52622/ns/uts -F /bin/bash -c /bin/bash /media/workspace/frr/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce3/setup.sh
stdout: /bin/bash: /media/workspace/frr/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce3/setup.sh: No such file or directory
stderr: *empty*
2024-07-21 08:01:51,997 WARNING: ce4: Router(ce4): proc failed: rc 127 pid 53024
args: /usr/bin/nsenter --mount=/proc/52697/ns/mnt --net=/proc/52697/ns/net --uts=/proc/52697/ns/uts -F /bin/bash -c /bin/bash /media/workspace/frr/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce4/setup.sh
stdout: /bin/bash: /media/workspace/frr/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce4/setup.sh: No such file or directory
stderr: *empty*
2024-07-21 08:01:52,109 WARNING: ce5: Router(ce5): proc failed: rc 127 pid 53034
args: /usr/bin/nsenter --mount=/proc/52772/ns/mnt --net=/proc/52772/ns/net --uts=/proc/52772/ns/uts -F /bin/bash -c /bin/bash /media/workspace/frr/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce5/setup.sh
stdout: /bin/bash: /media/workspace/frr/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce5/setup.sh: No such file or directory
stderr: *empty*
2024-07-21 08:01:52,225 WARNING: ce6: Router(ce6): proc failed: rc 127 pid 53044
args: /usr/bin/nsenter --mount=/proc/52847/ns/mnt --net=/proc/52847/ns/net --uts=/proc/52847/ns/uts -F /bin/bash -c /bin/bash /media/workspace/frr/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce6/setup.sh
stdout: /bin/bash: /media/workspace/frr/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce6/setup.sh: No such file or directory
stderr: *empty*
````
This occurs because the topotest attempts to execute the `setup.sh`
file, and the file does not exist.
Let's fix the issue by checking if the `setup.sh` file exists and
executing it only if it does.
Signed-off-by: Carmine Scarpitta <cscarpit@cisco.com>
Donatas Abraitis [Sat, 20 Jul 2024 08:44:48 +0000 (01:44 -0700)]
Merge pull request #16412 from y-bharath14/srib-yang-b
yang: Fixed pyang warnings at frr-bfdd yang file
Donatas Abraitis [Sat, 20 Jul 2024 06:46:49 +0000 (23:46 -0700)]
Merge pull request #16392 from y-bharath14/srib-yang-a
yang: Corrected range in yang file
Donatas Abraitis [Sat, 20 Jul 2024 00:30:08 +0000 (03:30 +0300)]
tools: Apply black formatting for the recent frr-reload.py changes
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
Donatas Abraitis [Sat, 20 Jul 2024 00:29:21 +0000 (03:29 +0300)]
tools: Do not append an empty list (pim_vrfs) to the config lines
If pim_vrfs is empty, we append [] into the lines array, and the reload is broken
since it expects only strings, but gets an array inside at the end.
```
Traceback (most recent call last):
File "/usr/lib/frr/frr-reload.py", line 2227, in <module>
log.debug("New Frr Config\n%s", newconf.get_lines())
File "/usr/lib/frr/frr-reload.py", line 436, in get_lines
return "\n".join(self.lines)
TypeError: sequence item 45: expected str instance, list found
```
Fixes: 98d47f43fbba4e376c8351c724e8c625799805f7 ("tools: Fix frr-reload to support legacy pim configuration from file")
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
Jafar Al-Gharaibeh [Fri, 19 Jul 2024 20:33:23 +0000 (16:33 -0400)]
Merge pull request #16423 from opensourcerouting/fix/show_if_the_open_message_is_extended
bgpd: Show extended parameters support for the OPEN messages
Jafar Al-Gharaibeh [Fri, 19 Jul 2024 17:19:17 +0000 (13:19 -0400)]
Merge pull request #16406 from opensourcerouting/fix/remove_deprecation_for_show_threads
Drop deprecation for `show thread ...`
Jafar Al-Gharaibeh [Fri, 19 Jul 2024 17:18:33 +0000 (13:18 -0400)]
Merge pull request #16422 from LabNConsulting/dleroy/nhrpd-auth-redirect-fix
nhrpd: Fixes auth no redirect bug
Y Bharath [Tue, 16 Jul 2024 07:19:10 +0000 (12:49 +0530)]
yang: Corrected range in yang file
Corrected range in yang file
Signed-off-by: y-bharath14 <y.bharath@samsung.com>
Rajasekar Raja [Fri, 19 Jul 2024 05:23:23 +0000 (22:23 -0700)]
bgpd: backpressure - log error for evpn when route install to zebra fails.
log error for evpn in case route install to zebra fails.
Ticket :#
3992392
Signed-off-by: Rajasekar Raja <rajasekarr@nvidia.com>
Rajasekar Raja [Wed, 17 Jul 2024 06:34:15 +0000 (23:34 -0700)]
bgpd: backpressure - fix ret value evpn_route_select_install
The return value of evpn_route_select_install is ignored in all cases
except during vni route table install/uninstall and based on the
returned value, an error is logged. Fixing this.
Ticket :#
3992392
Signed-off-by: Rajasekar Raja <rajasekarr@nvidia.com>
Donatas Abraitis [Fri, 19 Jul 2024 02:20:04 +0000 (05:20 +0300)]
bgpd: Show extended parameters support for the OPEN messages
We did that for the receiving side, but not for a sending side, let's fix it.
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
Donatas Abraitis [Fri, 19 Jul 2024 00:41:49 +0000 (17:41 -0700)]
Merge pull request #16409 from louis-6wind/statedir
build: display local state dir configuration
Russ White [Thu, 18 Jul 2024 21:17:34 +0000 (17:17 -0400)]
Merge pull request #16415 from nabahr/ospfv3_hello_tests
tests: OSPFv3 hello tests investigation, make assert output unique
Dave LeRoy [Thu, 18 Jul 2024 17:19:30 +0000 (10:19 -0700)]
nhrpd: Fixes auth no redirect bug
The nhrp_peer_forward() routine was not explicitly handling the
Authentication Extension in the switch statement and instead fell
through to the default case which checked whether this was an
unhandled Compulsory extension and errored out, never forwarding
the Resolution Request.
Fix bug #16371
Signed-off-by: Dave LeRoy <dleroy@labn.net>
Jafar Al-Gharaibeh [Thu, 18 Jul 2024 16:20:15 +0000 (12:20 -0400)]
Merge pull request #16417 from LabNConsulting/dleroy/nhrpd-noauth-fix
nhrpd: Fixes auth config change bug
Russ White [Thu, 18 Jul 2024 13:43:02 +0000 (09:43 -0400)]
Merge pull request #16269 from nabahr/router_pim_config
Router pim config
Dave LeRoy [Wed, 17 Jul 2024 17:37:44 +0000 (10:37 -0700)]
nhrpd: Fixes auth config change bug
Freeing auth-token does not set nifp->auth_token to NULL.
Explicitly set auth_token to NULL when deleting auth config in order
for write config logic to succeed.
Fix bug #16359
Signed-off-by: Dave LeRoy <dleroy@labn.net>
Nathan Bahr [Wed, 17 Jul 2024 16:10:53 +0000 (11:10 -0500)]
tests: OSPFv3 hello tests investigation, make assert output unique
These failing tests are hard to track down. Added numbering to each assert
to easily tell where the test fails.
Signed-off-by: Nathan Bahr <nbahr@atcorp.com>
David Lamparter [Wed, 17 Jul 2024 16:40:31 +0000 (09:40 -0700)]
Merge pull request #16411 from anlancs/fix/doc-bsr
Loïc Sang [Wed, 17 Jul 2024 12:40:09 +0000 (14:40 +0200)]
bgpd: do not update leak label at loopback up down
The up/down state of the lo loopback interface does not determine the
availability of the default vrf-lite.
Do not update leak label at lo loopback up/down change.
Fixes: b45c5cd959 ("bgpd: update route leak when vrf state changes")
Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com>
Signed-off-by: Loïc Sang <loic.sang@6wind.com>
Loïc Sang [Tue, 16 Jul 2024 12:03:11 +0000 (14:03 +0200)]
bgpd: fix label lost when vrf loopback comes back
VRF-label association drops when the VRF loopback goes down, however, it
does not return once the interface is enabled again.
Logs show that when VRF loopback goes down, a label drop message is sent
to zebra and immediately resent label installation to zebra, trigged by
"vpn_leak_postchange_all()":
2024/07/16 13:26:29 BGP: [RVJ1J-J2T22] ifp down r1-cust1 vrf id 7
2024/07/16 13:26:29 BGP: [WA2QY-06STJ] vpn_leak_zebra_vrf_label_withdraw: deleting label for vrf VRF r1-cust1 (id=7)
2024/07/16 13:26:30 BGP: [S82AC-6YAC8] vpn_leak_zebra_vrf_label_update: vrf VRF r1-cust1: afi IPv4: setting label 80 for vrf id 7
Since the interface is down, the netlink message is not send to kernel.
Once the interface comes back, zebra ignore the installation assuming
the label is already seen.
To fix this, add a check for the interface status before attempting to
reinstall the label.
Signed-off-by: Loïc Sang <loic.sang@6wind.com>
Y Bharath [Wed, 17 Jul 2024 10:50:13 +0000 (16:20 +0530)]
yang: Fixed pyang warnings at frr-bfdd yang file
Fixed warnings at frr-bfdd yang file
Signed-off-by: y-bharath14 <y.bharath@samsung.com>
Philippe Guibert [Wed, 17 Jul 2024 09:28:10 +0000 (11:28 +0200)]
zebra: add nexthop counter to 'show zebra dplane' command
The nexthop updates counter value was never displayed.
Add it.
> # show zebra dplane
> Zebra dataplane:
> Route updates:
7673010
> Route update errors: 0
> Nexthop updates: 1100
> Nexthop update errors: 0
> [..]
Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
anlan_cs [Wed, 17 Jul 2024 07:16:44 +0000 (15:16 +0800)]
doc: adjust some commands for pim/pimv6 bsr
Signed-off-by: anlan_cs <vic.lan@pica8.com>
Christian Breunig [Sat, 13 Jul 2024 06:43:36 +0000 (08:43 +0200)]
ospfd: fix internal ldp-sync state flags when feature is disabled
When enabling "mpls ldp-sync" under "router ospf" ospfd configures
SET_FLAG(ldp_sync_info->flags, LDP_SYNC_FLAG_IF_CONFIG) so internally knowing
that the ldp-sync feature is enabled. However the flag is not cleared when
turning of the feature using "nompls ldp-sync"!
https://github.com/FRRouting/frr/issues/16375
Signed-off-by: Christian Breunig <christian@breunig.cc>
Donatas Abraitis [Wed, 17 Jul 2024 05:10:13 +0000 (08:10 +0300)]
tools: Ignore ALIAS_* macros for clang-formatter
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
Donatas Abraitis [Tue, 16 Jul 2024 23:17:59 +0000 (02:17 +0300)]
lib: Rename `clear thread cpu ...` to `clear event cpu ...`
Add a deprecation cycle also.
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
Donatas Abraitis [Tue, 16 Jul 2024 23:12:48 +0000 (02:12 +0300)]
lib, vtysh: Removed deprecated aliases for `show thread ...`
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
Nathan Bahr [Mon, 24 Jun 2024 17:45:42 +0000 (12:45 -0500)]
doc: Update PIM[6] configure docs
Document 'router pim[6] [vrf NAME]' configuration.
All the commands are basically the same, just dropped the
'ip pim[6]' prefix and document them under the router pim block.
Signed-off-by: Nathan Bahr <nbahr@atcorp.com>
Nathan Bahr [Mon, 17 Jun 2024 17:58:30 +0000 (12:58 -0500)]
tools: Fix frr-reload to support legacy pim configuration from file
Fix load from file in frr-reload to detect and convert legacy pim
configuration so that the tool can continue to be used with legacy
configurations.
Signed-off-by: Nathan Bahr <nbahr@atcorp.com>
Nathan Bahr [Wed, 12 Jun 2024 16:26:48 +0000 (16:26 +0000)]
pimd, lib, vtysh: Added new 'router pim[6] [vrf NAME]' config node
Moved all existing global/vrf PIM config to the new subnode.
Existing configuration updated to be hidden and deprecated.
Both versions of configuration still work together.
Signed-off-by: Nathan Bahr <nbahr@atcorp.com>
Russ White [Tue, 16 Jul 2024 16:14:49 +0000 (12:14 -0400)]
Merge pull request #16394 from sri-mohan1/srib-24-zebra-e
bfdd: changes for code maintainability
Russ White [Tue, 16 Jul 2024 16:14:21 +0000 (12:14 -0400)]
Merge pull request #16361 from opensourcerouting/ospfd-state-loc-snafu
ospfd: fix state location mixup
Russ White [Tue, 16 Jul 2024 16:13:57 +0000 (12:13 -0400)]
Merge pull request #16368 from raja-rajasekar/rajasekarr/bp_fixes
bgpd: backpressure - fix to properly remove dest for bgp under deletion
Russ White [Tue, 16 Jul 2024 14:09:25 +0000 (10:09 -0400)]
Merge pull request #16374 from opensourcerouting/fix/bgpd_import_vrf_multiple_instances
bgpd: Mark VRF instance as auto created if import vrf is configured for this instance
Russ White [Tue, 16 Jul 2024 14:07:01 +0000 (10:07 -0400)]
Merge pull request #16365 from zhou-run/
202407101356
isisd: fix crash when calculating the neighbor spanning tree based on the fragmented LSP
Louis Scalbert [Tue, 16 Jul 2024 11:35:14 +0000 (13:35 +0200)]
build: display local state dir configuration
Configure is displaying the run state directory but not the local state
directory.
> FRRouting configuration
> ------------------------------
> state file directory : /usr/var/run/frr
> config file directory : /etc/frr
Display the local state directory as well.
> local state file dir : /usr/var/lib/frr
> run state file dir : /usr/var/run/frr
> config file directory : /etc/frr
Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com>
sri-mohan1 [Tue, 16 Jul 2024 09:53:52 +0000 (15:23 +0530)]
bfdd: changes for code maintainability
these changes are for improving the code maintainability and readability
Signed-off-by: sri-mohan1 <sri.mohan@samsung.com>
Rajasekar Raja [Thu, 11 Jul 2024 03:17:14 +0000 (20:17 -0700)]
bgpd: backpressure - Improve debuggability
Improve debuggability in backpressure code.
Ticket :#
3980988
Signed-off-by: Rajasekar Raja <rajasekarr@nvidia.com>
Rajasekar Raja [Wed, 10 Jul 2024 23:46:29 +0000 (16:46 -0700)]
bgpd: backpressure - fix to properly remove dest for bgp under deletion
In case of imported routes (L3vni/vrf leaks), when a bgp instance is
being deleted, the peer->bgp comparision with the incoming bgp to remove
the dest from the pending fifo is wrong. This can lead to the fifo
having stale entries resulting in crash.
Two changes are done here.
- Instead of pop/push items in list if the struct bgp doesnt match,
simply iterate the list and remove the expected ones.
- Corrected the way bgp is fetched from dest rather than relying on
path_info->peer so that it works for all kinds of routes.
Ticket :#
3980988
Signed-off-by: Chirag Shah <chirag @nvidia.com>
Signed-off-by: Rajasekar Raja <rajasekarr@nvidia.com>
Jafar Al-Gharaibeh [Mon, 15 Jul 2024 18:44:48 +0000 (14:44 -0400)]
Merge pull request #16373 from anlancs/zebra/fix-nexthop-synchronization
staticd: fix missing static routes
sri-mohan1 [Sun, 19 May 2024 09:10:55 +0000 (14:40 +0530)]
zebra: changes for code maintainability
these changes are for improving the code maintainability and readability
Signed-off-by: sri-mohan1 <sri.mohan@samsung.com>
Donatas Abraitis [Mon, 15 Jul 2024 13:20:31 +0000 (16:20 +0300)]
bgpd: Skip empty (auto created) VRF instances when deleting a default BGP instance
Auto created VRF instances does not have any config, so it's not relevant
depending on them.
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
Donatas Abraitis [Sat, 13 Jul 2024 10:14:33 +0000 (13:14 +0300)]
tests: Check if VRF instance has a different ASN than a default VRF
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
Donatas Abraitis [Sat, 13 Jul 2024 20:19:57 +0000 (23:19 +0300)]
bgpd: Skip automatically created BGP instances for show CMDs
When using e.g. `adverise-all-vni`, and/or `import vrf ...`, the VRF instance
is created with a default's VRF ASN and tagged as AUTO_VRF. We MUST skip them
here also.
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
Donatas Abraitis [Sat, 13 Jul 2024 09:43:31 +0000 (12:43 +0300)]
tests: Check if multiple VRF instances can have different ASNs
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
Donatas Abraitis [Fri, 12 Jul 2024 14:09:16 +0000 (17:09 +0300)]
bgpd: Mark VRF instance as auto created if import vrf is configured for this instance
If we create a new BGP instance (in this case VRF instance), it MUST be marked
as auto created, to avoid bgpd changing VRF instance's ASN to the default VRF's.
That's because of the ordering when FRR reload is happening.
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
Y Bharath [Wed, 19 Jun 2024 07:21:05 +0000 (12:51 +0530)]
tests: Refactoring FRR test suites
Signed-off-by: y-bharath14 <y.bharath@samsung.com>