Donatas Abraitis
360a0d6f4c
isisd: Show correct level information for show isis interface detail json
...
Having this configuration:
```
!
interface r1-eth0
ip address 10.0.0.1/30
ip router isis 1
isis priority 44 level-1
isis priority 88 level-2
isis csnp-interval 90 level-1
isis csnp-interval 99 level-2
isis psnp-interval 70 level-1
isis psnp-interval 50 level-2
isis hello-interval level-1 120
isis hello-interval level-2 150
!
interface r1-eth1
ip address 10.0.0.10/30
ip router isis 1
!
interface lo
ip address 192.0.2.1/32
ip router isis 1
isis passive
!
router isis 1
net 49.0000.0000.0000.0001.00
metric-style wide
```
Produces:
```
{
"areas":[
{
"area":"1",
"circuits":[
{
"circuit":2,
"interface":{
"name":"r1-eth0",
"state":"Up",
"is-passive":"active",
"circuit-id":"0x2",
"type":"lan",
"level":"L1L2",
"snpa":"6e28.9c92.da5e",
"levels":[
{
"level":"L1",
"metric":10,
"active-neighbors":1,
"hello-interval":120,
"holddown":{
"count":10,
"pad":"yes"
},
"cnsp-interval":90,
"psnp-interval":70,
"lan":{
"priority":44,
"is-dis":"no"
}
},
{
"level":"L2",
"metric":10,
"active-neighbors":1,
"hello-interval":120, <<<<<<<<<<<<<<<<<<
"holddown":{
"count":10,
"pad":"yes"
},
"cnsp-interval":90, <<<<<<<<<<<<<<<<<<
"psnp-interval":70, <<<<<<<<<<<<<<<<<<
"lan":{
"priority":44, <<<<<<<<<<<<<<<<<<
"is-dis":"no"
}
}
],
...
```
Fixes: 9fee4d4c60
2024-12-30 10:31:44 +02:00
Philippe Guibert
24302c25d3
bgpd: display rpki state in 'show bgp ipvX detail'
...
The rpki current state was ignored when calling for the 'show bgp ipvX
detail' command. Handle the support for this, with json support too.
> "rpkiValidationState" : "valid",
> "rpkiValidationState" : "invalid",
> "rpkiValidationState" : "not used",
> "rpkiValidationState" : "not found",
Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
Signed-off-by: Dmytro Shytyi <dmytro.shytyi@6wind.com>
2024-12-27 15:32:35 +01:00
Igor Ryzhov
1d63ddd4b9
Merge pull request #17720 from jvoss/srv6_cli
...
isisd: fix srv6 exit statements
2024-12-27 13:17:03 +02:00
guozhongfeng.gzf
c2f0206c3c
staticd: Reduce the frequency of adding routes
...
Signed-off-by: guozhongfeng.gzf <guozhongfeng.gzf@alibaba-inc.com>
2024-12-27 12:16:17 +08:00
Donatas Abraitis
a696547d6c
isisd: Allow full no form for domain-password and area-password
...
Before:
```
LR1.wue3(config)# router isis VyOS
LR1.wue3(config-router)# no area-password clear
% Unknown command: no area-password clear
LR1.wue3(config-router)# no area-password clear foo
% Unknown command: no area-password clear foo
LR1.wue3(config-router)#
```
Closes https://github.com/FRRouting/frr/issues/17722
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
2024-12-26 17:42:14 +02:00
Donatas Abraitis
fa8663141e
bgpd: Respect bgp bestpath missing-as-worst for table-map as well
...
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
2024-12-26 17:26:42 +02:00
Donatas Abraitis
3f6c106e48
Merge pull request #17718 from cscarpitta/fix/fix-srv6-static-route-pytestmark
...
tests: Fix markers in `srv6_static_route` topotest
2024-12-26 14:17:21 +02:00
Jonathan Voss
dcb03c44e7
isisd: fix srv6 exit statements
...
Fix missing and misplaced `exit` statements to `show running-config` output.
Before:
```
router isis ISIS_CORE
[...]
segment-routing srv6
locator ISIS_LOC
exit <<<<<<< always placed after locator
node-msd
[...]
exit <<<<<<< missng
interface dum6
exit
```
After:
```
router isis ISIS_CORE
[...]
segment-routing srv6
locator ISIS_LOC
node-msd
[...]
exit
interface dum6
exit
exit
```
Related #16694
Signed-off-by: Jonathan Voss <jvoss@onvox.net>
2024-12-25 00:46:17 +00:00
Jafar Al-Gharaibeh
803ff41cc4
Merge pull request #17647 from LabNConsulting/fix-oper-test
...
tests: enable test failure detection and fix resulting failures
2024-12-24 12:35:32 -06:00
Jonathan Voss
5b8b821f2f
tools: Add missing formats keyword to segment-routing in frr-reload
...
When reloading the following configuration:
```
segment-routing
srv6
formats
format usid-f3216
wide-local-id-block explicit start 100
exit
!
format uncompressed-f4024
exit
!
exit
!
exit
!
exit
```
frr-reload.py does not properly enter the `formats` context. Because of this,
it fails with an unknown command error when applying new or updating format
configuration.
Signed-off-by: Jonathan Voss <jvoss@onvox.net>
2024-12-24 17:27:23 +00:00
Carmine Scarpitta
225a1c7ed6
tests: Fix markers in srv6_static_route topotest
...
`srv6_static_route` is a pure staticd topotest. It does not have any
dependency on bgpd and sharpd.
Let's fix the pytestmark to include only staticd.
Signed-off-by: Carmine Scarpitta <cscarpit@cisco.com>
2024-12-24 10:38:37 +01:00
Christian Hopps
764f276022
mgmtd: fix memory leak in FE adapter
...
Signed-off-by: Christian Hopps <chopps@labn.net>
2024-12-24 03:04:23 -05:00
Christian Hopps
3d3ee2a1af
tests: enable failure and fix broken tests
...
This test was not actually failing when the results didn't match. Fail
now. Also fix the tests that are now found to be failing incorrectly
(wrong expected result).
Signed-off-by: Christian Hopps <chopps@labn.net>
2024-12-24 03:04:23 -05:00
Donatas Abraitis
9ce3b144c9
Merge pull request #17580 from varuntumbe/dev/label_pool_release_fix
...
BGP Labelpool : Releasing the label in labelpool when VPN session gets removed
2024-12-23 14:48:21 +02:00
Donatas Abraitis
61ba8b91e5
Merge pull request #17711 from cscarpitta/fix/remove-srv6-locator-alloc-failure-tests
...
zebra: Remove tests for `srv6_locator_alloc` failure
2024-12-23 09:45:14 +02:00
Carmine Scarpitta
13f3c7c679
zebra: Remove tests for srv6_locator_alloc failure
...
`srv6_locator_alloc` can never fail. Let's remove the tests for
allocation failure.
Signed-off-by: Carmine Scarpitta <cscarpit@cisco.com>
2024-12-22 09:01:59 +01:00
Jafar Al-Gharaibeh
e62c2f10bc
Merge pull request #17684 from opensourcerouting/fix/json_time_no_newline
...
bgpd, lib: Use frrstr_time() when using ctime_r()
2024-12-21 22:59:58 -06:00
Jafar Al-Gharaibeh
0fbda45105
Merge pull request #17706 from cscarpitta/fix/convert-to-ipv6-max-bytelen
...
bgpd: Convert 16 to IPV6_MAX_BYTELEN
2024-12-21 22:56:47 -06:00
Jafar Al-Gharaibeh
79be632713
Merge pull request #17705 from opensourcerouting/fix/enforce-first-as_peer-group
...
bgpd: Fix enforce-first-as per peer-group removal
2024-12-21 22:54:50 -06:00
Carmine Scarpitta
cfab26b180
bgpd: Replace 16 integer with IPV6_MAX_BYTELEN
...
Signed-off-by: Carmine Scarpitta <cscarpit@cisco.com>
2024-12-22 02:12:02 +01:00
Carmine Scarpitta
3bc44ee5eb
bgpd: Replace 16 integer with IPV6_MAX_BYTELEN
...
Signed-off-by: Carmine Scarpitta <cscarpit@cisco.com>
2024-12-22 02:11:20 +01:00
Donatas Abraitis
8cd73c792c
Merge pull request #17703 from cscarpitta/fix/fix-srv6-locator-doc
...
doc: Fix SRv6 locator documentation
2024-12-21 17:14:42 +02:00
Donatas Abraitis
f3b55831b4
Merge pull request #17704 from anlancs/fix/mgmtd-compile-error
...
mgmtd: fix compile error
2024-12-21 17:14:06 +02:00
Donatas Abraitis
9047ce6d9c
tests: Check if enforce-first-as is working with peer-groups
...
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
2024-12-21 17:08:01 +02:00
Donatas Abraitis
b6dcf61877
bgpd: Fix enforce-first-as per peer-group removal
...
If we do `no neighbor PG enforce-first-as`, it wasn't working because the flag
was inherited incorrectly for the members of the peer-group.
Fixes: 322462920ehttps://github.com/FRRouting/frr/issues/17702
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
2024-12-21 17:04:30 +02:00
anlan_cs
b5b8c9d3ec
mgmtd: fix compile error
...
Compile error with `--disable-ripd`:
```
mgmtd/mgmt_be_adapter.c:86:5: error: "HAVE_RIPD" is not defined, evaluates to 0 [-Werror=undef]
86 | #if HAVE_RIPD
| ^~~~~~~~~
```
I have searched the code, there is only three places need to be fixed.
Signed-off-by: anlan_cs <anlan_cs@126.com>
2024-12-21 19:32:47 +08:00
Carmine Scarpitta
fd21131ecf
doc: Show the valid range of SRv6 locator node-len
...
The documentation should provide the valid range of SRv6 locator
node-len parameter, rather than the default value.
Signed-off-by: Carmine Scarpitta <cscarpit@cisco.com>
2024-12-21 09:30:57 +01:00
Carmine Scarpitta
f8ff3e6e06
doc: Show the valid range of SRv6 locator block-len
...
The documentation should provide the valid range of SRv6 locator
block-len parameter, rather than the default value.
Signed-off-by: Carmine Scarpitta <cscarpit@cisco.com>
2024-12-21 09:29:55 +01:00
Carmine Scarpitta
bcad7df60d
doc: Fix the order of SRv6 locator parameters
...
Align the order of the SRv6 locator parameters with the actual implementation:
```
"prefix X:X::X:X/M$prefix [block-len (16-64)$block_bit_len] \
[node-len (16-64)$node_bit_len] [func-bits (0-64)$func_bit_len]"
```
Signed-off-by: Carmine Scarpitta <cscarpit@cisco.com>
2024-12-21 09:26:44 +01:00
Jafar Al-Gharaibeh
f7fcc44292
Merge pull request #17674 from opensourcerouting/fix/bgp_show_advertised_routes_detail
...
bgpd: Fix show neighbor X advertised-routes detail
2024-12-20 14:01:34 -06:00
Jafar Al-Gharaibeh
c5123ff2b0
Merge pull request #17672 from raja-rajasekar/rajasekarr/batch_huge_cfg
...
lib: Fix to optimize the time taken while batching huge configs
2024-12-20 14:00:02 -06:00
Jafar Al-Gharaibeh
1b213448a9
Merge pull request #17619 from donaldsharp/bgp_metaq_upstream
...
bgpd: add meta queue in bgp
2024-12-20 13:59:15 -06:00
Jafar Al-Gharaibeh
ef4e2297ad
Merge pull request #17685 from ykholod/master-17413
...
babel: Clean babel config on babel daemon stop
2024-12-20 13:57:47 -06:00
Jafar Al-Gharaibeh
d34cfcb878
Merge pull request #17676 from LabNConsulting/fix-ut-error-label
...
test: fix label ordering on error diff report
2024-12-20 13:56:23 -06:00
Andrew Dickinson
b331ebdbac
ospfclient: fix crash due to streamwriter garbage collect
...
Signed-off-by: Andrew Dickinson <andrew.dickinson.0216@gmail.com>
2024-12-20 14:41:20 -05:00
Mark Stapp
abefc604f7
Merge pull request #17648 from LabNConsulting/fix-darr-sprintf
...
Fix 2 darr (dynamic-array) bugs
2024-12-20 11:10:18 -05:00
Donatas Abraitis
8f5821eb77
pathd: Replace ctime_r() with time_to_string()
...
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
2024-12-20 17:58:49 +02:00
Donatas Abraitis
3784736b09
bgpd: Drop timestamp_string()
...
Replace with time_to_string().
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
2024-12-20 17:58:49 +02:00
Donatas Abraitis
b37f5f53b3
bgpd: Replace ctime_r() to time_to_string[_json]() to handle JSON/non-JSON
...
For JSON output we don't need newline to be printed.
Before:
```
"lastUpdate":{"epoch":1734490463,"string":"Wed Dec 18 04:54:23 2024\n"
```
After:
```
"lastUpdate":{"epoch":1734678560,"string":"Fri Dec 20 09:09:20 2024"
```
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
2024-12-20 17:58:49 +02:00
Donatas Abraitis
b3e1ceaf88
lib: Add a wrapper for time_to_string() to print time in JSON outputs
...
newline is not expected to be printed in JSON outputs, e.g.:
```
"lastUpdate":{"epoch":1734490463,"string":"Wed Dec 18 04:54:23 2024\n"
```
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
2024-12-20 17:12:12 +02:00
Donatas Abraitis
7f4374fefc
Merge pull request #17669 from pguibert6WIND/rdvpn_mem_leak
...
bgpd: fix memory leak when reconfiguring a route distinguisher
2024-12-20 16:15:15 +02:00
Donatas Abraitis
f438329d23
Merge pull request #17673 from Jafaral/pim-coverity
...
pim: handle return code to fix a couple of coverity issues
2024-12-20 16:14:33 +02:00
Yaroslav Kholod
58188b5ff8
babel: Clean babel config on babel daemon stop
...
When deactivating babel no router babel and later re-enabling
it router babel the previous configuration is still in place.
Steps to reproduce:
- Enable babel
- Configure babel
- Disable babel with "no router babel"
- Verify config
Expected correct behavior: No config present
Signed-off-by: Yaroslav Kholod <y.kholod@vyos.io>
2024-12-20 15:20:59 +02:00
Jafar Al-Gharaibeh
2f0f5d9ab1
Merge pull request #17670 from pguibert6WIND/rpki_json_missing
...
bgpd: add rpki json attributes to bgp path
2024-12-19 20:27:01 -06:00
Jafar Al-Gharaibeh
956143a8fc
Merge pull request #17586 from opensourcerouting/fix/revalidate_only_affected_routes
...
bgpd: Validate only affected RPKI prefixes instead of a full RIB
2024-12-19 15:59:17 -06:00
Jafar Al-Gharaibeh
d875d70540
Merge pull request #17675 from opensourcerouting/fix/memory_leaks_for_strdup
...
bgpd: Fix memory leak when creating BMP connection with a source interface
2024-12-19 15:55:07 -06:00
Donatas Abraitis
7508d72db9
tests: Ignore totalRoutes, totalPaths when checking strict output
...
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
2024-12-19 21:44:50 +02:00
Donatas Abraitis
ddab988cce
tests: Check if we received a DECENT amount of prefixes/paths
...
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
2024-12-19 18:24:50 +02:00
Donatas Abraitis
aade9a7992
bgpd: Print totalRoutes and totalPaths in JSON output
...
E.g.:
```
r1# sh bgp ipv4 unicast neighbors 192.168.1.2 routes json
{
"vrfId": 0,
"vrfName": "default",
"tableVersion": 2,
"routerId": "192.168.1.1",
"defaultLocPrf": 100,
"localAS": 65001,
"routes": { "172.16.16.254/32": [{"valid":true,"bestpath":true,"selectionReason":"Nothing left to compare","pathFrom":"external","prefix":"172.16.16.254","prefixLen":32,"network":"172.16.16.254\/32","version":2,"weight":0,"peerId":"192.168.1.2","path":"65002 65006","origin":"incomplete","nexthops":[{"ip":"192.168.1.2","hostname":"r2","afi":"ipv4","used":true}]},{"valid":true,"multipath":true,"pathFrom":"external","prefix":"172.16.16.254","prefixLen":32,"network":"172.16.16.254\/32","version":2,"weight":0,"peerId":"192.168.1.2","path":"65002 65005","origin":"incomplete","nexthops":[{"ip":"192.168.1.2","hostname":"r2","afi":"ipv4","used":true}]}]
} , "totalRoutes": 1, "totalPaths": 2 }
```
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
2024-12-19 18:21:07 +02:00
Philippe Guibert
2f3fb0128e
bgpd: add rpki json attributes to bgp path
...
Add missing json attribute to BGP path.
Fixes: 82c298be73
2024-12-19 17:14:36 +01:00
