]> git.proxmox.com Git - mirror_frr.git/log
mirror_frr.git
3 years agotests: fix improper format strings in pim lib
Quentin Young [Tue, 23 Mar 2021 22:49:35 +0000 (22:49 +0000)]
tests: fix improper format strings in pim lib

Signed-off-by: Quentin Young <qlyoung@nvidia.com>
3 years agotests: remove duplicate pim test function
Quentin Young [Tue, 23 Mar 2021 22:49:15 +0000 (22:49 +0000)]
tests: remove duplicate pim test function

Twice defined

Signed-off-by: Quentin Young <qlyoung@nvidia.com>
3 years agotests: provide sane default for --topology-only
Quentin Young [Tue, 23 Mar 2021 22:15:58 +0000 (22:15 +0000)]
tests: provide sane default for --topology-only

Fixes:

/usr/lib/python3.9/site-packages/_pytest/config/__init__.py:1463: in getoption
    val = getattr(self.option, name)
E   AttributeError: 'Namespace' object has no attribute 'topology_only'

The above exception was the direct cause of the following exception:
/usr/lib/python3.9/site-packages/pluggy/manager.py:127: in register
    hook._maybe_apply_history(hookimpl)
/usr/lib/python3.9/site-packages/pluggy/hooks.py:333: in _maybe_apply_history
    res = self._hookexec(self, [method], kwargs)
/usr/lib/python3.9/site-packages/pluggy/manager.py:93: in _hookexec
    return self._inner_hookexec(hook, methods, kwargs)
