Age | Commit message (Collapse) | Author |
|
|
|
As IS-IS is a new feature and the CLI configuration changed from 1.3 -> 1.4
(required by T3417) it makes sense to synchronize the CLI configuration for
both versions. This means backporting the CLI from 1.4 -> 1.3 to not confuse
the userbase already with a brand new feature.
As 1.3.0-epa1 is on the way and should not contain any CLI changes afterwards,
this is the perfect time.
|
|
Partial backport of commit 421fa38445a, this is required to backport the
complete IS-IS functionality from current.
|
|
(cherry picked from commit d9d923ea4e0bbe0cc154dc2fbdd626585b5d7449)
|
|
(cherry picked from commit 059307f924c604eb2bdeab19a2db8ce6d8e09f90)
|
|
|
|
The current command to restart any of the FRR processes is:
vyos@vyos:~$ restart frr
Possible completions:
<Enter> Execute the current command
bfdd Restart Bidirectional Forwarding Detection daemon
bgpd Restart Border Gateway Protocol daemon
ospf6d Restart OSPFv3 daemon
ospfd Restart OSPFv2 daemon
ripd Restart Routing Information Protocol daemon
ripngd Restart RIPng daemon
staticd Restart Static Route daemon
zebra Restart IP routing manager daemon
From a real-life example: Two engineers needed 5 minutes to figure it is under
"restart frr" - that is why this commit drops the artificial "frr" level on the
op-mode commands to restart routing protocol daemons.
It's less intuitive to have "restart frr ospfd" or "restart frr bgpd" compared
to "restart ospf" and "restart bgp" - we have the same for "restart ssh" or
"restart snmp" and not "restart openssh sshd".
This commit also drops the d (daemon) suffix of the op-mode comamands so the
commands align with the VyOS CLI, else there would be a miss-understanding from
ospf6d to ospfv3.
|
|
When the interface name was stripped down from "eth0.201" to "eth" to determine
the appropriate interface section, VRRP interfaces got left out on the call
to rstrip().
VRRP interfaces now show up in "show interfaces" as they did in VyOS 1.2.
vyos@vyos:~$ show interfaces
Codes: S - State, L - Link, u - Up, D - Down, A - Admin Down
Interface IP Address S/L Description
--------- ---------- --- -----------
dum0 172.18.254.201/32 u/u
eth0 - u/u
eth0.10 172.16.33.8/24 u/u
eth0.201 172.18.201.10/24 u/u
eth1 10.1.1.2/24 u/u
eth1v10 10.1.1.1/24 u/u
eth2 - u/u
lo 127.0.0.1/8 u/u
::1/128
(cherry picked from commit df22bc2c96d5095eaec978a58bf5d2361d758a86)
|
|
Commit 99440fc0 ("Makefile: fix logic to detect empty "node.def" files")
disabled the detection of empty node.def files for op-mode commands. The
generation of a duplicate and thus empty node.def file is not prohibited
by commit 17b5ac14 ("T3165: op-mode: prevent override of populated node.def file
with empty content") and thus the check is re-enabled!
(cherry picked from commit e99cdf40c72dec8b9019eca728aaad0f82c6030b)
|
|
(cherry picked from commit 68567d60626aa7ee5f990af792eb63f6887d93de)
|
|
(cherry picked from commit d225f938b2250229621c7013c47ce52b839ae169)
|
|
That nasty workaround to always specify the same value for the node.def file
as the help text is no longer necessary after commit 17b5ac14 ("T3165: op-mode:
prevent override of populated node.def file with empty content".
The redundant definitions are no longer necessary.
(cherry picked from commit 536991d0c6f305256ce6ab5975d15116f027b7b6)
|
|
This is an extension to commit b4fdcebe ("T3165: prevent override of populated
node.def file with empty content") which implemented the same thing for the
configuration mode commands.
(cherry picked from commit 17b5ac143c9128ac3e187d8d8167dd8fe6cbca7d)
|
|
(cherry picked from commit 252bc820b0d130d8d81b5711586eca41287abdca)
|
|
|
|
(cherry picked from commit 8fc06b5f8bbfcc49e69406fd70cd5cd42fb6d39f)
|
|
(cherry picked from commit ddff5eba85feea2a8d6d24e1914ce6d51ce2ea74)
|
|
interfaces
(cherry picked from commit 081e0334c00887c373fafde761cca960667be21b)
|
|
(cherry picked from commit b121ee14ff1961b56568b0116de3c246ea4af934)
|
|
vyos@vyos# show interfaces pppoe
pppoe pppoe10 {
+ access-concentrator asdfg
authentication {
password bar
user foo
}
default-route force
no-peer-dns
source-interface eth0.202
}
vyos@vyos# python3
Python 3.9.2 (default, Feb 28 2021, 17:03:44)
[GCC 10.2.1 20210110] on linux
Type "help", "copyright", "credits" or "license" for more information.
>>> from vyos.config import Config
>>> from vyos.configdict import get_interface_dict
>>> from vyos.configdict import leaf_node_changed
>>> conf = Config()
>>> base = ['interfaces', 'pppoe']
>>> tmp = get_interface_dict(conf, base, 'pppoe10')
>>> leaf_node_changed(conf, ['access-concentrator'])
>>> ['']
(cherry picked from commit f476e456e20393e7e7e91b73e369c9b033fbf048)
|
|
WireGuard, Tunnel and also PPPoE all need a ways to calculate a synthetic MAC
address used for the EUI64 link-local addresses. Instead of copying the code
from Tunnel to WireGuard to PPPoE, use a generic implementation.
(cherry picked from commit b7d30137b17da49ed5099d4d96659b363fc7bcc9)
|
|
(cherry picked from commit 8c1c9e1c37be9e88e8a7ea0182a43a3396eff623)
|
|
(cherry picked from commit 9c97bd1b0214e102ac36eae8b2c3c9ff672a0bf3)
|
|
(cherry picked from commit e1debb1b57a445fa2357f7dbb5b3f04383f8b1e3)
|
|
Both building blocks only differed in the help text, so use IP for both
IPv4 and IPv6.
(cherry picked from commit 0e751221d0832acac807e7f0bc97d7bb31230c3a)
|
|
(cherry picked from commit 0a8a0188033d6b27c521f082fdddae9873dd5d3d)
|
|
(cherry picked from commit 6bd780887c0e13dc9272ec499ebc6f01cfaf7ea6)
|
|
(cherry picked from commit 1a498915efdc433dda7bd6e5fcc08703a48560c6)
|
|
This reverts commit 5849ba88a1a20e4d3584843e0be46e456c5f7980.
|
|
build"
This reverts commit 0ecc2c26f7ac939e4e23c14f5027ac7592c25761.
|
|
|
|
This reverts commit 29e438755c8bd2b9598a2016a3c42891f0cbfa1d.
|
|
(cherry picked from commit 19b16986515dcb58955e153025b24dc012faa574)
|
|
(cherry picked from commit 51f7ce31bc60ea9933848bc23efda9386e39a151)
|
|
(cherry picked from commit 90f778fc04b322867f6fec023328330adc3fd85f)
|
|
(cherry picked from commit 6bb2f6e22706bb1c5874a58e74585160164011f6)
|
|
(cherry picked from commit 6c0044d12ecf762d9d362d6b09cdaa4c8227db58)
|
|
(cherry picked from commit 0f498d782c8fc3645355184cc59e88a16d1b230d)
|
|
This completes commit e7d841d285 ("smoketest: shim: remove superfluous sleep()
in getFRRconfig()").
(cherry picked from commit 9b21e4a769385514f0bf625d665d588266dc6de4)
|
|
The sleep was intended to handle a FRR issue where the config was/is somehow
now available in vtysh even with the commit was done. This rather feels
like a race-condition and is fixed in the subsequent commit.
(cherry picked from commit e7d841d2854d8e0ebb95cb6f0bd83e84fba3a9fa)
|
|
(cherry picked from commit d3ae6304a3eabcddba36452e9519ca7b56bb38af)
|
|
(cherry picked from commit 655876f4c22c0f4ea839a81f4af09d6016e19197)
|
|
commit_in_progress()
(cherry picked from commit a74e67a778a6c698e44cbc6c5d184d03c9c12396)
|
|
(cherry picked from commit 1229665d353a070e14ee9cceafbfdb107d669745)
|
|
(cherry picked from commit e5c61fc80119556bb1b61a80868d4a3470e07319)
|
|
(cherry picked from commit f3df9e97c6bedd305133e860654fc0213c12fd6b)
|
|
(cherry picked from commit 7e52a7079afb522d1456833023ad58fa8b05e880)
|
|
(cherry picked from commit 591b8bcadd8b6bbd46c61484193d2bf7e16bd1ae
commit 31553283aaa929da63147082e85513e8d4dacf0e
commit 59a4aadfe419eca16e6288b37d6c51acd9789903)
|
|
(cherry picked from commit e7c69ead85af485b2b881f24b929a4bcc779a4ce and
commit ec6dc94a5144ea4ac75ba6fac4d85b4f66337ae2)
|
|
Commit 166d44b3 ("nat: T1083: add translation options for persistent/random
mapping of address and port") added support for persistent IP address and port
mappings for NAT.
Unfortunately one if clause got lost in translation.
|