]> git.puffer.fish Git - matthieu/frr.git/log
matthieu/frr.git
3 years agoMerge pull request #10135 from donaldsharp/ripng_faster_timers
Russ White [Tue, 7 Dec 2021 11:41:45 +0000 (06:41 -0500)]
Merge pull request #10135 from donaldsharp/ripng_faster_timers

tests: Allow ripng_topo1 to converge a bit faster

3 years agoMerge pull request #10081 from ckishimo/ospf6d_type4
Russ White [Tue, 7 Dec 2021 11:39:00 +0000 (06:39 -0500)]
Merge pull request #10081 from ckishimo/ospf6d_type4

ospf6d: do not originate Type-4 lsa when NSSA

3 years agoMerge pull request #10120 from idryzhov/bfd-detect-to
Russ White [Tue, 7 Dec 2021 11:38:15 +0000 (06:38 -0500)]
Merge pull request #10120 from idryzhov/bfd-detect-to

bfdd: fix detection timeout update

3 years agoMerge pull request #10039 from chiragshah6/mdev
Russ White [Tue, 7 Dec 2021 11:05:37 +0000 (06:05 -0500)]
Merge pull request #10039 from chiragshah6/mdev

frr-reload: fix bgp nbr remote-as rendering

3 years agoMerge pull request #10177 from qlyoung/fix-pceplib-style
Donatas Abraitis [Tue, 7 Dec 2021 07:26:14 +0000 (09:26 +0200)]
Merge pull request #10177 from qlyoung/fix-pceplib-style

pceplib: fix style issues

3 years agofrr-reload: fix bgp nbr remote-as
Chirag Shah [Thu, 11 Nov 2021 01:22:24 +0000 (17:22 -0800)]
frr-reload: fix bgp nbr remote-as

Remove neighbor <> remote-as <> config line,
if the neighbor is part of the peer-group and
peer-group contains remote-as config.

Neighbors which are part of the peer-group
cannot override remote-as.

Fix:
Frr-reload needs to remote 'neighbor <> remote-as <>'
from lines_to_add if its already part of peer-group
and peer-group has remote-as config.

Testing Done:

Before:

Config snippet:
neighbor PEERS peer-group
neighbor PEERS remote-as external
neighbor PEERS timers 3 9
neighbor 10.2.1.1 remote-as external
neighbor 10.2.1.1 peer-group PEERS
neighbor 10.2.1.1 timers 3 9
neighbor 10.2.1.2 remote-as external
neighbor 10.2.1.2 peer-group PEERS

Frr-reload failure:
line 179: Failure to communicate[13] to bgpd, line:  neighbor 10.2.1.1
remote-as external
% Peer-group member cannot override remote-as of peer-group
line 179: Failure to communicate[13] to bgpd, line:  neighbor 10.2.1.2
remote-as external
% Peer-group member cannot override remote-as of peer-group

After:
frr-reload apply the config successfully.

Signed-off-by: Chirag Shah <chirag@nvidia.com>
3 years agopceplib: fix style issues
Quentin Young [Mon, 6 Dec 2021 05:06:23 +0000 (00:06 -0500)]
pceplib: fix style issues

run clang-format
run clang-format
run clang-format
run clang-format
run clang-format

Signed-off-by: Quentin Young <qlyoung@nvidia.com>
3 years agoMerge pull request #10144 from ton31337/fix/bmp_memory_leaks
Quentin Young [Mon, 6 Dec 2021 05:00:27 +0000 (00:00 -0500)]
Merge pull request #10144 from ton31337/fix/bmp_memory_leaks

3 years agoMerge pull request #10165 from ton31337/fix/add_connect_timer
Quentin Young [Mon, 6 Dec 2021 04:48:57 +0000 (23:48 -0500)]
Merge pull request #10165 from ton31337/fix/add_connect_timer

3 years agoMerge pull request #10170 from idryzhov/route-map-show
Quentin Young [Mon, 6 Dec 2021 04:46:16 +0000 (23:46 -0500)]
Merge pull request #10170 from idryzhov/route-map-show

3 years agoMerge pull request #10169 from idryzhov/doc-match-ip-nexthop-prefix-list
Quentin Young [Mon, 6 Dec 2021 04:39:47 +0000 (23:39 -0500)]
Merge pull request #10169 from idryzhov/doc-match-ip-nexthop-prefix-list

3 years agoMerge pull request #10017 from AnuradhaKaruppiah/evpn-pim-register
Russ White [Sat, 4 Dec 2021 11:36:03 +0000 (06:36 -0500)]
Merge pull request #10017 from AnuradhaKaruppiah/evpn-pim-register

pimd: handle vxlan sg add/del for upstream entries that are in a reg-join state

3 years agodoc: add missing route-map match command
Igor Ryzhov [Fri, 3 Dec 2021 18:49:54 +0000 (21:49 +0300)]
doc: add missing route-map match command

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
3 years agolib: routemap config output cleanup
Igor Ryzhov [Fri, 3 Dec 2021 18:00:01 +0000 (21:00 +0300)]
lib: routemap config output cleanup

Just a small cleanup to unify the code and remove duplication.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
3 years agoMerge pull request #9396 from idryzhov/fix-dup-key-config
Quentin Young [Fri, 3 Dec 2021 17:37:44 +0000 (12:37 -0500)]
Merge pull request #9396 from idryzhov/fix-dup-key-config

3 years agoMerge pull request #10166 from idryzhov/isis-fast-reroute
Mark Stapp [Fri, 3 Dec 2021 17:19:30 +0000 (12:19 -0500)]
Merge pull request #10166 from idryzhov/isis-fast-reroute

isisd: fix running-config for fast-reroute

3 years agovtysh: fix duplicated output of key chain configuration
Igor Ryzhov [Fri, 13 Aug 2021 23:09:54 +0000 (02:09 +0300)]
vtysh: fix duplicated output of key chain configuration

When both ripd and eigrpd run at the same time, all key configuration in
key chain node is duplicated. This change adds a concept of nested nodes
into vtysh to fix the issue.

Before:
```
key chain test
 key 1
  key-string 1
 exit
 key 1
  key-string 1
 exit
exit
!
```
After:
```
key chain test
 key 1
  key-string 1
 exit
exit
!
```

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
3 years agobfdd: fix detection timeout update
Igor Ryzhov [Wed, 24 Nov 2021 12:01:41 +0000 (15:01 +0300)]
bfdd: fix detection timeout update

Per RFC 5880 section 6.8.12, the use of a Poll Sequence is not necessary
when the Detect Multiplier is changed. Currently, we update the Detection
Timeout only when a Poll Sequence is terminated, therefore we ignore the
Detect Multiplier change if it's not accompanied with RX/TX timer change.
To fix the problem, we should update the Detection Timeout on every
received packet.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
3 years agoisisd: fix running-config for fast-reroute
Igor Ryzhov [Fri, 3 Dec 2021 15:16:24 +0000 (18:16 +0300)]
isisd: fix running-config for fast-reroute

YANG leaf means "enable" while CLI command is "disable".
So we should use "no" when the leaf is "true", not "false".

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
3 years agoMerge pull request #10164 from SaiGomathiN/name_change
Donald Sharp [Fri, 3 Dec 2021 14:30:04 +0000 (09:30 -0500)]
Merge pull request #10164 from SaiGomathiN/name_change

pimd: Modifying members of pim_interface to accommodate IPv6 changes

3 years agopimd: Clean up switch statement to our standards
Donald Sharp [Fri, 3 Dec 2021 12:58:47 +0000 (07:58 -0500)]
pimd: Clean up switch statement to our standards

Fixup the switch statement to not have a default statement
with a enum as the case.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 years agotests: Test if BGP session is up additionally for route_server_client setup
Donatas Abraitis [Thu, 2 Dec 2021 15:02:23 +0000 (17:02 +0200)]
tests: Test if BGP session is up additionally for route_server_client setup

Lower connect timer to 5 seconds as well.

```
FAILED test_bgp_route_server_client.py::test_bgp_route_server_client - AssertionError: Cannot see BGP GUA next hop from r3 in r1
```

```
2021-12-02 14:41:21,115 INFO: topolog.r1: vtysh command => "show bgp 2001:db8:f::3/128 json"
2021-12-02 14:41:21,115 DEBUG: topolog.r1: LinuxNamespace(r1): cmd_status("['/bin/bash', '-c', 'vtysh  -c "show bgp 2001:db8:f::3/128 json" 2>/dev/null']", kwargs: {'encoding': 'utf-8', 'stdout': -1, 'stderr': -2, 'shell': False, 'stdin': None})
2021-12-02 14:41:21,159 INFO: topolog.r1: vtysh result:
{
}
```

At least can't reproduce a failure locally (before managed to catch it).

Ran >2000 times, no failure.

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
3 years agopimd: Modifying members of pim_interface to accommodate IPv6 changes
Sai Gomathi [Fri, 3 Dec 2021 07:05:02 +0000 (23:05 -0800)]
pimd: Modifying members of pim_interface to accommodate IPv6 changes

Modifying the members of pim_interface which are to be used
for both IPv4 and IPv6 to common names(for both MLD and IGMP).

Issue: #10023

Co-authored-by: Mobashshera Rasool <mrasool@vmware.com>
Signed-off-by: Sai Gomathi <nsaigomathi@vmware.com>
3 years agoMerge pull request #10110 from idryzhov/if-yang-remove-vrf
Russ White [Thu, 2 Dec 2021 13:33:05 +0000 (08:33 -0500)]
Merge pull request #10110 from idryzhov/if-yang-remove-vrf

lib, yang: remove vrf from the interface list key

3 years agoMerge pull request #9940 from pguibert6WIND/misc_topotests
Rafael Zalamena [Thu, 2 Dec 2021 12:19:45 +0000 (09:19 -0300)]
Merge pull request #9940 from pguibert6WIND/misc_topotests

simplify some topotests config with naming default vrf

3 years agoMerge pull request #9708 from mobash-rasool/new_b
Donald Sharp [Thu, 2 Dec 2021 09:05:03 +0000 (04:05 -0500)]
Merge pull request #9708 from mobash-rasool/new_b

pimd: hello sent stats counter change and new flag addition to decide hello send

3 years agoMerge pull request #9942 from mjstapp/fix_bgp_lu_rmap_in
Donatas Abraitis [Wed, 1 Dec 2021 18:42:55 +0000 (20:42 +0200)]
Merge pull request #9942 from mjstapp/fix_bgp_lu_rmap_in

bgpd: clearer safi handling for BGP-LU route updates

3 years agoMerge pull request #10150 from donaldsharp/kill_daemon
Donatas Abraitis [Wed, 1 Dec 2021 18:42:19 +0000 (20:42 +0200)]
Merge pull request #10150 from donaldsharp/kill_daemon

tests: Fix Daemon Killing to actually notice when a deamon dies

3 years agobgpd: clearer safi handling for BGP-LU route updates
Mark Stapp [Tue, 2 Nov 2021 19:45:58 +0000 (15:45 -0400)]
bgpd: clearer safi handling for BGP-LU route updates

Don't hide the LABELED_UNICAST safi when processing route
updates; map it where necessary (to use the UNICAST table
for instance).

Signed-off-by: Mark Stapp <mstapp@nvidia.com>
3 years agoMerge pull request #9878 from pguibert6WIND/resolver_vrf
Donatas Abraitis [Wed, 1 Dec 2021 06:12:33 +0000 (08:12 +0200)]
Merge pull request #9878 from pguibert6WIND/resolver_vrf

lib: resolver per vrf support

3 years agoMerge pull request #9610 from iqras23/best_path
Russ White [Tue, 30 Nov 2021 21:14:34 +0000 (16:14 -0500)]
Merge pull request #9610 from iqras23/best_path

bgpd: VRF-Lite fix best path selection

3 years agobgpd: Handle Delete status when peers flapping for BMP
Donatas Abraitis [Mon, 29 Nov 2021 15:35:54 +0000 (17:35 +0200)]
bgpd: Handle Delete status when peers flapping for BMP

Memory leak when doing quickly: clear ip bgp * or [no] neighbor X shutdown.

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
3 years agoMerge pull request #10131 from lyq140/patch-5
Donald Sharp [Tue, 30 Nov 2021 17:38:44 +0000 (12:38 -0500)]
Merge pull request #10131 from lyq140/patch-5

pimd: fix igmp user config

3 years agoMerge pull request #10143 from donaldsharp/lib_kernel_routes
Russ White [Tue, 30 Nov 2021 14:52:11 +0000 (09:52 -0500)]
Merge pull request #10143 from donaldsharp/lib_kernel_routes

test: Fix addKernelRoute looking for positive results

3 years agoMerge pull request #10146 from ton31337/fix/acl_bmp
Russ White [Tue, 30 Nov 2021 12:11:00 +0000 (07:11 -0500)]
Merge pull request #10146 from ton31337/fix/acl_bmp

bgpd: Add autocomplete for access-list under BMP node

3 years agoMerge pull request #10145 from donaldsharp/pim_verify_intf_statistics
Russ White [Tue, 30 Nov 2021 12:10:21 +0000 (07:10 -0500)]
Merge pull request #10145 from donaldsharp/pim_verify_intf_statistics

tests: Allow interface statistics to be gathered with some delay

3 years agoMerge pull request #10149 from donaldsharp/zebra_restart
Donatas Abraitis [Tue, 30 Nov 2021 07:14:10 +0000 (09:14 +0200)]
Merge pull request #10149 from donaldsharp/zebra_restart

zebra: Prevent thread usage of data after it being freed

3 years agoMerge pull request #9798 from abuibrahim/master
Quentin Young [Tue, 30 Nov 2021 05:17:28 +0000 (00:17 -0500)]
Merge pull request #9798 from abuibrahim/master

fix broken northbound confd

3 years agotests: Fix Daemon Killing to actually notice when a deamon dies
Donald Sharp [Tue, 30 Nov 2021 00:33:48 +0000 (19:33 -0500)]
tests: Fix Daemon Killing to actually notice when a deamon dies

Lot's of the GR topotests kill daemons in order to test code
that deals with crashing daemons.  Under heavy system load
it was noticed that a kill command was sent and if told to
wait we would sleep 2 seconds send another kill command and
call it good.  This was causiing issues when subsuquent
json commands would get errors like `lost connection to daemon`
as the daemon finally shut down after some time due to load.

Modify the kill the daemon function to notice that the daemon
was not actually killed and if we need to wait wait some
more time for it too happen

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 years agoMerge pull request #10147 from ton31337/fix/bgp_packet_set_size
Donald Sharp [Mon, 29 Nov 2021 22:14:19 +0000 (17:14 -0500)]
Merge pull request #10147 from ton31337/fix/bgp_packet_set_size

bgpd: bgp_packet_set_size int to void

3 years agozebra: Prevent thread usage of data after it being freed
Donald Sharp [Mon, 29 Nov 2021 20:51:45 +0000 (15:51 -0500)]
zebra: Prevent thread usage of data after it being freed

On startup we create a thread timer event to do a rib sweep
of the system.  On shutdown we never stopped this timer and
as such we have a situation where a thread event could be run
on shutdown after the data for it has been freed.  Here is the
crash I am seeing:

(gdb) bt
(gdb)

Save the thread data in zebra_router and stop the thread so we don't
accidently do work on shutdown we don't mean to.  In this case
it happened in our topotests with some severe system load.
Essentially we happened to kill the zebra daemon just as the
graceful_restart timer popped here.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 years agobgpd: bgp_packet_set_size int to void
Donatas Abraitis [Mon, 29 Nov 2021 19:23:53 +0000 (21:23 +0200)]
bgpd: bgp_packet_set_size int to void

stream size is never checked anywhere in the code, just convert to void.

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
3 years agobgpd: Add autocomplete for access-list under BMP node
Donatas Abraitis [Mon, 29 Nov 2021 19:18:52 +0000 (21:18 +0200)]
bgpd: Add autocomplete for access-list under BMP node

```
home-spine1.donatas.net(config-bgp-bmp)# ipv6 access-list ?
  ACCESSLIST_NAME  Access list name
     test4 test6
```

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
3 years agotests: Allow interface statistics to be gathered with some delay
Donald Sharp [Mon, 29 Nov 2021 17:11:43 +0000 (12:11 -0500)]
tests: Allow interface statistics to be gathered with some delay

Currently under system load tests that use verify_pim_interface_traffic
immediately after a interface down/up event are not giving any time
for pim to receive and process the data from that event.  Give
the test some time to gather this data.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 years agoMerge pull request #9703 from donaldsharp/splitup_bgp_gr
Russ White [Mon, 29 Nov 2021 16:05:51 +0000 (11:05 -0500)]
Merge pull request #9703 from donaldsharp/splitup_bgp_gr

tests: Split up the bgp GR topotests

3 years agoMerge pull request #10018 from ckishimo/ospf6d_bitN
Russ White [Mon, 29 Nov 2021 16:05:11 +0000 (11:05 -0500)]
Merge pull request #10018 from ckishimo/ospf6d_bitN

ospf6d: check N-bit in Hello packet

3 years agoMerge pull request #10105 from ton31337/feature/rfc9072
Russ White [Mon, 29 Nov 2021 15:46:58 +0000 (10:46 -0500)]
Merge pull request #10105 from ton31337/feature/rfc9072

bgpd: Implement rfc9072

3 years agotest: Fix addKernelRoute looking for positive results
Donald Sharp [Mon, 29 Nov 2021 13:37:21 +0000 (08:37 -0500)]
test: Fix addKernelRoute looking for positive results

Under heavy system load, we are sometimes seeing this
output for addKernelRoute:

