summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
m---------docs/_include/vyos-1x0
-rw-r--r--docs/changelog/1.3.rst124
-rw-r--r--docs/changelog/1.4.rst138
-rw-r--r--docs/conf.py2
-rw-r--r--docs/configuration/interfaces/index.rst2
-rw-r--r--docs/configuration/interfaces/pseudo-ethernet.rst6
-rw-r--r--docs/configuration/interfaces/vti.rst5
-rw-r--r--docs/configuration/interfaces/wireless.rst6
-rw-r--r--docs/configuration/interfaces/wirelessmodem.rst128
-rw-r--r--docs/configuration/interfaces/wwan.rst336
-rw-r--r--docs/configuration/vpn/l2tp.rst2
11 files changed, 607 insertions, 142 deletions
diff --git a/docs/_include/vyos-1x b/docs/_include/vyos-1x
-Subproject 8f304d2e214c9123b106b2feab8d310912c6b00
+Subproject 78099bccc510c90ad7cfa5f56475ba024d5d53a
diff --git a/docs/changelog/1.3.rst b/docs/changelog/1.3.rst
index 03e4bd04..afc77f4a 100644
--- a/docs/changelog/1.3.rst
+++ b/docs/changelog/1.3.rst
@@ -8,6 +8,126 @@
_ext/releasenotes.py
+2021-06-13
+==========
+
+* :vytask:`T3620` (feature): Rename WWAN interface from wirelessmodem to wwan to use QMI interface
+* :vytask:`T3622` (feature): WWAN: add support for APN authentication
+* :vytask:`T3621` (bug): PPPoE interface does not validate if password is supplied when username is set
+
+
+2021-06-12
+==========
+
+* :vytask:`T3609` (bug): BGP Peer Group Changes Slow
+
+
+2021-06-10
+==========
+
+* :vytask:`T3250` (bug): PPPoE server: wrong local usernames
+* :vytask:`T3138` (bug): ddclient improperly updated when apply rfc2136 config
+* :vytask:`T2620` (feature): Add ipsec peer-name to log to simplifies grepping and troubleshooting
+* :vytask:`T2645` (default): Editing route-map Action Requires New Rule
+
+
+2021-06-09
+==========
+
+* :vytask:`T3602` (bug): Renaming BGP Peer Groups Leaves Router Broken
+* :vytask:`T2916` (bug): A state of VTI interface in a configuration does not being processing properly
+* :vytask:`T2855` (default): disabled vti interfaces still working
+
+
+2021-06-08
+==========
+
+* :vytask:`T3605` (default): Allow to set prefer-global for ipv6-next-hop
+* :vytask:`T3607` (feature): [route-map] set ipv6 next-hop prefer-global
+* :vytask:`T3289` (bug): No description for node "service" conf-mode
+
+
+2021-06-07
+==========
+
+* :vytask:`T3581` (bug): Incomplete command `show ipv6 ospfv3 linkstate`
+* :vytask:`T3516` (bug): FRR 7.5 adds a second route when you attempt to change a static route distance instead of overwriting the old route
+* :vytask:`T3461` (bug): OpenConnect Server redundancy check
+* :vytask:`T3455` (bug): system users can not be added in "edit"
+
+
+2021-06-04
+==========
+
+* :vytask:`T3592` (feature): Set default TTL 64 for tunnels
+
+
+2021-06-01
+==========
+
+* :vytask:`T406` (bug): VPN configuration error: IPv6 over IPv4 IPsec is not supported when using IPv6 ONLY tunnel.
+
+
+2021-05-30
+==========
+
+* :vytask:`T3524` (default): Please implement bgp graceful-shutdown
+* :vytask:`T1866` (bug): Commit archive over SFTP doesn't work with non-standard ports
+* :vytask:`T3589` (feature): op-mode: support clearing out logfiles from CLI
+* :vytask:`T3508` (bug): Check if there's enough drive space for an upgrade before downloading an image
+* :vytask:`T1506` (enhancment): commit-archive scp/sftp public key authentication
+
+
+2021-05-29
+==========
+
+* :vytask:`T3135` (bug): BFD configurations fail to be applied
+* :vytask:`T3103` (default): Rewrite parts of vyos\frr.py for readability, logging and to fix mulitiline regex "bugs"
+* :vytask:`T2739` (default): vyos-utils is not compiled with a Jenkins pipeline.
+* :vytask:`T2451` (bug): Cannot use !tcp or !tcp_udp while adding firewall rule
+* :vytask:`T2436` (default): equuleus: Testing: vyos-1x: syntax checking python scripts in PR
+* :vytask:`T2184` (bug): OpenVPN op_mode tools broken
+* :vytask:`T1944` (bug): FRR: Invalid route in BGP causes update storm, memory leak, and failure of Zebra.
+* :vytask:`T1995` (bug): "show vpn ike sa" command always show child-sas as down
+
+
+2021-05-28
+==========
+
+* :vytask:`T1579` (feature): Rewrite all interface types in new XML/Python style
+
+
+2021-05-27
+==========
+
+* :vytask:`T2629` (bug): VXLAN interfaces don't actually allow you to configure most settings
+* :vytask:`T2617` (feature): Rewrite vyatta-op-quagga "show" to XML
+* :vytask:`T2512` (feature): vyatta-op-quagga [show ip] to XML format
+* :vytask:`T1905` (default): Update to Keepalived 2.0.19
+* :vytask:`T2669` (bug): DHCP-server overlapping ranges.
+
+
+2021-05-26
+==========
+
+* :vytask:`T3558` (default): autocomplete options for dhcp-interface is not showing for the static route command
+* :vytask:`T3540` (bug): Keepalived memory utilisation issue when constantly getting its state in JSON format
+* :vytask:`T2807` (feature): IPv6 Link-Local Address - Automatically generation/configuration on GRE Interfaces
+
+
+2021-05-25
+==========
+
+* :vytask:`T3569` (bug): Firewall wrong completion help values
+
+
+2021-05-24
+==========
+
+* :vytask:`T3575` (bug): pseudo-ethernet: must check source-interface MTU
+* :vytask:`T3571` (bug): Broken Show Tab Complete
+
+
2021-05-23
==========
@@ -408,7 +528,7 @@
2021-02-16
==========
-* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.121 / 5.10.39
+* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.125 / 5.10.43
2021-02-14
@@ -750,6 +870,7 @@
* :vytask:`T3131` (bug): Typo in ipsec preshared-secret help
* :vytask:`T3134` (bug): DHCPv6 DUID configuration node missing
* :vytask:`T3140` (feature): Relax "ethernet offload-options" CLI definition
+* :vytask:`T3132` (feature): Enable egress flow accounting
2020-12-17
@@ -1617,6 +1738,7 @@
==========
* :vytask:`T2709` (bug): Destination NAT translation port without address fails to commit
+* :vytask:`T2717` (default): Wrong DHCP server pool size in statistics
* :vytask:`T2519` (bug): Broadcast address does not add automatically
diff --git a/docs/changelog/1.4.rst b/docs/changelog/1.4.rst
index 18412b13..8d4d8125 100644
--- a/docs/changelog/1.4.rst
+++ b/docs/changelog/1.4.rst
@@ -8,6 +8,136 @@
_ext/releasenotes.py
+2021-06-13
+==========
+
+* :vytask:`T3620` (feature): Rename WWAN interface from wirelessmodem to wwan to use QMI interface
+* :vytask:`T2173` (feature): Add the ability to use VRF on VTI interfaces
+* :vytask:`T3622` (feature): WWAN: add support for APN authentication
+* :vytask:`T3606` (bug): SNMP unknown notification OID
+* :vytask:`T3621` (bug): PPPoE interface does not validate if password is supplied when username is set
+
+
+2021-06-12
+==========
+
+* :vytask:`T3611` (bug): WWAN interface (MC7710) no longer works on Kernel 5.10
+* :vytask:`T1534` (bug): IPSec w/ IKEv2 Invalid local-address "any"
+* :vytask:`T3616` (bug): Update to FastAPI causes regression in vyos-http-api-server
+
+
+2021-06-11
+==========
+
+* :vytask:`T3614` (bug): Container network name with hyphen fail
+
+
+2021-06-10
+==========
+
+* :vytask:`T3250` (bug): PPPoE server: wrong local usernames
+* :vytask:`T3138` (bug): ddclient improperly updated when apply rfc2136 config
+* :vytask:`T2620` (feature): Add ipsec peer-name to log to simplifies grepping and troubleshooting
+* :vytask:`T2645` (default): Editing route-map Action Requires New Rule
+
+
+2021-06-08
+==========
+
+* :vytask:`T3605` (default): Allow to set prefer-global for ipv6-next-hop
+* :vytask:`T3607` (feature): [route-map] set ipv6 next-hop prefer-global
+* :vytask:`T3289` (bug): No description for node "service" conf-mode
+
+
+2021-06-07
+==========
+
+* :vytask:`T3461` (bug): OpenConnect Server redundancy check
+* :vytask:`T3455` (bug): system users can not be added in "edit"
+* :vytask:`T3588` (default): IPSec: migrate no longer available options from CLI which are now hardcoded/enabled in strongSwan
+
+
+2021-06-06
+==========
+
+* :vytask:`T842` (feature): Adopt VyOS CLI to latest StrongSwan options and deprecated Keywords
+
+
+2021-06-04
+==========
+
+* :vytask:`T3595` (default): Cannot create new VTI interface
+* :vytask:`T3592` (feature): Set default TTL 64 for tunnels
+
+
+2021-06-03
+==========
+
+* :vytask:`T3384` (feature): Support UDP bandwidth testing
+
+
+2021-06-02
+==========
+
+* :vytask:`T3233` (bug): Interface redirect to dum0
+
+
+2021-06-01
+==========
+
+* :vytask:`T3585` (default): Fix NHRP module for updated interfaces tunnel syntax
+* :vytask:`T3594` (bug): Disable by default service strongswan-starter
+
+
+2021-05-30
+==========
+
+* :vytask:`T3524` (default): Please implement bgp graceful-shutdown
+* :vytask:`T3518` (bug): Warning messages when using SCP commit-archive
+* :vytask:`T3093` (default): Add xml for vpn ipsec
+* :vytask:`T1866` (bug): Commit archive over SFTP doesn't work with non-standard ports
+* :vytask:`T3590` (feature): bgp: add option for limiting maximum number of prefixes to be sent to a peer
+* :vytask:`T3589` (feature): op-mode: support clearing out logfiles from CLI
+* :vytask:`T2641` (feature): Rewrite vpn ipsec OP commands in new style XML syntax
+* :vytask:`T3351` (feature): Installer checking MD5 checksums on the ISO image
+
+
+2021-05-29
+==========
+
+* :vytask:`T1944` (bug): FRR: Invalid route in BGP causes update storm, memory leak, and failure of Zebra.
+* :vytask:`T1888` (feature): Update to StrongSwan 5.9.1
+* :vytask:`T1995` (bug): "show vpn ike sa" command always show child-sas as down
+
+
+2021-05-27
+==========
+
+* :vytask:`T3561` (feature): router-advert: support advertising specific routes
+* :vytask:`T2669` (bug): DHCP-server overlapping ranges.
+
+
+2021-05-26
+==========
+
+* :vytask:`T3540` (bug): Keepalived memory utilisation issue when constantly getting its state in JSON format
+
+
+2021-05-25
+==========
+
+* :vytask:`T3569` (bug): Firewall wrong completion help values
+
+
+2021-05-24
+==========
+
+* :vytask:`T3575` (bug): pseudo-ethernet: must check source-interface MTU
+* :vytask:`T3571` (bug): Broken Show Tab Complete
+* :vytask:`T3555` (bug): GRE TAP tunnel does not silent fragment packets / kernel fix available
+* :vytask:`T3576` (bug): ISIS does not support IPV6
+
+
2021-05-23
==========
@@ -491,7 +621,7 @@
==========
* :vytask:`T3313` (bug): ospfv3 interface missing options
-* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.121 / 5.10.39
+* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.125 / 5.10.43
2021-02-15
@@ -650,3 +780,9 @@
==========
* :vytask:`T3132` (feature): Enable egress flow accounting
+
+
+2020-07-20
+==========
+
+* :vytask:`T2717` (default): Wrong DHCP server pool size in statistics
diff --git a/docs/conf.py b/docs/conf.py
index 3e95e52d..8281827e 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -45,7 +45,7 @@ extensions = ['sphinx.ext.intersphinx',
'sphinx.ext.ifconfig',
'sphinx.ext.graphviz',
'notfound.extension',
- 'autosectionlabel',
+ #'autosectionlabel',
'vyos'
]
diff --git a/docs/configuration/interfaces/index.rst b/docs/configuration/interfaces/index.rst
index 85d2c177..3c75f482 100644
--- a/docs/configuration/interfaces/index.rst
+++ b/docs/configuration/interfaces/index.rst
@@ -23,6 +23,6 @@ Interfaces
vxlan
wireguard
wireless
- wirelessmodem
+ wwan
diff --git a/docs/configuration/interfaces/pseudo-ethernet.rst b/docs/configuration/interfaces/pseudo-ethernet.rst
index 0471d2e1..06b7bd86 100644
--- a/docs/configuration/interfaces/pseudo-ethernet.rst
+++ b/docs/configuration/interfaces/pseudo-ethernet.rst
@@ -1,8 +1,8 @@
.. _pseudo-ethernet-interface:
-#######################
-Pseudo Ethernet/MACVLAN
-#######################
+#########################
+MACVLAN - Pseudo Ethernet
+#########################
Pseudo-Ethernet or MACVLAN interfaces can be seen as subinterfaces to regular
ethernet interfaces. Each and every subinterface is created a different media
diff --git a/docs/configuration/interfaces/vti.rst b/docs/configuration/interfaces/vti.rst
index 62cd13f3..34842866 100644
--- a/docs/configuration/interfaces/vti.rst
+++ b/docs/configuration/interfaces/vti.rst
@@ -1,8 +1,9 @@
+.. _vti-interface:
+
##############################
-Virtual Tunnel Interface (VTI)
+VTI - Virtual Tunnel Interface
##############################
-
Set Virtual Tunnel Interface
.. code-block:: none
diff --git a/docs/configuration/interfaces/wireless.rst b/docs/configuration/interfaces/wireless.rst
index 097d7c49..ccc45f5c 100644
--- a/docs/configuration/interfaces/wireless.rst
+++ b/docs/configuration/interfaces/wireless.rst
@@ -1,8 +1,8 @@
.. _wireless-interface:
-###################
-Wireless LAN (WiFi)
-###################
+########################
+WLAN/WIFI - Wireless LAN
+########################
:abbr:`WLAN (Wireless LAN)` interface provide 802.11 (a/b/g/n/ac) wireless
support (commonly referred to as Wi-Fi) by means of compatible hardware. If your
diff --git a/docs/configuration/interfaces/wirelessmodem.rst b/docs/configuration/interfaces/wirelessmodem.rst
deleted file mode 100644
index a65a47f4..00000000
--- a/docs/configuration/interfaces/wirelessmodem.rst
+++ /dev/null
@@ -1,128 +0,0 @@
-.. _wwan-interface:
-
-####################
-WirelessModem (WWAN)
-####################
-
-The wirelessmodem interface provides access (through a wireless modem/wwan)
-to wireless networks provided by various cellular providers. VyOS uses the
-interfaces wirelessmodem subsystem for configuration.
-
-*************
-Configuration
-*************
-
-Common interface configuration
-==============================
-
-.. cmdinclude:: /_include/interface-description.txt
- :var0: wirelessmodem
- :var1: wlm0
-
-.. cmdinclude:: /_include/interface-disable.txt
- :var0: wirelessmodem
- :var1: wlm0
-
-.. cmdinclude:: /_include/interface-vrf.txt
- :var0: wirelessmodem
- :var1: wlm0
-
-WirelessModem (WWAN) options
-============================
-
-.. cfgcmd:: set interfaces wirelessmodem <interface> apn <apn>
-
- Every WWAN connection requires an :abbr:`APN (Access Point Name)` which is
- used by the client to dial into the ISPs network. This is a mandatory
- parameter. Contact your Service Provider for correct APN.
-
-.. cfgcmd:: set interfaces wirelessmodem <interface> backup distance <metric>
-
- Configure metric of the default route added via the Wireless Modem interface.
- The default metric if not specified is 10.
-
-.. cfgcmd:: set interfaces wirelessmodem <interface> device <tty>
-
- Device identifier of the underlaying physical interface. This is usually a
- ttyUSB device, if not configured this defaults to ttyUSB2.
-
-.. cfgcmd:: set interfaces wirelessmodem <interface> no-peer-dns
-
- Do not install DNS nameservers received from ISP into system wide nameserver
- list.
-
-.. cfgcmd:: set interfaces wirelessmodem <interface> connect-on-demand
-
- When set the interface is enabled for "dial-on-demand".
-
- Use this command to instruct the system to establish a PPP connection
- automatically once traffic passes through the interface. A disabled on-demand
- connection is established at boot time and remains up. If the link fails for
- any reason, the link is brought back up immediately.
-
-*********
-Operation
-*********
-
-.. opcmd:: show interfaces wirelessmodem <interface>
-
- Retrive interface information from given WWAN interface.
-
- .. code-block:: none
-
- vyos@vyos:~$ show interfaces wirelessmodem wlm0
- wlm0: <POINTOPOINT,MULTICAST,NOARP,UP,LOWER_UP> mtu 1500 qdisc pfifo_fast master black state UNKNOWN group default qlen 3
- link/ppp
- inet 10.26.238.93 peer 10.64.64.64/32 scope global wlm0
- valid_lft forever preferred_lft forever
- Description: baaar
-
- RX: bytes packets errors dropped overrun mcast
- 38 5 0 0 0 0
- TX: bytes packets errors dropped carrier collisions
- 217 8 0 0 0 0
-
-.. opcmd:: show interfaces wirelessmodem <interface> statistics
-
- Retrive interface statistics from given WWAN interface.
-
- .. code-block:: none
-
- vyos@vyos:~$ show interfaces wirelessmodem wlm0 statistics
- IN PACK VJCOMP VJUNC VJERR | OUT PACK VJCOMP VJUNC NON-VJ
- 38 5 0 0 0 | 217 8 0 0 8
-
-.. opcmd:: show interfaces wirelessmodem <interface> log
-
- Displays log information for a WWAN interface.
-
-
-*******
-Example
-*******
-
-The following example is based on a Sierra Wireless MC7710 miniPCIe card (only
-the form factor in reality it runs UBS) and Deutsche Telekom as ISP. The card
-is assembled into a :ref:`pc-engines-apu4`.
-
-.. code-block:: none
-
- set interfaces wirelessmodem wlm0 apn 'internet.telekom'
- set interfaces wirelessmodem wlm0 backup distance '100'
- set interfaces wirelessmodem wlm0 device 'ttyUSB2'
- set interfaces wirelessmodem wlm0 disable
- set interfaces wirelessmodem wlm0 no-peer-dns
-
-*****************
-Supported Modules
-*****************
-
-The following hardware modules have been tested successfully in an
-:ref:`pc-engines-apu4` board:
-
-* Sierra Wireless AirPrime MC7304 miniPCIe card (LTE)
-* Sierra Wireless AirPrime MC7430 miniPCIe card (LTE)
-* Sierra Wireless AirPrime MC7455 miniPCIe card (LTE)
-* Sierra Wireless AirPrime MC7710 miniPCIe card (LTE)
-* Huawei ME909u-521 miniPCIe card (LTE)
-* Huawei ME909s-120 miniPCIe card (LTE)
diff --git a/docs/configuration/interfaces/wwan.rst b/docs/configuration/interfaces/wwan.rst
new file mode 100644
index 00000000..196c8f6c
--- /dev/null
+++ b/docs/configuration/interfaces/wwan.rst
@@ -0,0 +1,336 @@
+.. _wwan-interface:
+
+#################################
+WWAN - Wireless Wide-Area-Network
+#################################
+
+The Wireless Wide-Area-Network interface provides access (through a wireless
+modem/wwan) to wireless networks provided by various cellular providers.
+
+VyOS uses the `interfaces wwan` subsystem for configuration.
+
+*************
+Configuration
+*************
+
+Common interface configuration
+==============================
+
+.. cmdinclude:: /_include/interface-address-with-dhcp.txt
+ :var0: wwan
+ :var1: wwan0
+
+
+.. cmdinclude:: /_include/interface-description.txt
+ :var0: wwan
+ :var1: wwan0
+
+.. cmdinclude:: /_include/interface-disable.txt
+ :var0: wwan
+ :var1: wwan0
+
+.. cmdinclude:: /_include/interface-disable-link-detect.txt
+ :var0: wwan
+ :var1: wwan0
+
+.. cmdinclude:: /_include/interface-mtu.txt
+ :var0: wwan
+ :var1: wwan0
+
+.. cmdinclude:: /_include/interface-ip.txt
+ :var0: wwan
+ :var1: wwan0
+
+.. cmdinclude:: /_include/interface-ipv6.txt
+ :var0: wwan
+ :var1: wwan0
+
+.. cmdinclude:: /_include/interface-vrf.txt
+ :var0: wwan
+ :var1: wwan0
+
+**DHCP(v6)**
+
+.. cmdinclude:: /_include/interface-dhcp-options.txt
+ :var0: wwan
+ :var1: wwan0
+
+.. cmdinclude:: /_include/interface-dhcpv6-options.txt
+ :var0: wwan
+ :var1: wwan0
+
+.. cmdinclude:: /_include/interface-dhcpv6-prefix-delegation.txt
+ :var0: wwan
+ :var1: wwan0
+
+WirelessModem (WWAN) options
+============================
+
+.. cfgcmd:: set interfaces wwan <interface> apn <apn>
+
+ Every WWAN connection requires an :abbr:`APN (Access Point Name)` which is
+ used by the client to dial into the ISPs network. This is a mandatory
+ parameter. Contact your Service Provider for correct APN.
+
+
+*********
+Operation
+*********
+
+.. opcmd:: show interfaces wwan <interface>
+
+ Show detailed information on given `<interface>`
+
+ .. code-block:: none
+
+ vyos@vyos:~$ show interfaces wwan wwan0
+ wwan0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc pfifo_fast state UNKNOWN group default qlen 1000
+ link/ether 02:c2:f3:00:01:02 brd ff:ff:ff:ff:ff:ff
+ inet 10.155.144.12/30 brd 10.155.144.15 scope global dynamic wwan0
+ valid_lft 7012sec preferred_lft 7012sec
+ inet6 fe80::c2:f3ff:fe00:0102/64 scope link
+ valid_lft forever preferred_lft forever
+
+ RX: bytes packets errors dropped overrun mcast
+ 640 2 0 0 0 0
+ TX: bytes packets errors dropped carrier collisions
+ 3229 16 0 0 0 0
+
+.. opcmd:: show interfaces wwan <interface> summary
+
+ Show detailed information summary on given `<interface>`
+
+ .. code-block:: none
+
+ vyos@vyos:~$ show interfaces wwan wwan0 summary
+ --------------------------------
+ General | dbus path: /org/freedesktop/ModemManager1/Modem/0
+ | device id: 79f4e9cc2e9fc8d4a3b8c8f6327c2e363170194d
+ --------------------------------
+ Hardware | manufacturer: Sierra Wireless, Incorporated
+ | model: MC7710
+ | revision: SWI9200X_03.05.29.03ap r6485 CNSHZ-ED-XP0031 2014/12/02 17:53:15
+ | h/w revision: 1.0
+ | supported: gsm-umts, lte
+ | current: gsm-umts, lte
+ | equipment id: 358xxxxxxxxxxxx
+ --------------------------------
+ System | device: /sys/devices/pci0000:00/0000:00:13.0/usb3/3-1/3-1.3
+ | drivers: qcserial, qmi_wwan
+ | plugin: Generic
+ | primary port: cdc-wdm0
+ | ports: ttyUSB0 (qcdm), ttyUSB2 (at), cdc-wdm0 (qmi), wwan0 (net)
+ --------------------------------
+ Numbers | own: 4917xxxxxxxx
+ --------------------------------
+ Status | lock: sim-pin2
+ | unlock retries: sim-pin (3), sim-pin2 (3), sim-puk (10), sim-puk2 (10)
+ | state: connected
+ | power state: on
+ | access tech: lte
+ | signal quality: 63% (recent)
+ --------------------------------
+ Modes | supported: allowed: 2g; preferred: none
+ | allowed: 3g; preferred: none
+ | allowed: 4g; preferred: none
+ | allowed: 2g, 3g; preferred: 3g
+ | allowed: 2g, 3g; preferred: 2g
+ | allowed: 2g, 4g; preferred: 4g
+ | allowed: 2g, 4g; preferred: 2g
+ | allowed: 3g, 4g; preferred: 3g
+ | allowed: 3g, 4g; preferred: 4g
+ | allowed: 2g, 3g, 4g; preferred: 4g
+ | allowed: 2g, 3g, 4g; preferred: 3g
+ | allowed: 2g, 3g, 4g; preferred: 2g
+ | current: allowed: 2g, 3g, 4g; preferred: 2g
+ --------------------------------
+ Bands | supported: egsm, dcs, pcs, utran-1, utran-8, eutran-1, eutran-3,
+ | eutran-7, eutran-8, eutran-20
+ | current: egsm, dcs, pcs, utran-1, utran-8, eutran-1, eutran-3,
+ | eutran-7, eutran-8, eutran-20
+ --------------------------------
+ IP | supported: ipv4, ipv6, ipv4v6
+ --------------------------------
+ 3GPP | imei: 358xxxxxxxxxxxx
+ | operator id: 26201
+ | operator name: Telekom.de
+ | registration: home
+ --------------------------------
+ 3GPP EPS | ue mode of operation: ps-1
+ --------------------------------
+ SIM | dbus path: /org/freedesktop/ModemManager1/SIM/0
+ --------------------------------
+ Bearer | dbus path: /org/freedesktop/ModemManager1/Bearer/0
+
+
+.. opcmd:: show interfaces wwan <interface> capabilities
+
+ Show WWAN module hardware capabilities.
+
+ .. code-block:: none
+
+ vyos@vyos:~$ show interfaces wwan wwan0 capabilities
+ Max TX channel rate: '50000000'
+ Max RX channel rate: '100000000'
+ Data Service: 'simultaneous-cs-ps'
+ SIM: 'supported'
+ Networks: 'gsm, umts, lte'
+ Bands: 'gsm-dcs-1800, gsm-900-extended, gsm-900-primary, gsm-pcs-1900, wcdma-2100, wcdma-900'
+ LTE bands: '1, 3, 7, 8, 20'
+
+.. opcmd:: show interfaces wwan <interface> firmware
+
+ Show WWAN module firmware.
+
+ .. code-block:: none
+
+ vyos@vyos:~$ show interfaces wwan wwan0 firmware
+ Model: MC7710
+ Boot version: SWI9200X_03.05.29.03bt r6485 CNSHZ-ED-XP0031 2014/12/02 17:33:08
+ AMSS version: SWI9200X_03.05.29.03ap r6485 CNSHZ-ED-XP0031 2014/12/02 17:53:15
+ SKU ID: unknown
+ Package ID: unknown
+ Carrier ID: 0
+ Config version: unknown
+
+
+.. opcmd:: show interfaces wwan <interface> imei
+
+ Show WWAN module IMEI.
+
+ .. code-block:: none
+
+ vyos@vyos:~$ show interfaces wwan wwan0 imei
+ ESN: '0'
+ IMEI: '358xxxxxxxxxxxx'
+ MEID: 'unknown'
+
+.. opcmd:: show interfaces wwan <interface> imsi
+
+ Show WWAN module IMSI.
+
+ .. code-block:: none
+
+ vyos@vyos:~$ show interfaces wwan wwan0 imsi
+ IMSI: '262xxxxxxxxxxxx'
+
+.. opcmd:: show interfaces wwan <interface> model
+
+ Show WWAN module model.
+
+ .. code-block:: none
+
+ vyos@vyos:~$ show interfaces wwan wwan0 model
+ Model: 'MC7710'
+
+.. opcmd:: show interfaces wwan <interface> msisdn
+
+ Show WWAN module MSISDN.
+
+ .. code-block:: none
+
+ vyos@vyos:~$ show interfaces wwan wwan0 msisdn
+ MSISDN: '4917xxxxxxxx'
+
+.. opcmd:: show interfaces wwan <interface> revision
+
+ Show WWAN module hardware revision.
+
+ .. code-block:: none
+
+ vyos@vyos:~$ show interfaces wwan wwan0 revision
+ Revision: 'SWI9200X_03.05.29.03ap r6485 CNSHZ-ED-XP0031 2014/12/02 17:53:15'
+
+.. opcmd:: show interfaces wwan <interface> signal
+
+ Show WWAN module signal strength.
+
+ .. code-block:: none
+
+ vyos@vyos:~$ show interfaces wwan wwan0 signal
+ LTE:
+ RSSI: '-74 dBm'
+ RSRQ: '-7 dB'
+ RSRP: '-100 dBm'
+ SNR: '13.0 dB'
+ Radio Interface: 'lte'
+ Active Band Class: 'eutran-3'
+ Active Channel: '1300'
+
+.. opcmd:: show interfaces wwan <interface> sim
+
+ Show WWAN module SIM card information.
+
+ .. code-block:: none
+
+ vyos@vyos:~$ show interfaces wwan wwan0 sim
+ Provisioning applications:
+ Primary GW: slot '1', application '1'
+ Primary 1X: session doesn't exist
+ Secondary GW: session doesn't exist
+ Secondary 1X: session doesn't exist
+ Slot [1]:
+ Card state: 'present'
+ UPIN state: 'not-initialized'
+ UPIN retries: '0'
+ UPUK retries: '0'
+ Application [1]:
+ Application type: 'usim (2)'
+ Application state: 'ready'
+ Application ID:
+ A0:00:00:00:87:10:02:FF:49:94:20:89:03:10:00:00
+ Personalization state: 'ready'
+ UPIN replaces PIN1: 'no'
+ PIN1 state: 'disabled'
+ PIN1 retries: '3'
+ PUK1 retries: '10'
+ PIN2 state: 'enabled-not-verified'
+ PIN2 retries: '3'
+ PUK2 retries: '10'
+
+*******
+Example
+*******
+
+The following example is based on a Sierra Wireless MC7710 miniPCIe card (only
+the form factor in reality it runs UBS) and Deutsche Telekom as ISP. The card
+is assembled into a :ref:`pc-engines-apu4`.
+
+.. code-block:: none
+
+ set interfaces wwan wwan0 apn 'internet.telekom'
+ set interfaces wwan wwan0 address 'dhcp'
+
+*****************
+Supported Modules
+*****************
+
+The following hardware modules have been tested successfully in an
+:ref:`pc-engines-apu4` board:
+
+* Sierra Wireless AirPrime MC7304 miniPCIe card (LTE)
+* Sierra Wireless AirPrime MC7430 miniPCIe card (LTE)
+* Sierra Wireless AirPrime MC7455 miniPCIe card (LTE)
+* Sierra Wireless AirPrime MC7710 miniPCIe card (LTE)
+* Huawei ME909u-521 miniPCIe card (LTE)
+* Huawei ME909s-120 miniPCIe card (LTE)
+
+***************
+Firmware Update
+***************
+
+All available WWAN cards have a build in, reprogrammable firmware. Most of the
+vendors provide a regular update to the firmware used in the baseband chip.
+
+As VyOS makes use of the QMI interface to connect to the WWAN modem cards, also
+the firmware can be reprogrammed.
+
+To update the firmware, VyOS also ships the `qmi-firmware-update` binary. To
+upgrade the firmware of an e.g. Sierra Wireless MC7710 module to the firmware
+provided in the file ``9999999_9999999_9200_03.05.14.00_00_generic_000.000_001_SPKG_MC.cwe``
+use the following command:
+
+.. code-block:: bash
+
+ $ sudo qmi-firmware-update --update -d 1199:68a2 \
+ 9999999_9999999_9200_03.05.14.00_00_generic_000.000_001_SPKG_MC.cwe
diff --git a/docs/configuration/vpn/l2tp.rst b/docs/configuration/vpn/l2tp.rst
index 0df5080c..bbe2b881 100644
--- a/docs/configuration/vpn/l2tp.rst
+++ b/docs/configuration/vpn/l2tp.rst
@@ -15,8 +15,6 @@ with native Windows and Mac VPN clients):
.. code-block:: none
set vpn ipsec ipsec-interfaces interface eth0
- set vpn ipsec nat-traversal enable
- set vpn ipsec nat-networks allowed-network 0.0.0.0/0
set vpn l2tp remote-access outside-address 192.0.2.2
set vpn l2tp remote-access client-ip-pool start 192.168.255.2