wwan: T3620: rename "wirelessmodem wlm" interfaces to new wwan interface tree

25 files changed, 441 insertions, 478 deletions

diff --git a/data/configd-include.json b/data/configd-include.json
index dc82b3dd7..ee939decd 100644
--- a/data/configd-include.json
+++ b/data/configd-include.json
@@ -26,7 +26,7 @@
 "interfaces-vxlan.py",
 "interfaces-wireguard.py",
 "interfaces-wireless.py",
-"interfaces-wirelessmodem.py",
+"interfaces-wwan.py",
 "ipsec-settings.py",
 "lldp.py",
 "nat.py",
diff --git a/data/templates/wwan/chat.tmpl b/data/templates/wwan/chat.tmpl
deleted file mode 100644
index 386af37e6..000000000
--- a/data/templates/wwan/chat.tmpl
+++ /dev/null
@@ -1,10 +0,0 @@
-ABORT 'NO DIAL TONE' ABORT 'NO ANSWER' ABORT 'NO CARRIER' ABORT DELAYED
-'' AT
-OK ATZ
-{% if ipv6 is defined and ipv6.address is defined and ipv6.address.autoconf is defined %}
-OK 'AT+CGDCONT=1,"IPV4V6","{{ apn }}"'
-{% else %}
-OK 'AT+CGDCONT=1,"IP","{{ apn }}"'
-{% endif %}
-OK ATD*99#
-CONNECT ''
diff --git a/data/templates/wwan/ip-down.script.tmpl b/data/templates/wwan/ip-down.script.tmpl
deleted file mode 100644
index 9dc15ea99..000000000
--- a/data/templates/wwan/ip-down.script.tmpl
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-# Script parameters will be like:
-# wlm0 /dev/serial/by-bus/usb0b1.3p1.3 115200 10.100.118.91 10.64.64.64 wlm0
-
-# Only applicable for Wireless Modems (WWAN)
-if [ -z $(echo $2 | egrep "(ttyS[0-9]+|usb[0-9]+b.*)$") ]; then
-    exit 0
-fi
-
-# Determine if we are running inside a VRF or not, required for proper routing table
-# NOTE: the down script can not be properly templated as we need the VRF name,
-# which is not present on deletion, thus we read it from the operating system.
-if [ -d /sys/class/net/{{ ifname }}/upper_* ]; then
-    # Determine upper (VRF) interface
-    VRF=$(basename $(ls -d /sys/class/net/{{ ifname }}/upper_*))
-    # Remove upper_ prefix from result string
-    VRF_NAME=${VRF#"upper_"}
-    # Remove default route from VRF routing table
-    vtysh -c "conf t" -c "vrf ${VRF_NAME}" -c "no ip route 0.0.0.0/0 {{ ifname }}"
-else
-    # Remove default route from GRT (global routing table)
-    vtysh -c "conf t" -c "no ip route 0.0.0.0/0 {{ ifname }}"
-fi
-
-DIALER_PID=$(cat /var/run/{{ ifname }}.pid)
-logger -t pppd[$DIALER_PID] "removed default route via {{ ifname }} metric {{ backup.distance }}"
diff --git a/data/templates/wwan/ip-pre-up.script.tmpl b/data/templates/wwan/ip-pre-up.script.tmpl
deleted file mode 100644
index 199150947..000000000
--- a/data/templates/wwan/ip-pre-up.script.tmpl
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# As WWAN is an "on demand" interface we need to re-configure it when it
-# becomes 'up'
-
-ipparam=$6
-
-# device name and metric are received using ipparam
-device=`echo "$ipparam"|awk '{ print $1 }'`
-
-if [ "$device" != "{{ ifname }}" ]; then
-    exit
-fi
-
-# add some info to syslog
-DIALER_PID=$(cat /var/run/{{ ifname }}.pid)
-logger -t pppd[$DIALER_PID] "executing $0"
-
-echo "{{ description }}" > /sys/class/net/{{ ifname }}/ifalias
-
-{% if vrf %}
-logger -t pppd[$DIALER_PID] "configuring interface {{ ifname }} for VRF {{ vrf }}"
-ip link set dev {{ ifname }} master {{ vrf }}
-{% endif %}
diff --git a/data/templates/wwan/ip-up.script.tmpl b/data/templates/wwan/ip-up.script.tmpl
deleted file mode 100644
index 2603a0286..000000000
--- a/data/templates/wwan/ip-up.script.tmpl
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-# Script parameters will be like:
-# wlm0 /dev/serial/by-bus/usb0b1.3p1.3 115200 10.100.118.91 10.64.64.64 wlm0
-
-# Only applicable for Wireless Modems (WWAN)
-if [ -z $(echo $2 | egrep "(ttyS[0-9]+|usb[0-9]+b.*)$") ]; then
-    exit 0
-fi
-
-# Determine if we are running inside a VRF or not, required for proper routing table
-if [ -d /sys/class/net/{{ ifname }}/upper_* ]; then
-    # Determine upper (VRF) interface
-    VRF=$(basename $(ls -d /sys/class/net/{{ ifname }}/upper_*))
-    # Remove upper_ prefix from result string
-    VRF_NAME=${VRF#"upper_"}
-    # Remove default route from VRF routing table
-    vtysh -c "conf t" -c "vrf ${VRF_NAME}" -c "ip route 0.0.0.0/0 {{ ifname }} {{ backup.distance }}"
-else
-    # Remove default route from GRT (global routing table)
-    vtysh -c "conf t" -c "ip route 0.0.0.0/0 {{ ifname }} {{ backup.distance }}"
-fi
-
-DIALER_PID=$(cat /var/run/{{ ifname }}.pid)
-logger -t pppd[$DIALER_PID] "added default route via {{ ifname }} metric {{ backup.distance }} ${VRF_NAME}"
diff --git a/data/templates/wwan/peer.tmpl b/data/templates/wwan/peer.tmpl
deleted file mode 100644
index 2807a79a4..000000000
--- a/data/templates/wwan/peer.tmpl
+++ /dev/null
@@ -1,31 +0,0 @@
-### Autogenerated by interfaces-wirelessmodem.py ###
-
-{{ "# description: " + description if description is defined }}
-ifname {{ ifname }}
-ipparam {{ ifname }}
-linkname {{ ifname }}
-
-{{ "usepeerdns" if no_peer_dns is defined }}
-# physical device
-{{ device }}
-lcp-echo-failure 0
-115200
-debug
-mtu {{ mtu }}
-mru {{ mtu }}
-{% if ipv6 is defined and ipv6.address is defined and ipv6.address.autoconf is defined %}
-+ipv6
-ipv6cp-use-ipaddr
-{% endif %}
-nodefaultroute
-ipcp-max-failure 4
-ipcp-accept-local
-ipcp-accept-remote
-noauth
-crtscts
-lock
-persist
-{{ "demand" if connect_on_demand is defined }}
-
-connect '/usr/sbin/chat -v -t6 -f /etc/ppp/peers/chat.{{ ifname }}'
-
diff --git a/debian/control b/debian/control
index be7d2a0f1..f28d28253 100644
--- a/debian/control
+++ b/debian/control
@@ -81,6 +81,7 @@ Depends:
   lsscsi,
   mdns-repeater,
   minisign,
+  modemmanager,
   mtr-tiny,
   netplug,
   nftables (>= 0.9.3),
diff --git a/interface-definitions/interfaces-ethernet.xml.in b/interface-definitions/interfaces-ethernet.xml.in
index fff8db2d1..942f88d0a 100644
--- a/interface-definitions/interfaces-ethernet.xml.in
+++ b/interface-definitions/interfaces-ethernet.xml.in
@@ -9,14 +9,14 @@
         <properties>
           <help>Ethernet Interface</help>
           <priority>318</priority>
-          <constraint>
-            <regex>^((eth|lan)[0-9]+|(eno|ens|enp|enx).+)$</regex>
-          </constraint>
-          <constraintErrorMessage>Invalid Ethernet interface name</constraintErrorMessage>
           <valueHelp>
             <format>ethN</format>
             <description>Ethernet interface name</description>
           </valueHelp>
+          <constraint>
+            <regex>^((eth|lan)[0-9]+|(eno|ens|enp|enx).+)$</regex>
+          </constraint>
+          <constraintErrorMessage>Invalid Ethernet interface name</constraintErrorMessage>
         </properties>
         <children>
           #include <include/interface/address-ipv4-ipv6-dhcp.xml.i>
diff --git a/interface-definitions/interfaces-wirelessmodem.xml.in b/interface-definitions/interfaces-wirelessmodem.xml.in
deleted file mode 100644
index 25ac2d6e0..000000000
--- a/interface-definitions/interfaces-wirelessmodem.xml.in
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0"?>
-<interfaceDefinition>
-  <node name="interfaces">
-    <children>
-      <tagNode name="wirelessmodem" owner="${vyos_conf_scripts_dir}/interfaces-wirelessmodem.py">
-        <properties>
-          <help>Wireless Modem (WWAN) Interface</help>
-          <priority>350</priority>
-          <constraint>
-            <regex>^wlm[0-9]+$</regex>
-          </constraint>
-          <constraintErrorMessage>Wireless Modem interface must be named wlmN</constraintErrorMessage>
-          <valueHelp>
-            <format>wlmN</format>
-            <description>Wireless modem interface name</description>
-          </valueHelp>
-        </properties>
-        <children>
-          <leafNode name="apn">
-            <properties>
-              <help>Access Point Name (APN)</help>
-            </properties>
-          </leafNode>
-          <node name="backup">
-            <properties>
-              <help>Insert backup default route</help>
-            </properties>
-            <children>
-              <leafNode name="distance">
-                <properties>
-                  <help>Distance backup default route</help>
-                  <valueHelp>
-                    <format>1-255</format>
-                    <description>Distance of the backup route (default: 10)</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="numeric" argument="--range 1-255"/>
-                  </constraint>
-                  <constraintErrorMessage>Must be between (1-255)</constraintErrorMessage>
-                </properties>
-                <defaultValue>10</defaultValue>
-              </leafNode>
-            </children>
-          </node>
-          #include <include/interface/interface-description.xml.i>
-          #include <include/interface/interface-disable.xml.i>
-          #include <include/interface/interface-vrf.xml.i>
-          <leafNode name="device">
-            <properties>
-              <help>Serial device </help>
-              <completionHelp>
-                <script>ls -1 /dev | grep ttyS</script>
-                <script>if [ -d /dev/serial/by-bus ]; then ls -1 /dev/serial/by-bus; fi</script>
-              </completionHelp>
-              <valueHelp>
-                <format>ttySXX</format>
-                <description>TTY device name, regular serial port</description>
-              </valueHelp>
-              <valueHelp>
-                <format>usbNbXpY</format>
-                <description>TTY device name, USB based</description>
-              </valueHelp>
-              <constraint>
-                <regex>^(ttyS[0-9]+|usb[0-9]+b.*)$</regex>
-              </constraint>
-            </properties>
-          </leafNode>
-          #include <include/interface/interface-disable-link-detect.xml.i>
-          #include <include/interface/interface-mtu-68-16000.xml.i>
-          #include <include/interface/interface-ipv4-options.xml.i>
-          #include <include/interface/interface-ipv6-options.xml.i>
-          <leafNode name="no-peer-dns">
-            <properties>
-              <help>Do not use peer supplied DNS server information</help>
-              <valueless/>
-            </properties>
-          </leafNode>
-          #include <include/interface/interface-dial-on-demand.xml.i>
-        </children>
-      </tagNode>
-    </children>
-  </node>
-</interfaceDefinition>
diff --git a/interface-definitions/interfaces-wwan.xml.in b/interface-definitions/interfaces-wwan.xml.in
new file mode 100644
index 000000000..55ac8eab1
--- /dev/null
+++ b/interface-definitions/interfaces-wwan.xml.in
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<interfaceDefinition>
+  <node name="interfaces">
+    <children>
+      <tagNode name="wwan" owner="${vyos_conf_scripts_dir}/interfaces-wwan.py">
+        <properties>
+          <help>Wireless Modem (WWAN) Interface</help>
+          <priority>350</priority>
+          <completionHelp>
+            <script>cd /sys/class/net; ls -d wwan*</script>
+          </completionHelp>
+          <constraint>
+            <regex>^wwan[0-9]+$</regex>
+          </constraint>
+          <constraintErrorMessage>Wireless Modem interface must be named wwanN</constraintErrorMessage>
+          <valueHelp>
+            <format>wwanN</format>
+            <description>Wireless Wide Area Network interface name</description>
+          </valueHelp>
+        </properties>
+        <children>
+          #include <include/interface/address-ipv4-ipv6-dhcp.xml.i>
+          <leafNode name="apn">
+            <properties>
+              <help>Access Point Name (APN)</help>
+            </properties>
+          </leafNode>
+          #include <include/interface/dhcp-options.xml.i>
+          #include <include/interface/dhcpv6-options.xml.i>
+          #include <include/interface/interface-description.xml.i>
+          #include <include/interface/interface-disable.xml.i>
+          #include <include/interface/interface-vrf.xml.i>
+          #include <include/interface/interface-disable-link-detect.xml.i>
+          #include <include/interface/interface-mtu-68-1500.xml.i>
+          <leafNode name="mtu">
+            <defaultValue>1430</defaultValue>
+          </leafNode>
+          #include <include/interface/interface-ipv4-options.xml.i>
+          #include <include/interface/interface-ipv6-options.xml.i>
+          #include <include/interface/interface-dial-on-demand.xml.i>
+        </children>
+      </tagNode>
+    </children>
+  </node>
+</interfaceDefinition>
diff --git a/op-mode-definitions/connect.xml.in b/op-mode-definitions/connect.xml.in
index 1ec62949a..8f19eac70 100644
--- a/op-mode-definitions/connect.xml.in
+++ b/op-mode-definitions/connect.xml.in
@@ -19,7 +19,7 @@
           <help>Bring up a connection-oriented network interface</help>
           <completionHelp>
             <path>interfaces pppoe</path>
-            <path>interfaces wirelessmodem</path>
+            <path>interfaces wwan</path>
           </completionHelp>
         </properties>
         <command>sudo ${vyos_op_scripts_dir}/connect_disconnect.py --connect "$3"</command>
diff --git a/op-mode-definitions/disconnect.xml.in b/op-mode-definitions/disconnect.xml.in
index bf2c37b89..4415c0ed2 100644
--- a/op-mode-definitions/disconnect.xml.in
+++ b/op-mode-definitions/disconnect.xml.in
@@ -10,7 +10,7 @@
           <help>Take down a connection-oriented network interface</help>
           <completionHelp>
             <path>interfaces pppoe</path>
-            <path>interfaces wirelessmodem</path>
+            <path>interfaces wwan</path>
           </completionHelp>
         </properties>
         <command>sudo ${vyos_op_scripts_dir}/connect_disconnect.py --disconnect "$3"</command>
diff --git a/op-mode-definitions/show-interfaces-wirelessmodem.xml.in b/op-mode-definitions/show-interfaces-wirelessmodem.xml.in
deleted file mode 100644
index 18b1e55c7..000000000
--- a/op-mode-definitions/show-interfaces-wirelessmodem.xml.in
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<interfaceDefinition>
-  <node name="show">
-    <children>
-      <node name="interfaces">
-        <children>
-          <tagNode name="wirelessmodem">
-            <properties>
-              <help>Show Wireless Modem (WWAN) interface information</help>
-              <completionHelp>
-                <path>interfaces wirelessmodem</path>
-              </completionHelp>
-            </properties>
-            <command>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4"</command>
-            <children>
-              <leafNode name="log">
-                <properties>
-                  <help>Show specified WWAN interface log</help>
-                </properties>
-                <command>/usr/bin/journalctl --unit "ppp@$4".service</command>
-              </leafNode>
-              <leafNode name="statistics">
-                <properties>
-                  <help>Show specified WWAN interface statistics</help>
-                  <completionHelp>
-                    <path>interfaces wirelessmodem</path>
-                  </completionHelp>
-                </properties>
-                <command>if [ -d "/sys/class/net/$4" ]; then /usr/sbin/pppstats "$4"; fi</command>
-              </leafNode>
-            </children>
-          </tagNode>
-          <node name="wirelessmodem">
-            <properties>
-              <help>Show Wireless Modem (WWAN) interface information</help>
-            </properties>
-            <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=wirelessmodem --action=show-brief</command>
-            <children>
-              <leafNode name="detail">
-                <properties>
-                  <help>Show detailed Wireless Modem (WWAN( interface information</help>
-                </properties>
-                <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=wirelessmodem --action=show</command>
-              </leafNode>
-            </children>
-          </node>
-        </children>
-      </node>
-    </children>
-  </node>
-</interfaceDefinition>
diff --git a/op-mode-definitions/show-interfaces-wwan.xml.in b/op-mode-definitions/show-interfaces-wwan.xml.in
new file mode 100644
index 000000000..d57e17a13
--- /dev/null
+++ b/op-mode-definitions/show-interfaces-wwan.xml.in
@@ -0,0 +1,103 @@
+<?xml version="1.0"?>
+<interfaceDefinition>
+  <node name="show">
+    <children>
+      <node name="interfaces">
+        <children>
+          <tagNode name="wwan">
+            <properties>
+              <help>Show Wireless Wire Area Network (WWAN) interface information</help>
+              <completionHelp>
+                <path>interfaces wwan</path>
+                <script>cd /sys/class/net; ls -d wwan*</script>
+              </completionHelp>
+            </properties>
+            <command>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4"</command>
+            <children>
+              <leafNode name="capabilities">
+                <properties>
+                  <help>Show WWAN module capabilities</help>
+                </properties>
+                <command>sudo ${vyos_op_scripts_dir}/show_wwan.py --interface=$4 --capabilities</command>
+              </leafNode>
+              <leafNode name="firmware">
+                <properties>
+                  <help>Show WWAN module firmware</help>
+                </properties>
+                <command>sudo ${vyos_op_scripts_dir}/show_wwan.py --interface=$4 --firmware</command>
+              </leafNode>
+              <leafNode name="imei">
+                <properties>
+                  <help>Show WWAN module IMEI/ESN/MEID</help>
+                </properties>
+                <command>sudo ${vyos_op_scripts_dir}/show_wwan.py --interface=$4 --imei</command>
+              </leafNode>
+              <leafNode name="imsi">
+                <properties>
+                  <help>Show WWAN module IMSI</help>
+                </properties>
+                <command>sudo ${vyos_op_scripts_dir}/show_wwan.py --interface=$4 --imsi</command>
+              </leafNode>
+              <leafNode name="model">
+                <properties>
+                  <help>Show WWAN module manufacturer</help>
+                </properties>
+                <command>sudo ${vyos_op_scripts_dir}/show_wwan.py --interface=$4 --model</command>
+              </leafNode>
+              <leafNode name="msisdn">
+                <properties>
+                  <help>Show WWAN module MSISDN</help>
+                </properties>
+                <command>sudo ${vyos_op_scripts_dir}/show_wwan.py --interface=$4 --msisdn</command>
+              </leafNode>
+              <leafNode name="revision">
+                <properties>
+                  <help>Show WWAN module revision</help>
+                </properties>
+                <command>sudo ${vyos_op_scripts_dir}/show_wwan.py --interface=$4 --revision</command>
+              </leafNode>
+              <leafNode name="signal">
+                <properties>
+                  <help>Show WWAN module RF signal info</help>
+                </properties>
+                <command>sudo ${vyos_op_scripts_dir}/show_wwan.py --interface=$4 --signal</command>
+              </leafNode>
+              <leafNode name="sim">
+                <properties>
+                  <help>Show WWAN module connected SIM card information</help>
+                </properties>
+                <command>sudo ${vyos_op_scripts_dir}/show_wwan.py --interface=$4 --sim</command>
+              </leafNode>
+              <leafNode name="summary">
+                <properties>
+                  <help>Show WWAN module information summary</help>
+                </properties>
+                <command>mmcli --modem ${4#wwan}</command>
+              </leafNode>
+              <leafNode name="log">
+                <properties>
+                  <help>Show interface log for specified interface</help>
+                </properties>
+                <command>echo not implemented</command>
+              </leafNode>
+            </children>
+          </tagNode>
+          <node name="wwan">
+            <properties>
+              <help>Show Wireless Modem (WWAN) interface information</help>
+            </properties>
+            <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=wirelessmodem --action=show-brief</command>
+            <children>
+              <leafNode name="detail">
+                <properties>
+                  <help>Show detailed Wireless Modem (WWAN( interface information</help>
+                </properties>
+                <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=wirelessmodem --action=show</command>
+              </leafNode>
+            </children>
+          </node>
+        </children>
+      </node>
+    </children>
+  </node>
+</interfaceDefinition>
diff --git a/python/vyos/ifconfig/__init__.py b/python/vyos/ifconfig/__init__.py
index e9da1e9f5..2d3e406ac 100644
--- a/python/vyos/ifconfig/__init__.py
+++ b/python/vyos/ifconfig/__init__.py
@@ -35,3 +35,4 @@ from vyos.ifconfig.tunnel import TunnelIf
 from vyos.ifconfig.wireless import WiFiIf
 from vyos.ifconfig.l2tpv3 import L2TPv3If
 from vyos.ifconfig.macsec import MACsecIf
+from vyos.ifconfig.wwan import WWANIf
diff --git a/python/vyos/ifconfig/wwan.py b/python/vyos/ifconfig/wwan.py
new file mode 100644
index 000000000..f18959a60
--- /dev/null
+++ b/python/vyos/ifconfig/wwan.py
@@ -0,0 +1,28 @@
+# Copyright 2021 VyOS maintainers and contributors <maintainers@vyos.io>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+
+from vyos.ifconfig.interface import Interface
+
+@Interface.register
+class WWANIf(Interface):
+    iftype = 'wwan'
+    definition = {
+        **Interface.definition,
+        **{
+            'section': 'wwan',
+            'prefixes': ['wwan', ],
+            'eternal': 'wwan[0-9]+$',
+        },
+    }
diff --git a/python/vyos/xml/test_xml.py b/python/vyos/xml/test_xml.py
index ff55151d2..3a6f0132d 100644
--- a/python/vyos/xml/test_xml.py
+++ b/python/vyos/xml/test_xml.py
@@ -59,7 +59,7 @@ class TestSearch(TestCase):
         last = self.xml.traverse("interfaces")
         self.assertEqual(last, '')
         self.assertEqual(self.xml.inside, ['interfaces'])
-        self.assertEqual(self.xml.options, ['bonding', 'bridge', 'dummy', 'ethernet', 'geneve', 'l2tpv3', 'loopback', 'macsec', 'openvpn', 'pppoe', 'pseudo-ethernet', 'tunnel', 'vxlan', 'wireguard', 'wireless', 'wirelessmodem'])
+        self.assertEqual(self.xml.options, ['bonding', 'bridge', 'dummy', 'ethernet', 'geneve', 'l2tpv3', 'loopback', 'macsec', 'openvpn', 'pppoe', 'pseudo-ethernet', 'tunnel', 'vxlan', 'wireguard', 'wireless', 'wwan'])
         self.assertEqual(self.xml.filling, False)
         self.assertEqual(self.xml.word, '')
         self.assertEqual(self.xml.check, False)
@@ -72,7 +72,7 @@ class TestSearch(TestCase):
         last = self.xml.traverse("interfaces ")
         self.assertEqual(last, '')
         self.assertEqual(self.xml.inside, ['interfaces'])
-        self.assertEqual(self.xml.options, ['bonding', 'bridge', 'dummy', 'ethernet', 'geneve', 'l2tpv3', 'loopback', 'macsec', 'openvpn', 'pppoe', 'pseudo-ethernet', 'tunnel', 'vxlan', 'wireguard', 'wireless', 'wirelessmodem'])
+        self.assertEqual(self.xml.options, ['bonding', 'bridge', 'dummy', 'ethernet', 'geneve', 'l2tpv3', 'loopback', 'macsec', 'openvpn', 'pppoe', 'pseudo-ethernet', 'tunnel', 'vxlan', 'wireguard', 'wireless', 'wwan'])
         self.assertEqual(self.xml.filling, False)
         self.assertEqual(self.xml.word, last)
         self.assertEqual(self.xml.check, False)
@@ -85,7 +85,7 @@ class TestSearch(TestCase):
         last = self.xml.traverse("interfaces w")
         self.assertEqual(last, 'w')
         self.assertEqual(self.xml.inside, ['interfaces'])
-        self.assertEqual(self.xml.options, ['wireguard', 'wireless', 'wirelessmodem'])
+        self.assertEqual(self.xml.options, ['wireguard', 'wireless', 'wwan'])
         self.assertEqual(self.xml.filling, True)
         self.assertEqual(self.xml.word, last)
         self.assertEqual(self.xml.check, True)
@@ -276,4 +276,4 @@ class TestSearch(TestCase):
         self.assertEqual(self.xml.filled, True)
         self.assertEqual(self.xml.plain, False)
 
-    # Need to add a check for a valuless leafNode
\ No newline at end of file
+    # Need to add a check for a valuless leafNode
diff --git a/smoketest/scripts/cli/test_interfaces_wirelessmodem.py b/smoketest/scripts/cli/test_interfaces_wirelessmodem.py
deleted file mode 100755
index c36835ea7..000000000
--- a/smoketest/scripts/cli/test_interfaces_wirelessmodem.py
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright (C) 2020-2021 VyOS maintainers and contributors
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 or later as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import os
-import unittest
-
-from psutil import process_iter
-from base_vyostest_shim import VyOSUnitTestSHIM
-
-from vyos.configsession import ConfigSession
-from vyos.configsession import ConfigSessionError
-
-config_file = '/etc/ppp/peers/{}'
-base_path = ['interfaces', 'wirelessmodem']
-
-def get_config_value(interface, key):
-    with open(config_file.format(interface), 'r') as f:
-        for line in f:
-            if line.startswith(key):
-                return list(line.split())
-    return []
-
-class WWANInterfaceTest(VyOSUnitTestSHIM.TestCase):
-    def setUp(self):
-        self._interfaces = ['wlm0', 'wlm1']
-
-    def tearDown(self):
-        self.cli_delete(base_path)
-        self.cli_commit()
-
-    def test_wwan(self):
-        for interface in self._interfaces:
-            self.cli_set(base_path + [interface, 'no-peer-dns'])
-            self.cli_set(base_path + [interface, 'connect-on-demand'])
-
-            # check validate() - APN must be configure
-            with self.assertRaises(ConfigSessionError):
-                self.cli_commit()
-            self.cli_set(base_path + [interface, 'apn', 'vyos.net'])
-
-            # check validate() - device must be configure
-            with self.assertRaises(ConfigSessionError):
-                self.cli_commit()
-            self.cli_set(base_path + [interface, 'device', 'ttyS0'])
-
-            # commit changes
-            self.cli_commit()
-
-        # verify configuration file(s)
-        for interface in self._interfaces:
-            tmp = get_config_value(interface, 'ifname')[1]
-            self.assertTrue(interface in tmp)
-
-            tmp = get_config_value(interface, 'demand')[0]
-            self.assertTrue('demand' in tmp)
-
-            tmp = os.path.isfile(f'/etc/ppp/peers/chat.{interface}')
-            self.assertTrue(tmp)
-
-            # Check if ppp process is running in the interface in question
-            running = False
-            for p in process_iter():
-                if "pppd" in p.name():
-                    if interface in p.cmdline():
-                        running = True
-
-            self.assertTrue(running)
-
-if __name__ == '__main__':
-    unittest.main(verbosity=2)
diff --git a/src/conf_mode/interfaces-wirelessmodem.py b/src/conf_mode/interfaces-wirelessmodem.py
deleted file mode 100755
index 976953b31..000000000
--- a/src/conf_mode/interfaces-wirelessmodem.py
+++ /dev/null
@@ -1,132 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright (C) 2020 VyOS maintainers and contributors
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 or later as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import os
-
-from sys import exit
-
-from vyos.config import Config
-from vyos.configdict import get_interface_dict
-from vyos.configverify import verify_vrf
-from vyos.template import render
-from vyos.util import call
-from vyos.util import check_kmod
-from vyos.util import find_device_file
-from vyos import ConfigError
-from vyos import airbag
-airbag.enable()
-
-k_mod = ['option', 'usb_wwan', 'usbserial']
-
-def get_config(config=None):
-    """
-    Retrive CLI config as dictionary. Dictionary can never be empty, as at least the
-    interface name will be added or a deleted flag
-    """
-    if config:
-        conf = config
-    else:
-        conf = Config()
-    base = ['interfaces', 'wirelessmodem']
-    wwan = get_interface_dict(conf, base)
-
-    return wwan
-
-def verify(wwan):
-    if 'deleted' in wwan:
-        return None
-
-    if not 'apn' in wwan:
-        raise ConfigError('No APN configured for "{ifname}"'.format(**wwan))
-
-    if not 'device' in wwan:
-        raise ConfigError('Physical "device" must be configured')
-
-    # we can not use isfile() here as Linux device files are no regular files
-    # thus the check will return False
-    dev_path = find_device_file(wwan['device'])
-    if dev_path is None or not os.path.exists(dev_path):
-        raise ConfigError('Device "{device}" does not exist'.format(**wwan))
-
-    verify_vrf(wwan)
-
-    return None
-
-def generate(wwan):
-    # set up configuration file path variables where our templates will be
-    # rendered into
-    ifname = wwan['ifname']
-    config_wwan = f'/etc/ppp/peers/{ifname}'
-    config_wwan_chat = f'/etc/ppp/peers/chat.{ifname}'
-    script_wwan_pre_up = f'/etc/ppp/ip-pre-up.d/1010-vyos-wwan-{ifname}'
-    script_wwan_ip_up = f'/etc/ppp/ip-up.d/1010-vyos-wwan-{ifname}'
-    script_wwan_ip_down = f'/etc/ppp/ip-down.d/1010-vyos-wwan-{ifname}'
-
-    config_files = [config_wwan, config_wwan_chat, script_wwan_pre_up,
-                    script_wwan_ip_up, script_wwan_ip_down]
-
-    # Always hang-up WWAN connection prior generating new configuration file
-    call(f'systemctl stop ppp@{ifname}.service')
-
-    if 'deleted' in wwan:
-        # Delete PPP configuration files
-        for file in config_files:
-            if os.path.exists(file):
-                os.unlink(file)
-
-    else:
-        wwan['device'] = find_device_file(wwan['device'])
-
-        # Create PPP configuration files
-        render(config_wwan, 'wwan/peer.tmpl', wwan)
-        # Create PPP chat script
-        render(config_wwan_chat, 'wwan/chat.tmpl', wwan)
-
-        # generated script file must be executable
-
-        # Create script for ip-pre-up.d
-        render(script_wwan_pre_up, 'wwan/ip-pre-up.script.tmpl',
-               wwan, permission=0o755)
-        # Create script for ip-up.d
-        render(script_wwan_ip_up, 'wwan/ip-up.script.tmpl',
-               wwan, permission=0o755)
-        # Create script for ip-down.d
-        render(script_wwan_ip_down, 'wwan/ip-down.script.tmpl',
-               wwan, permission=0o755)
-
-    return None
-
-def apply(wwan):
-    if 'deleted' in wwan:
-        # bail out early
-        return None
-
-    if not 'disable' in wwan:
-        # "dial" WWAN connection
-        call('systemctl start ppp@{ifname}.service'.format(**wwan))
-
-    return None
-
-if __name__ == '__main__':
-    try:
-        check_kmod(k_mod)
-        c = get_config()
-        verify(c)
-        generate(c)
-        apply(c)
-    except ConfigError as e:
-        print(e)
-        exit(1)
diff --git a/src/conf_mode/interfaces-wwan.py b/src/conf_mode/interfaces-wwan.py
new file mode 100755
index 000000000..02d2c723d
--- /dev/null
+++ b/src/conf_mode/interfaces-wwan.py
@@ -0,0 +1,86 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2020-2021 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+
+from sys import exit
+
+from vyos.config import Config
+from vyos.configdict import get_interface_dict
+from vyos.configverify import verify_interface_exists
+from vyos.configverify import verify_vrf
+from vyos.ifconfig import WWANIf
+from vyos.util import cmd
+from vyos.template import render
+from vyos import ConfigError
+from vyos import airbag
+airbag.enable()
+
+def get_config(config=None):
+    """
+    Retrive CLI config as dictionary. Dictionary can never be empty, as at least the
+    interface name will be added or a deleted flag
+    """
+    if config:
+        conf = config
+    else:
+        conf = Config()
+    base = ['interfaces', 'wwan']
+    wwan = get_interface_dict(conf, base)
+
+    return wwan
+
+def verify(wwan):
+    if 'deleted' in wwan:
+        return None
+
+    ifname = wwan['ifname']
+    if not 'apn' in wwan:
+        raise ConfigError(f'No APN configured for "{ifname}"!')
+
+    verify_interface_exists(ifname)
+    verify_vrf(wwan)
+
+    return None
+
+def generate(wwan):
+    return None
+
+def apply(wwan):
+    # we only need the modem number. wwan0 -> 0, wwan1 -> 1
+    modem = wwan['ifname'].replace('wwan','')
+    base_cmd = f'mmcli --modem {modem}'
+
+    w = WWANIf(wwan['ifname'])
+    if 'deleted' in wwan or 'disable' in wwan:
+        w.remove()
+        cmd(f'{base_cmd} --simple-disconnect')
+        return None
+
+    cmd(f'{base_cmd} --simple-connect=\"apn={wwan["apn"]}\"')
+    w.update(wwan)
+
+    return None
+
+if __name__ == '__main__':
+    try:
+        c = get_config()
+        verify(c)
+        generate(c)
+        apply(c)
+    except ConfigError as e:
+        print(e)
+        exit(1)
diff --git a/src/etc/systemd/system/ModemManager.service.d/override.conf b/src/etc/systemd/system/ModemManager.service.d/override.conf
new file mode 100644
index 000000000..07a18460e
--- /dev/null
+++ b/src/etc/systemd/system/ModemManager.service.d/override.conf
@@ -0,0 +1,7 @@
+[Unit]
+After=
+After=vyos-router.service
+
+[Service]
+ExecStart=
+ExecStart=/usr/sbin/ModemManager --filter-policy=strict --log-level=INFO --log-timestamps --log-journal
diff --git a/src/migration-scripts/interfaces/21-to-22 b/src/migration-scripts/interfaces/21-to-22
new file mode 100755
index 000000000..03b990afb
--- /dev/null
+++ b/src/migration-scripts/interfaces/21-to-22
@@ -0,0 +1,79 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2021 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+
+from sys import argv
+from sys import exit
+
+from vyos.configtree import ConfigTree
+
+if __name__ == '__main__':
+    if (len(argv) < 1):
+        print("Must specify file name!")
+        exit(1)
+
+    file_name = argv[1]
+
+    with open(file_name, 'r') as f:
+        config_file = f.read()
+
+    config = ConfigTree(config_file)
+    base = ['interfaces', 'wirelessmodem']
+    if not config.exists(base):
+        # Nothing to do
+        exit(0)
+
+    new_base = ['interfaces', 'wwan']
+    config.set(new_base)
+    config.set_tag(new_base)
+    for interface in config.list_nodes(base):
+        # convert usb0b1.3p1.2 device identifier and extract 1.3 usb bus id
+        usb = config.return_value(base + [interface, 'device'])
+        device = usb.split('b')[-1]
+        busid = device.split('p')[0]
+        for wwan in os.listdir('/sys/class/net'):
+            # we are only interested in interfaces starting with wwan
+            if not wwan.startswith('wwan'):
+                continue
+            device = os.readlink(f'/sys/class/net/{wwan}/device')
+            device = device.split(':')[0]
+            if busid in device:
+                config.copy(base + [interface], new_base + [wwan])
+
+    config.delete(base)
+
+    # Now that we have copied the old wirelessmodem interfaces to wwan
+    # we can start to migrate also individual config items.
+    for interface in config.list_nodes(new_base):
+        # we do no longer need the USB device name
+        config.delete(new_base + [interface, 'device'])
+        # set/unset DNS configuration
+        dns = new_base + [interface, 'no-peer-dns']
+        if config.exists(dns):
+            config.delete(dns)
+        else:
+            config.set(['system', 'name-servers-dhcp'], value=interface, replace=False)
+
+        # the new wwan interface use regular IP addressing
+        config.set(new_base + [interface, 'address'], value='dhcp')
+
+    try:
+        with open(file_name, 'w') as f:
+            f.write(config.to_string())
+    except OSError as e:
+        print("Failed to save the modified config: {}".format(e))
+        exit(1)
diff --git a/src/op_mode/show_wwan.py b/src/op_mode/show_wwan.py
new file mode 100755
index 000000000..249dda2a5
--- /dev/null
+++ b/src/op_mode/show_wwan.py
@@ -0,0 +1,78 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2021 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import argparse
+
+from sys import exit
+from vyos.util import cmd
+
+parser = argparse.ArgumentParser()
+parser.add_argument("--model", help="Get module model", action="store_true")
+parser.add_argument("--revision", help="Get module revision", action="store_true")
+parser.add_argument("--capabilities", help="Get module capabilities", action="store_true")
+parser.add_argument("--imei", help="Get module IMEI/ESN/MEID", action="store_true")
+parser.add_argument("--imsi", help="Get module IMSI", action="store_true")
+parser.add_argument("--msisdn", help="Get module MSISDN", action="store_true")
+parser.add_argument("--sim", help="Get SIM card status", action="store_true")
+parser.add_argument("--signal", help="Get current RF signal info", action="store_true")
+parser.add_argument("--firmware", help="Get current RF signal info", action="store_true")
+
+required = parser.add_argument_group('Required arguments')
+required.add_argument("--interface", help="WWAN interface name, e.g. wwan0", required=True)
+
+def qmi_cmd(device, command, silent=False):
+    tmp = cmd(f'qmicli --device={device} --device-open-proxy {command}')
+    tmp = tmp.replace(f'[{cdc}] ', '')
+    if not silent:
+        # skip first line as this only holds the info headline
+        for line in tmp.splitlines()[1:]:
+            print(line.lstrip())
+    return tmp
+
+if __name__ == '__main__':
+    args = parser.parse_args()
+
+    # remove the WWAN prefix from the interface, required for the CDC interface
+    if_num = args.interface.replace('wwan','')
+    cdc = f'/dev/cdc-wdm{if_num}'
+
+    if args.model:
+        qmi_cmd(cdc, '--dms-get-model')
+    elif args.capabilities:
+        qmi_cmd(cdc, '--dms-get-capabilities')
+        qmi_cmd(cdc, '--dms-get-band-capabilities')
+    elif args.revision:
+        qmi_cmd(cdc, '--dms-get-revision')
+    elif args.imei:
+        qmi_cmd(cdc, '--dms-get-ids')
+    elif args.imsi:
+        qmi_cmd(cdc, '--dms-uim-get-imsi')
+    elif args.msisdn:
+        qmi_cmd(cdc, '--dms-get-msisdn')
+    elif args.sim:
+        qmi_cmd(cdc, '--uim-get-card-status')
+    elif args.signal:
+        qmi_cmd(cdc, '--nas-get-signal-info')
+        qmi_cmd(cdc, '--nas-get-rf-band-info')
+    elif args.firmware:
+        tmp = qmi_cmd(cdc, '--dms-get-manufacturer', silent=True)
+        if 'Sierra Wireless' in tmp:
+            qmi_cmd(cdc, '--dms-swi-get-current-firmware')
+        else:
+            qmi_cmd(cdc, '--dms-get-software-version')
+    else:
+        parser.print_help()
+        exit(1)
diff --git a/src/validators/interface-name b/src/validators/interface-name
index 5bac671b1..105815eee 100755
--- a/src/validators/interface-name
+++ b/src/validators/interface-name
@@ -20,7 +20,7 @@ import re
 from sys import argv
 from sys import exit
 
-pattern = '^(bond|br|dum|en|ersp|eth|gnv|lan|l2tp|l2tpeth|macsec|peth|ppp|pppoe|pptp|sstp|tun|vti|vtun|vxlan|wg|wlan|wlm)[0-9]+(.\d+)?|lo$'
+pattern = '^(bond|br|dum|en|ersp|eth|gnv|lan|l2tp|l2tpeth|macsec|peth|ppp|pppoe|pptp|sstp|tun|vti|vtun|vxlan|wg|wlan|wwan)[0-9]+(.\d+)?|lo$'
 
 if __name__ == '__main__':
     if len(argv) != 2:
diff --git a/src/validators/vrf-name b/src/validators/vrf-name
index 7b6313888..c78a80776 100755
--- a/src/validators/vrf-name
+++ b/src/validators/vrf-name
@@ -34,7 +34,7 @@ if __name__ == '__main__':
         exit(1)
 
     pattern = "^(?!(bond|br|dum|eth|lan|eno|ens|enp|enx|gnv|ipoe|l2tp|l2tpeth|" \
-              "vtun|ppp|pppoe|peth|tun|vti|vxlan|wg|wlan|wlm)\d+(\.\d+(v.+)?)?$).*$"
+              "vtun|ppp|pppoe|peth|tun|vti|vxlan|wg|wlan|wwan)\d+(\.\d+(v.+)?)?$).*$"
     if not re.match(pattern, vrf):
         exit(1)