/usr/lib/python3.9/site-packages/pluggy/manager.py:84: in <lambda>
    self._inner_hookexec = lambda hook, methods, kwargs: hook.multicall(
tests/topotests/conftest.py:62: in pytest_configure
    if config.getoption("--topology-only"):
/usr/lib/python3.9/site-packages/_pytest/config/__init__.py:1474: in getoption
    raise ValueError(f"no option named {name!r}") from e
E   ValueError: no option named 'topology_only'

Signed-off-by: Quentin Young <qlyoung@nvidia.com>
3 years agoMerge pull request #8415 from mjstapp/fix_ospf_keyid_config
Igor Ryzhov [Wed, 7 Apr 2021 12:16:47 +0000 (15:16 +0300)]
Merge pull request #8415 from mjstapp/fix_ospf_keyid_config

ospfd: permit over-write of message-digest-key

3 years agoMerge pull request #8413 from mjstapp/zebra_doc_debugs
Quentin Young [Tue, 6 Apr 2021 22:11:50 +0000 (22:11 +0000)]
Merge pull request #8413 from mjstapp/zebra_doc_debugs

docs: add zebra debug docs

3 years agoMerge pull request #8411 from donaldsharp/nhrp_really
Jafar Al-Gharaibeh [Tue, 6 Apr 2021 20:00:57 +0000 (15:00 -0500)]
Merge pull request #8411 from donaldsharp/nhrp_really

nhrpd: Fixup tab usage and sockunion2str usage

3 years agoospfd: permit over-write of message-digest-key
Mark Stapp [Tue, 6 Apr 2021 19:26:51 +0000 (15:26 -0400)]
ospfd: permit over-write of message-digest-key

Allow over-write of message-digest-key interface config. Most
attributes handle multi-instance by ... ignoring instances,
and tolerating repeated config: do the same for md5 auth.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
3 years agodocs: add zebra debug docs
Mark Stapp [Tue, 6 Apr 2021 18:18:18 +0000 (14:18 -0400)]
docs: add zebra debug docs

Add docs for the zebra debug commands.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
3 years agoMerge pull request #8405 from mjstapp/skip_backup_lsps
Russ White [Tue, 6 Apr 2021 15:11:52 +0000 (11:11 -0400)]
Merge pull request #8405 from mjstapp/skip_backup_lsps

zebra: don't process LSPs with backups immediately

3 years agoMerge pull request #8407 from ton31337/fix/nexthop_should_not_be_changed_if_peer_shar...
Russ White [Tue, 6 Apr 2021 15:02:19 +0000 (11:02 -0400)]
Merge pull request #8407 from ton31337/fix/nexthop_should_not_be_changed_if_peer_shares_common_subnet

tests: Nexthop should not be changed if peer X shares a common subnet

3 years agonhrpd: Fixup tab usage and sockunion2str usage
Donald Sharp [Tue, 6 Apr 2021 14:09:48 +0000 (10:09 -0400)]
nhrpd: Fixup tab usage and sockunion2str usage

For some reason the usage of tabs in a string snuck in as well
as using a sockunion2str instead of %pSU.  Fix.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 years agoMerge pull request #8295 from opensourcerouting/ospf6-topo-stabilize
Mark Stapp [Tue, 6 Apr 2021 13:48:45 +0000 (09:48 -0400)]
Merge pull request #8295 from opensourcerouting/ospf6-topo-stabilize

topotest: stabilize OSPFv3 topology

3 years agoMerge pull request #8360 from kuldeepkash/bgp_graceful_restart
Martin Winter [Tue, 6 Apr 2021 12:09:52 +0000 (14:09 +0200)]
Merge pull request #8360 from kuldeepkash/bgp_graceful_restart

tests: Fix for BGP_GR test failures

3 years agotests: Nexthop should not be changed if peer X shares a common subnet
Donatas Abraitis [Tue, 6 Apr 2021 06:51:21 +0000 (09:51 +0300)]
tests: Nexthop should not be changed if peer X shares a common subnet

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
3 years agoMerge pull request #8391 from idryzhov/fix-bgp-nb-prefix-list
Renato Westphal [Tue, 6 Apr 2021 04:10:41 +0000 (01:10 -0300)]
Merge pull request #8391 from idryzhov/fix-bgp-nb-prefix-list

bgpd: prefix-list and route-map nb fixes

3 years agoMerge pull request #8384 from volta-networks/fix_no_srb_block
Quentin Young [Tue, 6 Apr 2021 03:44:25 +0000 (03:44 +0000)]
Merge pull request #8384 from volta-networks/fix_no_srb_block

tools: do in-place SRGB/SRLB changes

3 years agozebra: be more selective about processing LSPs
Mark Stapp [Mon, 5 Apr 2021 19:10:44 +0000 (15:10 -0400)]
zebra: be more selective about processing LSPs

When certain events occur (connected route changes e.g.)
zebra examines LSPs to see if they might have been affected. For
LSPs with backup nhlfes, skip this immediate processing and
wait for the owning protocol daemon to react.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
3 years agozebra: add 'detail' mpls debug setting
Mark Stapp [Mon, 5 Apr 2021 17:48:21 +0000 (13:48 -0400)]
zebra: add 'detail' mpls debug setting

Add setting and cli for 'debug zebra mpls detail'.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
3 years agoMerge pull request #8348 from chiragshah6/mdev
Igor Ryzhov [Mon, 5 Apr 2021 16:32:43 +0000 (19:32 +0300)]
Merge pull request #8348 from chiragshah6/mdev

yang, bgpd: add northbound transactional callbacks for neighbor route-map for af l2vpn-evpn

3 years agotests: Fix for BGP_GR test failures
Kuldeep Kashyap [Mon, 29 Mar 2021 00:55:07 +0000 (17:55 -0700)]
tests: Fix for BGP_GR test failures

Few tests were failing in BGP-GR intermittently. Fixing the failures.

Signed-off-by: Kuldeep Kashyap <kashyapk@vmware.com>
3 years agoMerge pull request #8240 from reubendowle/fixes/nhrp-nat
Jafar Al-Gharaibeh [Sun, 4 Apr 2021 03:37:25 +0000 (22:37 -0500)]
Merge pull request #8240 from reubendowle/fixes/nhrp-nat

nhrp: NAT fixes

3 years agoMerge pull request #8378 from pguibert6WIND/listen_group_limit
Quentin Young [Sun, 4 Apr 2021 00:42:19 +0000 (00:42 +0000)]
Merge pull request #8378 from pguibert6WIND/listen_group_limit

bgpd: increase the maximum number of neighbors in a listen group

3 years agoMerge pull request #8364 from stipmonster/master
Quentin Young [Sun, 4 Apr 2021 00:33:19 +0000 (00:33 +0000)]
Merge pull request #8364 from stipmonster/master

Added pathd to the init files

3 years agoMerge pull request #8392 from idryzhov/ospf-ignore-dup
Donald Sharp [Fri, 2 Apr 2021 16:33:11 +0000 (12:33 -0400)]
Merge pull request #8392 from idryzhov/ospf-ignore-dup

ospfd: ignore duplicated "ip ospf area" commands

3 years agoMerge pull request #8376 from mjstapp/fix_remove_inet6_ntoa
Donald Sharp [Fri, 2 Apr 2021 13:31:36 +0000 (09:31 -0400)]
Merge pull request #8376 from mjstapp/fix_remove_inet6_ntoa

lib, ripngd: Remove inet6_ntoa

3 years agoMerge pull request #8382 from taspelund/add_rd_all_v2
Donatas Abraitis [Fri, 2 Apr 2021 08:08:58 +0000 (11:08 +0300)]
Merge pull request #8382 from taspelund/add_rd_all_v2

Add support for 'rd all' in EVPN and L3VPN commands

3 years agobgpd: increase the maximum number of neighbors
Philippe Guibert [Wed, 31 Mar 2021 15:51:34 +0000 (17:51 +0200)]
bgpd: increase the maximum number of neighbors

increase the maximum number of neighbors in a bgp group.
Set the maximum value to 50000 instead of 5000.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
3 years agoospfd: ignore duplicated "ip ospf area" commands
Igor Ryzhov [Fri, 2 Apr 2021 00:22:24 +0000 (03:22 +0300)]
ospfd: ignore duplicated "ip ospf area" commands

Fixes #8388.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
3 years agoMerge pull request #8375 from mjstapp/fix_ignore_pcep_test_files
Donald Sharp [Thu, 1 Apr 2021 20:45:20 +0000 (16:45 -0400)]
Merge pull request #8375 from mjstapp/fix_ignore_pcep_test_files

build: add pceplib test output to gitignore

3 years agoMerge pull request #8358 from idryzhov/fix-nb-vrf-crash
Mark Stapp [Thu, 1 Apr 2021 20:42:03 +0000 (16:42 -0400)]
Merge pull request #8358 from idryzhov/fix-nb-vrf-crash

*: modify VRF_CONFIGURED flag only in VRF NB layer

3 years agobgpd: prefix-list and route-map nb fixes
Igor Ryzhov [Thu, 1 Apr 2021 19:54:39 +0000 (22:54 +0300)]
bgpd: prefix-list and route-map nb fixes

Fix missing/incorrect callbacks.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
3 years agoMerge pull request #8385 from idryzhov/fix-no-bfd
Mark Stapp [Thu, 1 Apr 2021 16:51:10 +0000 (12:51 -0400)]
Merge pull request #8385 from idryzhov/fix-no-bfd

Fix "no bfd" crash

3 years agoMerge pull request #8383 from idryzhov/bgpd-fix-build
Donald Sharp [Thu, 1 Apr 2021 13:21:00 +0000 (09:21 -0400)]
Merge pull request #8383 from idryzhov/bgpd-fix-build

bgpd: fix build warnings

3 years agobfdd: fix profiles autocompletion
Igor Ryzhov [Thu, 1 Apr 2021 12:48:24 +0000 (15:48 +0300)]
bfdd: fix profiles autocompletion

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
3 years agobbfd: clear nb config entries when removing bfd node
Igor Ryzhov [Thu, 1 Apr 2021 12:42:53 +0000 (15:42 +0300)]
bbfd: clear nb config entries when removing bfd node

When bfd node is removed, we must clear all NB entries set by its
children - sessions and profiles. Let's store some fake data as an entry
for the bfd node to be able to unset it later.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
3 years agobfdd: remove profiles when removing bfd node
Igor Ryzhov [Thu, 1 Apr 2021 12:29:18 +0000 (15:29 +0300)]
bfdd: remove profiles when removing bfd node

Fixes #8379.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
3 years agobgpd: fix build warnings
Igor Ryzhov [Thu, 1 Apr 2021 08:03:58 +0000 (11:03 +0300)]
bgpd: fix build warnings

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
3 years agotools: do in-place SRGB/SRLB changes
Emanuele Di Pascale [Mon, 29 Mar 2021 18:18:42 +0000 (20:18 +0200)]
tools: do in-place SRGB/SRLB changes

avoid issuing a [no] command if we are then issuing the affirmative
one. This avoids spurious requests for the default label ranges,
which might fail if something else is using those labels.

Signed-off-by: Emanuele Di Pascale <emanuele@voltanet.io>
3 years agonhrpd: Fix memory leak in error path when forwarding packets
Reuben Dowle [Thu, 1 Apr 2021 01:08:40 +0000 (14:08 +1300)]
nhrpd: Fix memory leak in error path when forwarding packets

Signed-off-by: Reuben Dowle <reuben.dowle@4rf.com>
3 years agobgpd: fix old vpn command compilation failures
Trey Aspelund [Thu, 1 Apr 2021 01:10:12 +0000 (01:10 +0000)]
bgpd: fix old vpn command compilation failures

set_vpn_nexthop/no_set_vpn_nexthop were failing due to missing
declarations and unused variables.
This adds the missing declaration and removes unused variables.

Signed-off-by: Trey Aspelund <taspelund@nvidia.com>
3 years agodoc: Add Displaying Routes by RD section
Trey Aspelund [Fri, 19 Mar 2021 06:37:43 +0000 (06:37 +0000)]
doc: Add Displaying Routes by RD section

Add docs for commands to display BGP table per-RD.
Also update commands to mention flowspec, routes,
advertised-routes, and received-routes.

Signed-off-by: Trey Aspelund <taspelund@nvidia.com>
3 years agobgpd: Add 'rd all' keyword to EVPN/L3VPN show cmds
Trey Aspelund [Tue, 9 Mar 2021 04:28:04 +0000 (04:28 +0000)]
bgpd: Add 'rd all' keyword to EVPN/L3VPN show cmds

New and improved submission for this commit -- updated to accommodate
changes from 4027d19b0.

Adds support for 'rd all' matching for EVPN and L3VPN show commands.
Introduces evpn_show_route_rd_all_macip().
Cleans up some show commands to use SHOW_DISPLAY string constants.

Signed-off-by: Trey Aspelund <taspelund@nvidia.com>
3 years agonhrpd: Ensure invalid pointer is not used if two NAT extensions received
Reuben Dowle [Thu, 1 Apr 2021 01:06:24 +0000 (14:06 +1300)]
nhrpd: Ensure invalid pointer is not used if two NAT extensions received

Also cleanup some minor style issues

Signed-off-by: Reuben Dowle <reuben.dowle@4rf.com>
3 years agoMerge pull request #8345 from dslicenc/frr-reload-vrf-static
Mark Stapp [Wed, 31 Mar 2021 20:52:43 +0000 (16:52 -0400)]
Merge pull request #8345 from dslicenc/frr-reload-vrf-static

Frr reload vrf static

3 years agoMerge pull request #8377 from idryzhov/fix-disable-bfdd
Mark Stapp [Wed, 31 Mar 2021 16:39:17 +0000 (12:39 -0400)]
Merge pull request #8377 from idryzhov/fix-disable-bfdd

ospfd: fix building with --disable-bfdd

3 years agotools: frr-reload fixes for deleting vrf static routes
Don Slice [Fri, 19 Mar 2021 19:10:14 +0000 (15:10 -0400)]
tools: frr-reload fixes for deleting vrf static routes

Problems reported that in certain cases, frr-reload.py would
delete vrf static routes inadvertantly due to two different
reasons. First, vrf statics with null0 or Null0 nexthops would
fail the match since rendered as blackholes.  This was already
fixed for non-vrf statics so added for vrf-based.  Second,
frr-reload would fail to match due to different formats for
adding the command. If entered in the old way
"ip route x.x.x.x/x y.y.y.y vrf NAME" and rendered
in the new sway "vrf NAME\nip route x.x.x.x/x y.y.y.y" it would
fail to match do an inadvertant delete.

Ticket: 2570270
Signed-off-by: Don Slice <dslice@nvidia.com>
3 years agotools: frr-reload.py changes to make black happy
Don Slice [Fri, 19 Mar 2021 19:03:51 +0000 (15:03 -0400)]
tools: frr-reload.py changes to make black happy

Since black is finding issues before applying my change, committing
those changes separately

Signed-off-by: Don Slice <dslice@nvidia.com>
3 years agoMerge pull request #8350 from opensourcerouting/printfrr-revamp
Mark Stapp [Wed, 31 Mar 2021 13:10:30 +0000 (09:10 -0400)]
Merge pull request #8350 from opensourcerouting/printfrr-revamp

lib: `printfrr()` care package

3 years agoospfd: fix building with --disable-bfdd
Igor Ryzhov [Wed, 31 Mar 2021 12:54:34 +0000 (15:54 +0300)]
ospfd: fix building with --disable-bfdd

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
3 years agolib: remove inet6_ntoa api
Mark Stapp [Wed, 31 Mar 2021 12:29:29 +0000 (08:29 -0400)]
lib: remove inet6_ntoa api

Remove inet6_ntoa() - used static buffer, not needed.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
3 years agoripngd: use pI6 instead of inet6_ntoa
Mark Stapp [Wed, 31 Mar 2021 12:28:30 +0000 (08:28 -0400)]
ripngd: use pI6 instead of inet6_ntoa

Stop using unsafe inet6_ntoa(), just use %pI6.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
3 years agobuild: add pceplib test output to gitignore
Mark Stapp [Wed, 31 Mar 2021 12:27:11 +0000 (08:27 -0400)]
build: add pceplib test output to gitignore

Add some pcep unit-test output files to gitignore.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
3 years agoMerge pull request #7419 from patrasar/routemap_nb
Igor Ryzhov [Tue, 30 Mar 2021 23:26:51 +0000 (02:26 +0300)]
Merge pull request #7419 from patrasar/routemap_nb

Routemap nb

3 years agodoc/developer: improve printfrr extension docs
David Lamparter [Sun, 21 Mar 2021 16:35:43 +0000 (17:35 +0100)]
doc/developer: improve printfrr extension docs

The table is getting rather clunky, let's just break this out and make
it pretty there.

Signed-off-by: David Lamparter <equinox@diac24.net>
3 years agolib: save errno in vty_out()
David Lamparter [Fri, 26 Mar 2021 13:27:51 +0000 (14:27 +0100)]
lib: save errno in vty_out()

... so `%m` works correctly, without us trampling over `errno` before we
get to formatting it.

Signed-off-by: David Lamparter <equinox@diac24.net>
3 years agolib: add `%dPF` & `%dSO` formats
David Lamparter [Fri, 26 Mar 2021 13:20:08 +0000 (14:20 +0100)]
lib: add `%dPF` & `%dSO` formats

Just quick helpers to print `AF_*` and `SOCK_*` constants.

Signed-off-by: David Lamparter <equinox@diac24.net>
3 years agolib: fix & improve `%pSU` format
David Lamparter [Fri, 26 Mar 2021 13:16:01 +0000 (14:16 +0100)]
lib: fix & improve `%pSU` format

This wasn't quite formatting IPv6+port in a useful way (no brackets),
and printing the scope ID (interface index) and unix addrs is useful
too.

Signed-off-by: David Lamparter <equinox@diac24.net>
3 years agolib: add `%pSQ` and `%pSE` string escape formats
David Lamparter [Mon, 22 Mar 2021 09:12:42 +0000 (10:12 +0100)]
lib: add `%pSQ` and `%pSE` string escape formats

These are for string quoting (`%pSQ`) and string escaping (`%pSE`); the
sets / escape methods are currently rather "basic" and might be extended
in the future.

Signed-off-by: David Lamparter <equinox@diac24.net>
3 years agolib: add `%*pHX` + `%*pHS` hexdump in printfrr
David Lamparter [Thu, 18 Feb 2021 23:08:11 +0000 (00:08 +0100)]
lib: add `%*pHX` + `%*pHS` hexdump in printfrr

(I'll get to `zlog_hexdump()` in a separate pass.)

Signed-off-by: David Lamparter <equinox@diac24.net>
3 years agolib: add `%pFB` extension to print struct fbuf *
David Lamparter [Tue, 2 Mar 2021 20:39:49 +0000 (21:39 +0100)]
lib: add `%pFB` extension to print struct fbuf *

Useful to insert output from another bprintfrr() call.

Signed-off-by: David Lamparter <equinox@diac24.net>
3 years agolib: add `%pVA` recursive printfrr
David Lamparter [Tue, 2 Mar 2021 19:45:57 +0000 (20:45 +0100)]
lib: add `%pVA` recursive printfrr

Analogous to Linux kernel `%pV` (but our mechanism expects 2 specifier
chars and `%pVA` is clearer anyway.)

Signed-off-by: David Lamparter <equinox@diac24.net>
3 years agolib: add `FMT_NSTD()` for non-standard printf exts
David Lamparter [Fri, 26 Mar 2021 17:11:21 +0000 (18:11 +0100)]
lib: add `FMT_NSTD()` for non-standard printf exts

... to suppress the warnings when using something that isn't quite ISO C
compatible and would otherwise cause compiler warnings from `-Wformat`.

Signed-off-by: David Lamparter <equinox@diac24.net>
3 years agolib: allow discerning unspec width in printfrr ext
David Lamparter [Fri, 26 Mar 2021 16:58:54 +0000 (17:58 +0100)]
lib: allow discerning unspec width in printfrr ext

With 0 currently the default value for the width specifier, it's not
possible to discern that from a %*p where 0 was passed as the length
parameter.  Use -1 to allow for that.

Signed-off-by: David Lamparter <equinox@diac24.net>
3 years agolib: put printfrr extension args into struct
David Lamparter [Sat, 20 Mar 2021 08:02:04 +0000 (09:02 +0100)]
lib: put printfrr extension args into struct

... for easier extensibility.  Add width, # and - flags while at it.

Signed-off-by: David Lamparter <equinox@diac24.net>
3 years agobgpd: North-bound implementation for bgp rmaps
Sarita Patra [Fri, 30 Oct 2020 07:45:43 +0000 (00:45 -0700)]
bgpd: North-bound implementation for bgp rmaps

This commit introduces the implementation for the north-bound
callbacks for the bgp-specific route-map match and set clauses.

Signed-off-by: NaveenThanikachalam <nthanikachal@vmware.com>
Signed-off-by: Sarita Patra <saritap@vmware.com>
3 years agoospfd: North-bound implementation for ospfd rmaps
Sarita Patra [Fri, 30 Oct 2020 07:44:04 +0000 (00:44 -0700)]
ospfd: North-bound implementation for ospfd rmaps

This commit introduces the implementation for the north-bound
callbacks for the ospfd-specific route-map match and set clauses.

Signed-off-by: NaveenThanikachalam <nthanikachal@vmware.com>
Signed-off-by: Sarita Patra <saritap@vmware.com>
3 years agoospf6d: North-bound implementation for ospf6d rmaps
Sarita Patra [Fri, 30 Oct 2020 07:42:34 +0000 (00:42 -0700)]
ospf6d: North-bound implementation for ospf6d rmaps

This commit introduces the implementation for the north-bound
callbacks for the ospf6d-specific route-map match and set clauses.

Signed-off-by: NaveenThanikachalam <nthanikachal@vmware.com>
Signed-off-by: Sarita Patra <saritap@vmware.com>
3 years agozebra: North-bound implementation for zebra rmaps
Sarita Patra [Fri, 30 Oct 2020 07:41:19 +0000 (00:41 -0700)]
zebra: North-bound implementation for zebra rmaps

This commit introduces the implementation for the north-bound
callbacks for the zebra-specific route-map match and set clauses.

Signed-off-by: NaveenThanikachalam <nthanikachal@vmware.com>
Signed-off-by: Sarita Patra <saritap@vmware.com>
3 years agolib: Modifications to route-map NB
Sarita Patra [Fri, 30 Oct 2020 07:38:41 +0000 (00:38 -0700)]
lib: Modifications to route-map NB

This commit introduces the changes to the library route-map
north-bound callback implementation in order to align it to
the modified yang definitions.

Signed-off-by: NaveenThanikachalam <nthanikachal@vmware.com>
Signed-off-by: Sarita Patra <saritap@vmware.com>
3 years agolib,zebra,bgpd,ospfd,ospf6d: Route-map yang defns
Sarita Patra [Fri, 30 Oct 2020 06:40:10 +0000 (23:40 -0700)]
lib,zebra,bgpd,ospfd,ospf6d: Route-map yang defns

This commit includes the following:
1) Modifications to the frr-route-map.yang to enable addition of
   bgpd, ospfd, ospf6d and zebra specific route map match/set clauses.
2) Yang definitions for bgpd match/set clauses.
3) Yang definitions for ospfd and ospf6d match/set clauses.
4) Yang definitions for zebra match/set clauses.

Signed-off-by: NaveenThanikachalam <nthanikachal@vmware.com>
Signed-off-by: Sarita Patra <saritap@vmware.com>
3 years agoMerge pull request #8058 from rgirada/ospf-ecmp
Mark Stapp [Tue, 30 Mar 2021 15:57:33 +0000 (11:57 -0400)]
Merge pull request #8058 from rgirada/ospf-ecmp

ospfd: Max multipath config support

3 years agoMerge pull request #8372 from FRRouting/revert-8216-add_rd_all
Russ White [Tue, 30 Mar 2021 15:34:00 +0000 (11:34 -0400)]
Merge pull request #8372 from FRRouting/revert-8216-add_rd_all

Revert "bgpd: Add 'rd all' keyword to EVPN/L3VPN show cmds"

3 years agoRevert "bgpd: Add 'rd all' keyword to EVPN/L3VPN show cmds"
Lou Berger [Tue, 30 Mar 2021 15:27:07 +0000 (11:27 -0400)]
Revert "bgpd: Add 'rd all' keyword to EVPN/L3VPN show cmds"

3 years agoMerge pull request #8216 from taspelund/add_rd_all
Russ White [Tue, 30 Mar 2021 14:41:08 +0000 (10:41 -0400)]
Merge pull request #8216 from taspelund/add_rd_all

bgpd: Add 'rd all' keyword to EVPN/L3VPN show cmds

3 years agoMerge pull request #8267 from idryzhov/bgp-cli-fixes
Russ White [Tue, 30 Mar 2021 14:40:43 +0000 (10:40 -0400)]
Merge pull request #8267 from idryzhov/bgp-cli-fixes

bgp cli fixes

3 years agoMerge pull request #8311 from idryzhov/nb-sorting
Russ White [Tue, 30 Mar 2021 14:37:31 +0000 (10:37 -0400)]
Merge pull request #8311 from idryzhov/nb-sorting

Sort route-maps/access-lists/prefix-lists by sequence number in running-config

3 years agoMerge pull request #8057 from ranjanyash54/default-route
Russ White [Tue, 30 Mar 2021 14:34:05 +0000 (10:34 -0400)]
Merge pull request #8057 from ranjanyash54/default-route

ospf6d: Default Route functionality

3 years agoMerge pull request #8137 from Orange-OpenSource/ospf_ls
Russ White [Tue, 30 Mar 2021 14:28:37 +0000 (10:28 -0400)]
Merge pull request #8137 from Orange-OpenSource/ospf_ls

ospfd: Add Link State support

3 years agoMerge pull request #8056 from jmmikkel/peertype
Russ White [Tue, 30 Mar 2021 14:26:57 +0000 (10:26 -0400)]
Merge pull request #8056 from jmmikkel/peertype

