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

1 files changed, 56 insertions, 0 deletions

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>