Merge branch 'current' of github.com:vyos/vyos-1x into equuleus

* 'current' of github.com:vyos/vyos-1x:
  T1855, T1826: Restore support for reboot/poweroff in M minutes.
  vyos.config: T1764: allow for list argument to exists, in value case
  vyos.config: T1846: ignore edit level when obtaining working config
  T1843: use include files for interface proxy-arp-pvlan option
  T1843: use include files for interface proxy-arp configuration
  T1843: use include files for interface arp-cache-timeout configuration
  T1843: use include files for interface link-detect feature
  T1843: use include files for interface MTU size
  T1843: use include files for interface MAC address
  T1843: use include files to disable interface (admin down)
  T1843: use include files for interface description
  T1843: use include files for DHCP/DHCPv6 options
  T1843: recursively include IP address definitions in VIF/VIF-S definitions
  T1843: add support for recursive includes
  T1843: use include files for VIF/VIF-S interfaces
  T1843: use include files for IPv4/IPv6 interface address configuration
  T1843: run interface-definitions though GCC preprocessor

14 files changed, 280 insertions, 0 deletions

diff --git a/interface-definitions/include/address-ipv4-ipv6-dhcp.xml.i b/interface-definitions/include/address-ipv4-ipv6-dhcp.xml.i
new file mode 100644
index 000000000..fb46f2c09
--- /dev/null
+++ b/interface-definitions/include/address-ipv4-ipv6-dhcp.xml.i
@@ -0,0 +1,29 @@
+<leafNode name="address">
+  <properties>
+    <help>IP address</help>
+    <completionHelp>
+      <list>dhcp dhcpv6</list>
+    </completionHelp>
+    <valueHelp>
+      <format>ipv4net</format>
+      <description>IPv4 address and prefix length</description>
+    </valueHelp>
+    <valueHelp>
+      <format>ipv6net</format>
+      <description>IPv6 address and prefix length</description>
+    </valueHelp>
+    <valueHelp>
+      <format>dhcp</format>
+      <description>Dynamic Host Configuration Protocol</description>
+    </valueHelp>
+    <valueHelp>
+      <format>dhcpv6</format>
+      <description>Dynamic Host Configuration Protocol for IPv6</description>
+    </valueHelp>
+    <constraint>
+      <validator name="ip-cidr"/>
+      <regex>(dhcp|dhcpv6)</regex>
+    </constraint>
+    <multi/>
+  </properties>
+</leafNode>
diff --git a/interface-definitions/include/address-ipv4-ipv6.xml.i b/interface-definitions/include/address-ipv4-ipv6.xml.i
new file mode 100644
index 000000000..aa84a5640
--- /dev/null
+++ b/interface-definitions/include/address-ipv4-ipv6.xml.i
@@ -0,0 +1,17 @@
+<leafNode name="address">
+  <properties>
+    <help>IP address</help>
+    <valueHelp>
+      <format>ipv4net</format>
+      <description>IPv4 address and prefix length</description>
+    </valueHelp>
+    <valueHelp>
+      <format>ipv6net</format>
+      <description>IPv6 address and prefix length</description>
+    </valueHelp>
+    <constraint>
+      <validator name="ip-cidr"/>
+    </constraint>
+    <multi/>
+  </properties>
+</leafNode>
diff --git a/interface-definitions/include/dhcp-dhcpv6-options.xml.i b/interface-definitions/include/dhcp-dhcpv6-options.xml.i
new file mode 100644
index 000000000..104b1fbe0
--- /dev/null
+++ b/interface-definitions/include/dhcp-dhcpv6-options.xml.i
@@ -0,0 +1,42 @@
+<node name="dhcp-options">
+  <properties>
+    <help>DHCP options</help>
+  </properties>
+  <children>
+    <leafNode name="client-id">
+      <properties>
+        <help>DHCP client identifier</help>
+      </properties>
+    </leafNode>
+    <leafNode name="host-name">
+      <properties>
+        <help>DHCP client host name (overrides system host name)</help>
+      </properties>
+    </leafNode>
+    <leafNode name="vendor-class-id">
+      <properties>
+        <help>DHCP client vendor type</help>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<node name="dhcpv6-options">
+  <properties>
+    <help>DHCPv6 options</help>
+    <priority>319</priority>
+  </properties>
+  <children>
+    <leafNode name="parameters-only">
+      <properties>
+        <help>Acquire only config parameters, no address</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+    <leafNode name="temporary">
+      <properties>
+        <help>IPv6 "temporary" address</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+  </children>
+</node>
diff --git a/interface-definitions/include/interface-arp-cache-timeout.xml.i b/interface-definitions/include/interface-arp-cache-timeout.xml.i
new file mode 100644
index 000000000..81d35f593
--- /dev/null
+++ b/interface-definitions/include/interface-arp-cache-timeout.xml.i
@@ -0,0 +1,13 @@
+<leafNode name="arp-cache-timeout">
+  <properties>
+    <help>ARP cache entry timeout in seconds</help>
+    <valueHelp>
+      <format>1-86400</format>
+      <description>ARP cache entry timout in seconds (default 30)</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-86400"/>
+    </constraint>
+    <constraintErrorMessage>ARP cache entry timeout must be between 1 and 86400 seconds</constraintErrorMessage>
+  </properties>
+</leafNode>
diff --git a/interface-definitions/include/interface-description.xml.i b/interface-definitions/include/interface-description.xml.i
new file mode 100644
index 000000000..6356888da
--- /dev/null
+++ b/interface-definitions/include/interface-description.xml.i
@@ -0,0 +1,9 @@
+<leafNode name="description">
+  <properties>
+    <help>Interface description</help>
+    <constraint>
+      <regex>^.{1,256}$</regex>
+    </constraint>
+    <constraintErrorMessage>Interface description too long (limit 256 characters)</constraintErrorMessage>
+  </properties>
+</leafNode>
diff --git a/interface-definitions/include/interface-disable-link-detect.xml.i b/interface-definitions/include/interface-disable-link-detect.xml.i
new file mode 100644
index 000000000..619cd03b0
--- /dev/null
+++ b/interface-definitions/include/interface-disable-link-detect.xml.i
@@ -0,0 +1,6 @@
+<leafNode name="disable-link-detect">
+  <properties>
+    <help>Ignore link state changes</help>
+    <valueless/>
+  </properties>
+</leafNode>
diff --git a/interface-definitions/include/interface-disable.xml.i b/interface-definitions/include/interface-disable.xml.i
new file mode 100644
index 000000000..c6c24f867
--- /dev/null
+++ b/interface-definitions/include/interface-disable.xml.i
@@ -0,0 +1,6 @@
+<leafNode name="disable">