bgpd: Add "bgp bestpath peer-type multipath-relax"

3 years agoMerge pull request #8368 from volta-networks/fix_isis_ospfv3_coverity
Russ White [Tue, 30 Mar 2021 14:22:05 +0000 (10:22 -0400)]
Merge pull request #8368 from volta-networks/fix_isis_ospfv3_coverity

ospf6d: fix coverity warning

3 years agoMerge pull request #8369 from idryzhov/filter-fixes
Russ White [Tue, 30 Mar 2021 14:21:37 +0000 (10:21 -0400)]
Merge pull request #8369 from idryzhov/filter-fixes

access-list and prefix-list fixes

3 years agoMerge pull request #8362 from idryzhov/fix-ospf-cli-count
Mark Stapp [Tue, 30 Mar 2021 12:48:25 +0000 (08:48 -0400)]
Merge pull request #8362 from idryzhov/fix-ospf-cli-count

ospfd: fix counting of "ip ospf area" commands

3 years agoospfd: fix counting of "ip ospf area" commands
Igor Ryzhov [Mon, 29 Mar 2021 11:47:43 +0000 (14:47 +0300)]
ospfd: fix counting of "ip ospf area" commands

Instead of trying to maintain if_ospf_cli_count, let's directly count
the number of configured interfaces when it is needed. Current approach
sometimes leads to an incorrect counter.

