From 0d4d4dd840e06c18250d73f27de61261ff141944 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Tue, 3 Dec 2019 22:01:19 +0100
Subject: T1843: run interface-definitions though GCC preprocessor

A lot of XML code is duplicated (VLAN, interface address) for instance. Such
XML definitions should be moved to feature.xml.i files and then just pulled in
via GCC preprocessor #include definition in e.g. bond or ethernet definitions.

This will give us the ability to single-source repeating node definitions as:
* Interface Address
* Interface Description
* Interface Disable
* VLAN (both vif-s and vif-c)

The .in suffix of the interface-definitions is a marker that those files are
input files to the GCC preprocessor. They will be rendered into proper XML
files in the build directory.

Some node definitions have been reworder to remove escaped double quote
occurances which would have been warned about by the GCC preprocessor.
---
 interface-definitions/interfaces-vxlan.xml | 151 -----------------------------
 1 file changed, 151 deletions(-)
 delete mode 100644 interface-definitions/interfaces-vxlan.xml

(limited to 'interface-definitions/interfaces-vxlan.xml')

diff --git a/interface-definitions/interfaces-vxlan.xml b/interface-definitions/interfaces-vxlan.xml
deleted file mode 100644
index f93711741..000000000
--- a/interface-definitions/interfaces-vxlan.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0"?>
-<interfaceDefinition>
-  <node name="interfaces">
-    <children>
-      <tagNode name="vxlan" owner="${vyos_conf_scripts_dir}/interfaces-vxlan.py">
-        <properties>
-          <help>Virtual extensible LAN interface (VXLAN)</help>
-          <priority>460</priority>
-          <constraint>
-            <regex>vxlan[0-9]+$</regex>
-          </constraint>
-          <constraintErrorMessage>VXLAN interface must be named vxlanN</constraintErrorMessage>
-          <valueHelp>
-            <format>vxlanN</format>
-            <description>VXLAN interface name</description>
-          </valueHelp>
-        </properties>
-        <children>
-          <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>
-              <multi/>
-              <constraint>
-                <validator name="ip-cidr"/>
-              </constraint>
-            </properties>
-          </leafNode>
-          <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>
-          <leafNode name="disable">
-            <properties>
-              <help>Disable interface</help>
-              <valueless/>
-            </properties>
-          </leafNode>
-          <leafNode name="group">
-            <properties>
-              <help>Multicast group address for VXLAN interface</help>
-              <valueHelp>
-                <format>ipv4</format>
-                <description>Multicast group address</description>
-              </valueHelp>
-              <constraint>
-                <validator name="ipv4-address"/>
-              </constraint>
-            </properties>
-          </leafNode>
-          <node name="ip">
-            <children>
-              <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>
-              <leafNode name="enable-proxy-arp">
-                <properties>
-                  <help>Enable proxy-arp on this interface</help>
-                  <valueless/>
-                </properties>
-              </leafNode>
-            </children>
-          </node>
-          <leafNode name="link">
-            <properties>
-              <help>Underlay device of VXLAN interface</help>
-              <valueHelp>
-                <format>interface</format>
-                <description>Interface used for VXLAN underlay</description>
-              </valueHelp>
-              <completionHelp>
-                <script>${vyos_completion_dir}/list_interfaces.py</script>
-              </completionHelp>
-            </properties>
-          </leafNode>
-          <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>
-          <leafNode name="remote">
-            <properties>
-              <help>Remote address of VXLAN tunnel</help>
-              <valueHelp>
-                <format>ipv4</format>
-                <description>Remote address of VXLAN tunnel</description>
-              </valueHelp>
-              <constraint>
-                <validator name="ipv4-address"/>
-              </constraint>
-            </properties>
-          </leafNode>
-          <leafNode name="port">
-            <properties>
-              <help>Destination port of VXLAN tunnel (default: 8472)</help>
-              <valueHelp>
-                <format>1-65535</format>
-                <description>Numeric IP port</description>
-              </valueHelp>
-              <constraint>
-                <validator name="numeric" argument="--range 1-65535"/>
-              </constraint>
-            </properties>
-          </leafNode>
-          <leafNode name="vni">
-            <properties>
-              <help>Virtual Network Identifier</help>
-              <valueHelp>
-                <format>0-16777214</format>
-                <description>VXLAN virtual network identifier</description>
-              </valueHelp>
-              <constraint>
-                <validator name="numeric" argument="--range 0-16777214"/>
-              </constraint>
-            </properties>
-          </leafNode>
-        </children>
-      </tagNode>
-    </children>
-  </node>
-</interfaceDefinition>
-- 
cgit v1.2.3