+  <properties>

+    <help>Set interface to Administratively down</help>

+    <valueless/>

+  </properties>

+</leafNode>

diff --git a/interface-definitions/include/interface-enable-proxy-arp.xml.i b/interface-definitions/include/interface-enable-proxy-arp.xml.i
new file mode 100644
index 000000000..14ab08875
--- /dev/null
+++ b/interface-definitions/include/interface-enable-proxy-arp.xml.i
@@ -0,0 +1,6 @@
+<leafNode name="enable-proxy-arp">
+  <properties>
+    <help>Enable proxy-arp on this interface</help>
+    <valueless/>
+  </properties>
+</leafNode>
diff --git a/interface-definitions/include/interface-mac.xml.i b/interface-definitions/include/interface-mac.xml.i
new file mode 100644
index 000000000..7b2456236
--- /dev/null
+++ b/interface-definitions/include/interface-mac.xml.i
@@ -0,0 +1,12 @@
+<leafNode name="mac">
+  <properties>
+    <help>Media Access Control (MAC) address</help>
+    <valueHelp>
+      <format>h:h:h:h:h:h</format>
+      <description>Hardware (MAC) address</description>
+    </valueHelp>
+    <constraint>
+      <validator name="mac-address"/>
+    </constraint>
+  </properties>
+</leafNode>
diff --git a/interface-definitions/include/interface-mtu-1450-9000.xml.i b/interface-definitions/include/interface-mtu-1450-9000.xml.i
new file mode 100644
index 000000000..87296a050
--- /dev/null
+++ b/interface-definitions/include/interface-mtu-1450-9000.xml.i
@@ -0,0 +1,13 @@
+<leafNode name="mtu">
+  <properties>
+    <help>Maximum Transmission Unit (MTU)</help>
+    <valueHelp>
+      <format>1450-9000</format>
+      <description>Maximum Transmission Unit</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1450-9000"/>
+    </constraint>
+    <constraintErrorMessage>MTU must be between 1450 and 9000</constraintErrorMessage>
+  </properties>
+</leafNode>
diff --git a/interface-definitions/include/interface-mtu-68-9000.xml.i b/interface-definitions/include/interface-mtu-68-9000.xml.i
new file mode 100644
index 000000000..ad11afa80
--- /dev/null
+++ b/interface-definitions/include/interface-mtu-68-9000.xml.i
@@ -0,0 +1,13 @@
+<leafNode name="mtu">
+  <properties>
+    <help>Maximum Transmission Unit (MTU)</help>
+    <valueHelp>
+      <format>68-9000</format>
+      <description>Maximum Transmission Unit</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 68-9000"/>
+    </constraint>
+    <constraintErrorMessage>MTU must be between 68 and 9000</constraintErrorMessage>
+  </properties>
+</leafNode>
diff --git a/interface-definitions/include/interface-proxy-arp-pvlan.xml.i b/interface-definitions/include/interface-proxy-arp-pvlan.xml.i
new file mode 100644
index 000000000..7e72b3800
--- /dev/null
+++ b/interface-definitions/include/interface-proxy-arp-pvlan.xml.i
@@ -0,0 +1,6 @@
+<leafNode name="proxy-arp-pvlan">
+  <properties>
+    <help>Enable private VLAN proxy ARP on this interface</help>
+    <valueless/>
+  </properties>
+</leafNode>
diff --git a/interface-definitions/include/vif-s.xml.i b/interface-definitions/include/vif-s.xml.i
new file mode 100644
index 000000000..772804f53
--- /dev/null
+++ b/interface-definitions/include/vif-s.xml.i
@@ -0,0 +1,56 @@
+<tagNode name="vif-s">