Fixes #8321.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
3 years agoospfd: Max multipath config support
rgirada [Thu, 11 Feb 2021 10:05:12 +0000 (02:05 -0800)]
ospfd: Max multipath config support

Description:
OSPF does not have an option to control the maximum multiple
equal cost paths to reach a destination/route(ECMP).
Currently, it is using the system specific max multiple paths.
But Somtimes, It requires to control the multiple paths from ospf.
This cli helps to configure the max number multiple paths in ospf.

Signed-off-by: Rajesh Girada <rgirada@vmware.com>
3 years agoMerge pull request #8351 from volta-networks/fix_ospf6_abr_examin_summary_check_cost_...
Martin Winter [Mon, 29 Mar 2021 23:00:51 +0000 (01:00 +0200)]
Merge pull request #8351 from volta-networks/fix_ospf6_abr_examin_summary_check_cost_change

ospf6d: fix ospf6_abr_examin_summary to check for a path cost change

3 years agolib: fix checking for duplicated prefix-list entries
Igor Ryzhov [Mon, 29 Mar 2021 21:37:52 +0000 (00:37 +0300)]
lib: fix checking for duplicated prefix-list entries

Restore the behavior that was before the NB conversion.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
3 years agolib: restore checks for duplicated prefix-list entries
Igor Ryzhov [Mon, 29 Mar 2021 21:25:19 +0000 (00:25 +0300)]
lib: restore checks for duplicated prefix-list entries

The checks were incorrectly removed in commit 4d2f546f under the
assumption that it is needed only in CLI. Actually the checks are needed
for the case when the sequence number is explicitly set by a user.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
3 years agolib: finish consolidation of prefix-list nb callbacks
Igor Ryzhov [Mon, 29 Mar 2021 19:53:36 +0000 (22:53 +0300)]
lib: finish consolidation of prefix-list nb callbacks

There was an attempt to consolidate the code in commit fae60215, but the
work was not actually finished and some necessary checks were missed.

Let's finish it.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
3 years agolib: fix checking for duplicated access-list entries
Igor Ryzhov [Mon, 29 Mar 2021 18:26:28 +0000 (21:26 +0300)]
lib: fix checking for duplicated access-list entries

Restore the behavior that was before the NB conversion.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
3 years agoMerge pull request #8346 from mjstapp/fix_cov_sa
David Lamparter [Mon, 29 Mar 2021 18:17:12 +0000 (20:17 +0200)]
Merge pull request #8346 from mjstapp/fix_cov_sa

3 years agoospf6d: fix coverity warning
lynne [Mon, 29 Mar 2021 17:33:07 +0000 (13:33 -0400)]
ospf6d: fix coverity warning

Signed-off-by: Lynne Morrison <lynne@voltanet.io>
3 years agotools: Added pathd to the relevant init files
Erik Kooistra [Mon, 29 Mar 2021 13:15:12 +0000 (15:15 +0200)]
tools: Added pathd to the relevant init files

Currently pathd is missing from the deamon list in frrcommon
with this missing frrinit can't start pathd if it is added to
the deamon file. This commit adds it to the frrcommon deamon list
and updates the example deamon file.

Signed-off-by: Erik Kooistra <me@erikkooistra.nl>
3 years agotopotests: add tests for OSPFv3 default route
Rafael Zalamena [Wed, 10 Mar 2021 13:21:14 +0000 (10:21 -0300)]
topotests: add tests for OSPFv3 default route

Three new tests:

 - OSPFv3 convergence using 'ipv6 ospf6 neighbor json'
 - Default route functionality:
   * Check that the LSA is present
   * Check that the route was installed

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
3 years agoospf6d: Minor changes for stub area
Yash Ranjan [Tue, 23 Mar 2021 05:05:01 +0000 (22:05 -0700)]
ospf6d: Minor changes for stub area

Signed-off-by: Yash Ranjan <ranjany@vmware.com>
3 years agodoc: Add documentation for default-information originate.
Yash Ranjan [Mon, 22 Mar 2021 06:40:25 +0000 (23:40 -0700)]
doc: Add documentation for default-information originate.

Signed-off-by: Yash Ranjan <ranjany@vmware.com>
3 years agoospf6d: Add logic to set metric if route-map not present
Yash Ranjan [Wed, 10 Feb 2021 07:28:52 +0000 (23:28 -0800)]
ospf6d: Add logic to set metric if route-map not present

Signed-off-by: Yash Ranjan <ranjany@vmware.com>
3 years agoospf6d: Add logic to change the status of router to ASBR
Yash Ranjan [Wed, 10 Feb 2021 06:44:44 +0000 (22:44 -0800)]
ospf6d: Add logic to change the status of router to ASBR

Signed-off-by: Yash Ranjan <ranjany@vmware.com>
3 years agoospf6d: Add CLI and logic for default-information originate command
Yash Ranjan [Wed, 10 Feb 2021 04:53:46 +0000 (20:53 -0800)]
ospf6d: Add CLI and logic for default-information originate command

Signed-off-by: Yash Ranjan <ranjany@vmware.com>
3 years ago*: modify VRF_CONFIGURED flag only in VRF NB layer
Igor Ryzhov [Sun, 28 Mar 2021 21:49:13 +0000 (00:49 +0300)]
*: modify VRF_CONFIGURED flag only in VRF NB layer

This is to fix the crash reproduced by the following steps:

* ip link add red type vrf table 1

  Creates VRF.

* vtysh -c "conf" -c "vrf red"

  Creates VRF NB node and marks VRF as configured.

* ip route 1.1.1.0/24 2.2.2.2 vrf red
* no ip route 1.1.1.0/24 2.2.2.2 vrf red
  (or similar l3vni set/unset in zebra)

  Marks VRF as NOT configured.

* ip link del red

  VRF is deleted, because it is marked as not configured, but NB node
  stays.

Subsequent attempt to configure something in the VRF leads to a crash
because of the stale pointer in NB layer.

Fixes #8357.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
3 years agonhrpd: Make some debug prints more informative
Philippe Guibert [Sun, 28 Mar 2021 21:21:16 +0000 (10:21 +1300)]
nhrpd: Make some debug prints more informative

Signed-off-by: Reuben Dowle <reuben.dowle@4rf.com>