summaryrefslogtreecommitdiff
path: root/interface-definitions
diff options
context:
space:
mode:
Diffstat (limited to 'interface-definitions')
-rw-r--r--interface-definitions/interfaces-ethernet.xml.in8
-rw-r--r--interface-definitions/interfaces-wirelessmodem.xml.in83
-rw-r--r--interface-definitions/interfaces-wwan.xml.in45
3 files changed, 49 insertions, 87 deletions
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>