2021-11-28 16:17:27,604 INFO: topolog: [DUT: b1]: Running command: [ip route add 224.0.0.13 dev b1-f1-eth0]
2021-11-28 16:17:27,604 DEBUG: topolog.b1: LinuxNamespace(b1): cmd_status("['/bin/bash', '-c', 'ip route add 224.0.0.13 dev b1-f1-eth0']", kwargs: {'encoding': 'utf-8', 'stdout': -1, 'stderr': -2, 'shell': False, 'stdin': None})
2021-11-28 16:17:27,967 DEBUG: topolog.b1: LinuxNamespace(b1): cmd_status("['/bin/bash', '-c', 'ip route']", kwargs: {'encoding': 'utf-8', 'stdout': -1, 'stderr': -2, 'shell': False, 'stdin': None})
2021-11-28 16:17:28,243 DEBUG: topolog: ip route
70.0.0.0/24 dev b1-f1-eth0 proto kernel scope link src 70.0.0.1
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This tells us that the ip route add succeeded but when looking for it
the system failed to immediately find it.  Why is this happening?
Probably we are under heavy system load and the two different
commands, 'ip route add..' and 'ip route show' are being executed
on different cpu's and the data has not been copied to the different
cpu yet in the kernel.  This is not necessarily something normally
seen but entirely possible.  Giving the system a few extra seconds
for the kernel to execute/work the memory barrier system seems
prudent for long term success of our programming.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 years agoMerge pull request #10042 from wangshengjun/dev_bgp
Donatas Abraitis [Mon, 29 Nov 2021 08:39:29 +0000 (09:39 +0100)]
Merge pull request #10042 from wangshengjun/dev_bgp

bgpd: do not set the 'BGP_NEXTHOP_REGISTERED/BGP_NEXTHOP_UNREGISTERD'…

3 years agoMerge pull request #10137 from idryzhov/vtysh-rpki
Donatas Abraitis [Mon, 29 Nov 2021 07:37:02 +0000 (08:37 +0100)]
Merge pull request #10137 from idryzhov/vtysh-rpki

vtysh: add missing rpki node when showing config

3 years agobgpd: do not set the 'BGP_NEXTHOP_REGISTERED/BGP_NEXTHOP_UNREGISTERD' zclient send...
wangshengjun [Fri, 12 Nov 2021 06:39:51 +0000 (14:39 +0800)]
bgpd: do not set the 'BGP_NEXTHOP_REGISTERED/BGP_NEXTHOP_UNREGISTERD' zclient send failed

Signed-off-by: wangshengjun <wangshengjun@asterfusion.com>
3 years agoMerge pull request #10124 from ton31337/feature/vty_json
Igor Ryzhov [Sun, 28 Nov 2021 23:11:29 +0000 (02:11 +0300)]
Merge pull request #10124 from ton31337/feature/vty_json

3 years agovtysh: add missing rpki node when showing config
Igor Ryzhov [Sun, 28 Nov 2021 18:55:06 +0000 (21:55 +0300)]
vtysh: add missing rpki node when showing config

Before:
```
frr version 8.2-dev
frr defaults traditional
hostname frr
rpki
 rpki polling_period 20
 rpki cache 192.0.2.1 8080 preference 1
service integrated-vtysh-config
!
```

After:
```
frr version 8.2-dev
frr defaults traditional
hostname frr
service integrated-vtysh-config
!
rpki
 rpki polling_period 20
 rpki cache 192.0.2.1 8080 preference 1
exit
!
```

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
3 years agotests: Allow ripng_topo1 to converge a bit faster
Donald Sharp [Sun, 28 Nov 2021 13:46:48 +0000 (08:46 -0500)]
tests: Allow ripng_topo1 to converge a bit faster

Modify the timers uses to send updates/hello's every
1 seconds instead of 5.  Allowing this test to converge
faster under heavy system load.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 years agoMerge pull request #10134 from donaldsharp/isis_topo1_vrf_fix
Donatas Abraitis [Sat, 27 Nov 2021 22:13:30 +0000 (23:13 +0100)]
Merge pull request #10134 from donaldsharp/isis_topo1_vrf_fix

tests: Fix isis_topo1_vrf to wait a tiny bit for zebra route install

3 years agotests: Fix isis_topo1_vrf to wait a tiny bit for zebra route install
Donald Sharp [Sat, 27 Nov 2021 18:12:50 +0000 (13:12 -0500)]
tests: Fix isis_topo1_vrf to wait a tiny bit for zebra route install

During repeated runs I am seeing this test fail to run successfully.
Upon inspecting the output:
            {
              "prefix":"10.0.10.0/24",
              "prefixLen":24,
              "protocol":"isis",
              "vrfId":6,
              "vrfName":"r1-cust1",
              "selected":true,
              "destSelected":true,
              "distance":115,
              "metric":10,
              "queued":true,

We can see that the route is still queued.  Under heavy system
load and not ensuring that isis has time to send the route to
zebra and for zebra to install the route, this test can fail.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 years agoMerge pull request #9203 from opensourcerouting/bgpd-show-json
Russ White [Sat, 27 Nov 2021 13:30:04 +0000 (08:30 -0500)]
Merge pull request #9203 from opensourcerouting/bgpd-show-json

bgpd: add "json" option to a few more show commands

3 years ago*: Remove redundand braces for single statement blocks
Donatas Abraitis [Thu, 25 Nov 2021 22:02:37 +0000 (00:02 +0200)]
*: Remove redundand braces for single statement blocks

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
3 years agoMerge pull request #10127 from idryzhov/ospf-asbr-instance
Donatas Abraitis [Sat, 27 Nov 2021 09:20:02 +0000 (10:20 +0100)]
Merge pull request #10127 from idryzhov/ospf-asbr-instance

ospfd: fix summary-address deletion

3 years agoMerge pull request #10106 from ton31337/fix/missing_llgr_cap_handling
Igor Ryzhov [Fri, 26 Nov 2021 15:42:32 +0000 (18:42 +0300)]
Merge pull request #10106 from ton31337/fix/missing_llgr_cap_handling

bgpd: Add missing LLGR capability handling stuff

3 years agoMerge pull request #10126 from SaiGomathiN/cleanup
Igor Ryzhov [Fri, 26 Nov 2021 14:24:38 +0000 (17:24 +0300)]
Merge pull request #10126 from SaiGomathiN/cleanup

pimd: removing no caller functions

3 years agoMerge pull request #10125 from ton31337/feature/replace_prefix_to_json_object_string_addf
Igor Ryzhov [Fri, 26 Nov 2021 14:23:45 +0000 (17:23 +0300)]
Merge pull request #10125 from ton31337/feature/replace_prefix_to_json_object_string_addf

*: Replace prefix2str for JSON to %pFX

3 years agopimd: fix igmp user config
ron [Fri, 26 Nov 2021 13:20:40 +0000 (21:20 +0800)]
pimd: fix igmp user config

user config should go ahead no matter it is a query router or not

Signed-off-by: ron <lyq140hf2006@163.com>
3 years agopimd: removing no caller functions
Sai Gomathi [Thu, 25 Nov 2021 16:08:09 +0000 (08:08 -0800)]
pimd: removing no caller functions

Removing the no caller function declarations and definitions
in pimd directory.

Signed-off-by: Sai Gomathi <nsaigomathi@vmware.com>
3 years agoospfd: fix summary-address deletion
Igor Ryzhov [Thu, 25 Nov 2021 18:17:58 +0000 (21:17 +0300)]
ospfd: fix summary-address deletion

When the summary-address is deleted, `ospf_aggr_handle_external_info` is
called for each aggregated route for the cleanup. It needs to find the
corresponding OSPF instance and it does it using the `ei->instance`
which is totally wrong, because it's the instance from which the route
is redistributed, not the local OSPF instance. A pointer to the correct
OSPF instance is already stored in the external_info structure.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
3 years agobgpd: Convert vty_out to vty_json for JSON
Donatas Abraitis [Thu, 25 Nov 2021 15:51:12 +0000 (17:51 +0200)]
bgpd: Convert vty_out to vty_json for JSON

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
3 years agobfdd: Convert vty_out to vty_json for JSON
Donatas Abraitis [Thu, 25 Nov 2021 15:51:02 +0000 (17:51 +0200)]
bfdd: Convert vty_out to vty_json for JSON

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
3 years agoldpd: Convert vty_out to vty_json for JSON
Donatas Abraitis [Thu, 25 Nov 2021 15:50:53 +0000 (17:50 +0200)]
ldpd: Convert vty_out to vty_json for JSON

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
3 years agolib: Convert vty_out to vty_json for JSON
Donatas Abraitis [Thu, 25 Nov 2021 15:50:47 +0000 (17:50 +0200)]
lib: Convert vty_out to vty_json for JSON

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
3 years agoospf6d: Convert vty_out to vty_json for JSON
Donatas Abraitis [Thu, 25 Nov 2021 15:50:37 +0000 (17:50 +0200)]
ospf6d: Convert vty_out to vty_json for JSON

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
3 years agoospfd: Convert vty_out to vty_json for JSON
Donatas Abraitis [Thu, 25 Nov 2021 15:50:30 +0000 (17:50 +0200)]
ospfd: Convert vty_out to vty_json for JSON

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
3 years agopathd: Convert vty_out to vty_json for JSON
Donatas Abraitis [Thu, 25 Nov 2021 15:50:20 +0000 (17:50 +0200)]
pathd: Convert vty_out to vty_json for JSON

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
3 years agopbrd: Convert vty_out to vty_json for JSON
Donatas Abraitis [Thu, 25 Nov 2021 15:50:12 +0000 (17:50 +0200)]
pbrd: Convert vty_out to vty_json for JSON

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
3 years agopimd: Convert vty_out to vty_json for JSON
Donatas Abraitis [Thu, 25 Nov 2021 15:50:06 +0000 (17:50 +0200)]
pimd: Convert vty_out to vty_json for JSON

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
3 years agosharpd: Convert vty_out to vty_json for JSON
Donatas Abraitis [Thu, 25 Nov 2021 15:49:56 +0000 (17:49 +0200)]
sharpd: Convert vty_out to vty_json for JSON

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
3 years agozebra: Convert vty_out to vty_json for JSON
Donatas Abraitis [Thu, 25 Nov 2021 15:49:46 +0000 (17:49 +0200)]
zebra: Convert vty_out to vty_json for JSON

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
3 years agotools: Convert vty_out to vty_json for JSON
Donatas Abraitis [Thu, 25 Nov 2021 15:49:25 +0000 (17:49 +0200)]
tools: Convert vty_out to vty_json for JSON

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
3 years ago*: Remove unused variables
Donatas Abraitis [Thu, 25 Nov 2021 15:35:55 +0000 (17:35 +0200)]
*: Remove unused variables

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
3 years agobgpd: Replace prefix2str for JSON to %pFX
Donatas Abraitis [Thu, 25 Nov 2021 15:31:25 +0000 (17:31 +0200)]
bgpd: Replace prefix2str for JSON to %pFX

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
3 years agolib: Replace prefix2str for JSON to %pFX
Donatas Abraitis [Thu, 25 Nov 2021 15:30:36 +0000 (17:30 +0200)]
lib: Replace prefix2str for JSON to %pFX

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
3 years agoospfd: Replace prefix2str for JSON to %pFX
Donatas Abraitis [Thu, 25 Nov 2021 15:29:30 +0000 (17:29 +0200)]
ospfd: Replace prefix2str for JSON to %pFX

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
3 years agopbrd: Replace prefix2str for JSON to %pFX
Donatas Abraitis [Thu, 25 Nov 2021 15:29:18 +0000 (17:29 +0200)]
pbrd: Replace prefix2str for JSON to %pFX

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
3 years agopimd: Replace prefix2str for JSON to %pFX
Donatas Abraitis [Thu, 25 Nov 2021 15:28:24 +0000 (17:28 +0200)]
pimd: Replace prefix2str for JSON to %pFX

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
3 years agozebra: Replace prefix2str for JSON to %pFX
Donatas Abraitis [Thu, 25 Nov 2021 15:28:12 +0000 (17:28 +0200)]
zebra: Replace prefix2str for JSON to %pFX

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
3 years agotools: Replace prefix2str for JSON to %pFX
Donatas Abraitis [Thu, 25 Nov 2021 15:26:26 +0000 (17:26 +0200)]
tools: Replace prefix2str for JSON to %pFX

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
3 years agotests: add ospf6 topotest to check N-bit and E-bit
ckishimo [Tue, 23 Nov 2021 22:13:41 +0000 (23:13 +0100)]
tests: add ospf6 topotest to check N-bit and E-bit

Signed-off-by: ckishimo <carles.kishimoto@gmail.com>
3 years agotests: verify no ospf6 neighbors
ckishimo [Tue, 23 Nov 2021 21:38:02 +0000 (22:38 +0100)]
tests: verify no ospf6 neighbors

Update verify_ospf6_neighbor() so we can verify there are no
neighbors in a given router

    input_dict = {
        "r0": {
            "ospf6": {
                "neighbors": []
            }
        }
    }
    result = verify_ospf6_neighbor(tgen, topo, dut, input_dict)

Signed-off-by: ckishimo <carles.kishimoto@gmail.com>
3 years agoospf6d: check N-bit set in Hello packet
ckishimo [Mon, 8 Nov 2021 23:25:06 +0000 (00:25 +0100)]
ospf6d: check N-bit set in Hello packet

RFC 3101 states both E-bit and N-bit need to be checked when receiving a Hello packet.

"To support the NSSA option an additional check must be made in the function
that handles the receiving of the Hello packet to verify that both the N-bit
and the E-bit found in the Hello packet's option field match the area type and
ExternalRoutingCapability of the area of the receiving interface."

This PR adds the check for the N-bit

Signed-off-by: ckishimo <carles.kishimoto@gmail.com>
3 years agoMerge pull request #10115 from donaldsharp/bgp_route_server_convergence
Donatas Abraitis [Thu, 25 Nov 2021 11:24:35 +0000 (13:24 +0200)]
Merge pull request #10115 from donaldsharp/bgp_route_server_convergence

tests: Add aggressive timers to the new route server client test

3 years agoMerge pull request #10008 from qlyoung/update-process-docs
Jafar Al-Gharaibeh [Wed, 24 Nov 2021 19:55:22 +0000 (12:55 -0700)]
Merge pull request #10008 from qlyoung/update-process-docs

doc: update release process

3 years agoMerge pull request #9906 from patrasar/2553196
Donald Sharp [Wed, 24 Nov 2021 17:33:44 +0000 (12:33 -0500)]
Merge pull request #9906 from patrasar/2553196

pimd: During Joined -> NotJoined, upstream should send prune nomatter

3 years agoMerge pull request #10121 from ton31337/feature/match_ipv6_nexthop_prefixlist
Igor Ryzhov [Wed, 24 Nov 2021 16:38:07 +0000 (19:38 +0300)]
Merge pull request #10121 from ton31337/feature/match_ipv6_nexthop_prefixlist

bgpd: Add an ability to match ipv6 next-hop by prefix-list

3 years agoMerge pull request #10116 from donaldsharp/ospf_test_cleanup
Igor Ryzhov [Wed, 24 Nov 2021 14:44:57 +0000 (17:44 +0300)]
Merge pull request #10116 from donaldsharp/ospf_test_cleanup

Ospf test cleanup

3 years agotests: Check if `match ipv6 next-hop prefix-list` command works
Donatas Abraitis [Wed, 24 Nov 2021 14:28:48 +0000 (16:28 +0200)]
tests: Check if `match ipv6 next-hop prefix-list` command works

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
3 years agobgpd: Add an ability to match ipv6 next-hop by prefix-list
Donatas Abraitis [Wed, 24 Nov 2021 14:28:31 +0000 (16:28 +0200)]
bgpd: Add an ability to match ipv6 next-hop by prefix-list

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
3 years agodoc: Add `match ipv6 next-hop prefix-list` command
Donatas Abraitis [Wed, 24 Nov 2021 14:25:42 +0000 (16:25 +0200)]
doc: Add `match ipv6 next-hop prefix-list` command

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
3 years agopimd: During Joined -> NotJoined, upstream should send prune nomatter
sarita patra [Wed, 27 Oct 2021 10:32:57 +0000 (03:32 -0700)]
pimd: During Joined -> NotJoined, upstream should send prune nomatter

RCA: When upstream transition from Joined to NotJoined due to SGRpt
prune, then only SGRpt prune was sent and SG Prune is missed.

Fix: Send SG Prune towards source as well as SGRpt prune towards RP.

Signed-off-by: sarita patra <saritap@vmware.com>
3 years agotests: Remove create_router_ospf6
Donald Sharp [Wed, 24 Nov 2021 12:04:46 +0000 (07:04 -0500)]
tests: Remove create_router_ospf6

This function is never used, remove.  Developer can use
create_router_ospf instead

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 years agotests: Do not put area under `router ospf6`
Donald Sharp [Tue, 23 Nov 2021 12:56:03 +0000 (07:56 -0500)]
tests: Do not put area under `router ospf6`

The interface area command is deprecated under
router ospf6 and should be on the individual interface.
Let's modify the tests to not actually put the
interface foo area 0.0.0.0 command under the
router node.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 years agotests: Add clear event to creation of router for v4 and v6 ospf
Donald Sharp [Tue, 23 Nov 2021 12:47:33 +0000 (07:47 -0500)]
tests: Add clear event to creation of router for v4 and v6 ospf

When using build_config_from_json there exists a timing
window where neighbors can come up before the router-id
is applied.  As a precaution, quickly clear the neighbors
to ensure that we get neighbors with the expected router-id.
This can especially happen under high system load.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>