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, 100 insertions, 0 deletions

diff --git a/interface-definitions/igmp-proxy.xml.in b/interface-definitions/igmp-proxy.xml.in
new file mode 100644
index 000000000..74fec6b48
--- /dev/null
+++ b/interface-definitions/igmp-proxy.xml.in
@@ -0,0 +1,100 @@
+<?xml version="1.0"?>
+<!-- IGMP Proxy  configuration -->
+<interfaceDefinition>
+  <node name="protocols">
+    <children>
+      <node name="igmp-proxy" owner="${vyos_conf_scripts_dir}/igmp_proxy.py">
+        <properties>
+          <help>Internet Group Management Protocol (IGMP) proxy parameters</help>
+          <priority>740</priority>
+        </properties>
+        <children>
+          <leafNode name="disable">
+            <properties>
+              <help>Option to disable IGMP proxy</help>
+              <valueless/>
+            </properties>
+          </leafNode>
+          <leafNode name="disable-quickleave">
+            <properties>
+              <help>Option to disable "quickleave"</help>
+              <valueless/>
+            </properties>
+          </leafNode>
+          <tagNode name="interface">
+            <properties>
+              <help>Interface for IGMP proxy [REQUIRED]</help>
+              <completionHelp>
+                <script>${vyos_completion_dir}/list_interfaces.py</script>
+              </completionHelp>
+            </properties>
+            <children>
+              <leafNode name="alt-subnet">
+                <properties>
+                  <help>Unicast source networks allowed for multicast traffic to be proxyed</help>
+                  <valueHelp>
+                    <format>ipv4net</format>
+                    <description>IPv4 network</description>
+                  </valueHelp>
+                  <constraint>
+                    <validator name="ipv4-prefix"/>
+                  </constraint>
+                  <multi/>
+                </properties>
+              </leafNode>
+              <leafNode name="role">
+                <properties>
+                  <help>Role of this IGMP interface</help>
+                  <completionHelp>
+                    <list>upstream downstream disabled</list>
+                  </completionHelp>
+                  <valueHelp>
+                    <format>upstream</format>
+                    <description>Upstream interface (only 1 allowed)</description>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>downstream</format>
+                    <description>Downstream interface(s) (default)</description>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>disabled</format>
+                    <description>Disabled interface</description>
+                  </valueHelp>
+                  <constraint>
+                    <regex>(upstream|downstream|disabled)</regex>
+                  </constraint>
+                </properties>
+              </leafNode>
+              <leafNode name="threshold">
+                <properties>
+                  <help>TTL threshold</help>
+                  <valueHelp>
+                    <format>1-255</format>
+                    <description>TTL threshold for the interfaces (default: 1)</description>
+                  </valueHelp>
+                  <constraint>
+                    <validator name="numeric" argument="--range 1-255"/>
+                  </constraint>
+                  <constraintErrorMessage>threshold must be between 1 and 255</constraintErrorMessage>
+                </properties>
+              </leafNode>
+              <leafNode name="whitelist">
+                <properties>
+                  <help>Group to whitelist</help>
+                  <valueHelp>
+                    <format>ipv4net</format>
+                    <description>IPv4 network</description>
+                  </valueHelp>
+                  <constraint>
+                    <validator name="ipv4-prefix"/>
+                  </constraint>
+                  <multi/>
+                </properties>
+              </leafNode>
+            </children>
+          </tagNode>
+        </children>
+      </node>
+    </children>
+  </node>
+</interfaceDefinition>