+  <properties>

+    <help>QinQ TAG-S Virtual Local Area Network (VLAN) ID</help>

+    <constraint>

+      <validator name="numeric" argument="--range 0-4094"/>

+    </constraint>

+    <constraintErrorMessage>VLAN ID must be between 0 and 4094</constraintErrorMessage>

+  </properties>

+  <children>

+    #include <include/address-ipv4-ipv6-dhcp.xml.i>

+    #include <include/interface-description.xml.i>

+    #include <include/dhcp-dhcpv6-options.xml.i>

+    #include <include/interface-disable-link-detect.xml.i>

+    #include <include/interface-disable.xml.i>

+    <leafNode name="ethertype">

+      <properties>

+        <help>Set Ethertype</help>

+        <completionHelp>

+          <list>0x88A8 0x8100</list>

+        </completionHelp>

+        <valueHelp>

+          <format>0x88A8</format>

+          <description>802.1ad</description>

+        </valueHelp>

+        <valueHelp>

+          <format>0x8100</format>

+          <description>802.1q</description>

+        </valueHelp>

+        <constraint>

+          <regex>(0x88A8|0x8100)</regex>

+        </constraint>

+        <constraintErrorMessage>Ethertype must be 0x88A8 or 0x8100</constraintErrorMessage>

+      </properties>

+    </leafNode>

+    #include <include/interface-mac.xml.i>

+    #include <include/interface-mtu-68-9000.xml.i>

+    <tagNode name="vif-c">

+      <properties>

+        <help>QinQ TAG-C Virtual Local Area Network (VLAN) ID</help>

+        <constraint>

+          <validator name="numeric" argument="--range 0-4094"/>

+        </constraint>

+        <constraintErrorMessage>VLAN ID must be between 0 and 4094</constraintErrorMessage>

+      </properties>

+      <children>

+        #include <include/address-ipv4-ipv6-dhcp.xml.i>

+        #include <include/interface-description.xml.i>

+        #include <include/dhcp-dhcpv6-options.xml.i>

+        #include <include/interface-disable-link-detect.xml.i>

+        #include <include/interface-disable.xml.i>

+        #include <include/interface-mac.xml.i>

+        #include <include/interface-mtu-68-9000.xml.i>

+      </children>

+    </tagNode>

+  </children>

+</tagNode>

diff --git a/interface-definitions/include/vif.xml.i b/interface-definitions/include/vif.xml.i
new file mode 100644
index 000000000..7c8a29a93
--- /dev/null
+++ b/interface-definitions/include/vif.xml.i
@@ -0,0 +1,52 @@
+<tagNode name="vif">
+  <properties>
+    <help>Virtual Local Area Network (VLAN) ID</help>
+    <valueHelp>
+      <format>0-4094</format>
+      <description>Virtual Local Area Network (VLAN) ID</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 0-4094"/>
+    </constraint>
+    <constraintErrorMessage>VLAN ID must be between 0 and 4094</constraintErrorMessage>
+  </properties>
+  <children>
+    #include <include/address-ipv4-ipv6-dhcp.xml.i>
+    #include <include/interface-description.xml.i>
+    #include <include/dhcp-dhcpv6-options.xml.i>
+    #include <include/interface-disable-link-detect.xml.i>
+    #include <include/interface-disable.xml.i>
+    <leafNode name="egress-qos">
+      <properties>
+        <help>VLAN egress QoS</help>
+        <completionHelp>
+          <script>echo Format for qos mapping, e.g.: '0:1 1:6 7:6'</script>
+        </completionHelp>
+        <constraint>
+          <regex>[:0-7 ]+$</regex>
+        </constraint>
+        <constraintErrorMessage>QoS mapping should be in the format of '0:7 2:3' with numbers 0-9</constraintErrorMessage>
+      </properties>
+    </leafNode>
+    <leafNode name="ingress-qos">
+      <properties>
+        <help>VLAN ingress QoS</help>
+        <completionHelp>
+          <script>echo Format for qos mapping '0:1 1:6 7:6'</script>
+        </completionHelp>
+        <constraint>
+          <regex>[:0-7 ]+$</regex>
+        </constraint>
+        <constraintErrorMessage>QoS mapping should be in the format of '0:7 2:3' with numbers 0-9</constraintErrorMessage>
+      </properties>
+    </leafNode>
+    <node name="ip">
+      <children>
+        #include <include/interface-arp-cache-timeout.xml.i>
+        #include <include/interface-enable-proxy-arp.xml.i>
+      </children>
+    </node>
+    #include <include/interface-mac.xml.i>
+    #include <include/interface-mtu-68-9000.xml.i>
+  </children>
+</tagNode>