summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
m---------docs/_include/vyos-1x0
-rw-r--r--docs/changelog/1.3.rst23
-rw-r--r--docs/changelog/1.4.rst9
-rw-r--r--docs/configuration/interfaces/bridge.rst76
-rw-r--r--docs/configuration/pki/index.rst2
-rw-r--r--docs/configuration/vrf/index.rst8
-rw-r--r--docs/operation/information.rst2
7 files changed, 81 insertions, 39 deletions
diff --git a/docs/_include/vyos-1x b/docs/_include/vyos-1x
-Subproject 48c768abbf53b752a55db2adea1f998cb28da55
+Subproject 67a5ca7fa372f8e3679b533d370ffa362c76f4c
diff --git a/docs/changelog/1.3.rst b/docs/changelog/1.3.rst
index b9777b18..e5cf04e6 100644
--- a/docs/changelog/1.3.rst
+++ b/docs/changelog/1.3.rst
@@ -8,6 +8,25 @@
_ext/releasenotes.py
+2021-07-23
+==========
+
+* :vytask:`T3699` (bug): login: verify selected "system login user" name is not already used by the base system.
+
+
+2021-07-21
+==========
+
+* :vytask:`T3689` (bug): static ipv6 route doesn't deleted in some cases
+* :vytask:`T3685` (feature): IPv6 PBR doesn't allow setting of an egress interface
+
+
+2021-07-20
+==========
+
+* :vytask:`T3691` (bug): GRETAP: key is not applied when interface is created
+
+
2021-07-13
==========
@@ -215,6 +234,7 @@
* :vytask:`T3575` (bug): pseudo-ethernet: must check source-interface MTU
* :vytask:`T3571` (bug): Broken Show Tab Complete
+* :vytask:`T3576` (bug): ISIS does not support IPV6
2021-05-23
@@ -566,6 +586,7 @@
* :vytask:`T3364` (feature): tunnel: cleanup/rename CLI nodes
* :vytask:`T3368` (feature): macsec: add support for gcm-aes-256 cipher
* :vytask:`T3366` (bug): tunnel: can not change local / remote ip address for gre-bridge tunnel
+* :vytask:`T3173` (feature): Need 'nopmtudisc' option for tunnel interface
2021-02-26
@@ -618,7 +639,7 @@
2021-02-16
==========
-* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.132 / 5.10.50
+* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.134 / 5.10.52
2021-02-14
diff --git a/docs/changelog/1.4.rst b/docs/changelog/1.4.rst
index 1f4b1410..66542473 100644
--- a/docs/changelog/1.4.rst
+++ b/docs/changelog/1.4.rst
@@ -8,6 +8,13 @@
_ext/releasenotes.py
+2021-07-23
+==========
+
+* :vytask:`T3699` (bug): login: verify selected "system login user" name is not already used by the base system.
+* :vytask:`T3698` (default): Support bridge monitoring
+
+
2021-07-13
==========
@@ -741,7 +748,7 @@
==========
* :vytask:`T3313` (bug): ospfv3 interface missing options
-* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.132 / 5.10.50
+* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.134 / 5.10.52
2021-02-15
diff --git a/docs/configuration/interfaces/bridge.rst b/docs/configuration/interfaces/bridge.rst
index 2374da4d..ebb2232a 100644
--- a/docs/configuration/interfaces/bridge.rst
+++ b/docs/configuration/interfaces/bridge.rst
@@ -261,51 +261,59 @@ This results in the active configuration:
Using the operation mode command to view Bridge Information
===========================================================
-.. opcmd:: show bridge
+.. opcmd:: show bridge
The `show bridge` operational command can be used to display
configured bridges:
.. code-block:: none
- vyos@vyos:~$ show bridge
- bridge name bridge id STP enabled interfaces
- br100 8000.0050569d11df yes eth1
- eth2.10
+ vyos@vyos:~$ show bridge
+ 3: eth1: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 master br0 state forwarding
+ priority 32 cost 100
+ 4: eth2: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 master br0 state forwarding
+ priority 32 cost 100
-.. opcmd:: show bridge <name> spanning-tree
+.. opcmd:: show bridge <name> fdb
- Show bridge `<name>` STP configuration.
+ Show bridge `<name>` fdb displays the current forwarding table:
.. code-block:: none
- vyos@vyos:~$ show bridge br100 spanning-tree
- br100
- bridge id 8000.0050569d11df
- designated root 8000.0050569d11df
- root port 0 path cost 0
- max age 20.00 bridge max age 20.00
- hello time 2.00 bridge hello time 2.00
- forward delay 14.00 bridge forward delay 14.00
- ageing time 300.00
- hello timer 0.06 tcn timer 0.00
- topology change timer 0.00 gc timer 242.02
- flags
-
- eth1 (1)
- port id 8001 state disabled
- designated root 8000.0050569d11df path cost 100
- designated bridge 8000.0050569d11df message age timer 0.00
- designated port 8001 forward delay timer 0.00
- designated cost 0 hold timer 0.00
- flags
-
- eth2.10 (2)
- port id 8002 state disabled
- designated root 8000.0050569d11df path cost 100
- designated bridge 8000.0050569d11df message age timer 0.00
- designated port 8002 forward delay timer 0.00
- designated cost 0 hold timer 0.00
+ vyos@vyos:~$ show bridge br0 fdb
+ 50:00:00:08:00:01 dev eth1 vlan 20 master br0 permanent
+ 50:00:00:08:00:01 dev eth1 vlan 10 master br0 permanent
+ 50:00:00:08:00:01 dev eth1 master br0 permanent
+ 33:33:00:00:00:01 dev eth1 self permanent
+ 33:33:00:00:00:02 dev eth1 self permanent
+ 01:00:5e:00:00:01 dev eth1 self permanent
+ 50:00:00:08:00:02 dev eth2 vlan 20 master br0 permanent
+ 50:00:00:08:00:02 dev eth2 vlan 10 master br0 permanent
+ 50:00:00:08:00:02 dev eth2 master br0 permanent
+ 33:33:00:00:00:01 dev eth2 self permanent
+ 33:33:00:00:00:02 dev eth2 self permanent
+ 01:00:5e:00:00:01 dev eth2 self permanent
+ 33:33:00:00:00:01 dev br0 self permanent
+ 33:33:00:00:00:02 dev br0 self permanent
+ 33:33:ff:08:00:01 dev br0 self permanent
+ 01:00:5e:00:00:6a dev br0 self permanent
+ 33:33:00:00:00:6a dev br0 self permanent
+ 01:00:5e:00:00:01 dev br0 self permanent
+ 33:33:ff:00:00:00 dev br0 self permanent
+
+.. opcmd:: show bridge <name> mdb
+
+ Show bridge `<name>` mdb displays the current multicast group membership
+ table.The table is populated by IGMP and MLD snooping in the bridge driver
+ automatically.
+
+ .. code-block:: none
+
+ vyos@vyos:~$ show bridge br0 mdb
+ dev br0 port br0 grp ff02::1:ff00:0 temp vid 1
+ dev br0 port br0 grp ff02::2 temp vid 1
+ dev br0 port br0 grp ff02::1:ff08:1 temp vid 1
+ dev br0 port br0 grp ff02::6a temp vid 1
.. opcmd: show bridge <name> macs
diff --git a/docs/configuration/pki/index.rst b/docs/configuration/pki/index.rst
index e44e1ba3..e1d0fe35 100644
--- a/docs/configuration/pki/index.rst
+++ b/docs/configuration/pki/index.rst
@@ -1,4 +1,4 @@
-lastproofread: 1970-01-01
+:lastproofread: 1970-01-01
.. include:: /_include/need_improvement.txt
diff --git a/docs/configuration/vrf/index.rst b/docs/configuration/vrf/index.rst
index 23bc5422..f4a50a36 100644
--- a/docs/configuration/vrf/index.rst
+++ b/docs/configuration/vrf/index.rst
@@ -1,4 +1,4 @@
-:lastproofread:2021-07-07
+:lastproofread: 2021-07-07
.. _vrf:
@@ -187,6 +187,8 @@ For VRF maintenance the following operational commands are in place.
route packets taken to the given hosts IP address family. This option is
useful when the host is specified as a hostname rather than an IP address.
+.. _vrf example:
+
Example
=======
@@ -206,6 +208,8 @@ The following example topology was build using EVE-NG.
``red``. Say this is the HR department.
* R1 is managed through an out-of-band network that resides in VRF ``mgmt``
+.. _vrf example configuration:
+
Configuration
^^^^^^^^^^^^^
@@ -236,6 +240,8 @@ Configuration
set vrf name red protocols static route 10.0.0.0/24 interface eth1 vrf 'default'
set vrf name red table '2000'
+.. _vrf example operation:
+
Operation
^^^^^^^^^
diff --git a/docs/operation/information.rst b/docs/operation/information.rst
index ad235210..95cf28ef 100644
--- a/docs/operation/information.rst
+++ b/docs/operation/information.rst
@@ -1,4 +1,4 @@
-:lastproofread:2021-07-07
+:lastproofread: 2021-07-07
.. _information: