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/dns-domain-name.xml | 115 ------------------------------
 1 file changed, 115 deletions(-)
 delete mode 100644 interface-definitions/dns-domain-name.xml

(limited to 'interface-definitions/dns-domain-name.xml')

diff --git a/interface-definitions/dns-domain-name.xml b/interface-definitions/dns-domain-name.xml
deleted file mode 100644
index c16f0b02a..000000000
--- a/interface-definitions/dns-domain-name.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0"?>
-<!-- host-name configuration -->
-<interfaceDefinition>
-  <node name="system">
-    <children>
-      <leafNode name="name-server" owner="${vyos_conf_scripts_dir}/host_name.py">
-        <properties>
-          <help>Domain Name Server (DNS)</help>
-          <priority>400</priority>
-          <valueHelp>
-            <format>ipv4</format>
-            <description>Domain Name Server (DNS) address</description>
-          </valueHelp>
-          <valueHelp>
-            <format>ipv6</format>
-            <description>Domain Name Server (DNS) address</description>
-          </valueHelp>
-          <multi/>
-          <constraint>
-            <validator name="ipv4-address"/>
-            <validator name="ipv6-address"/>
-          </constraint>
-        </properties>
-      </leafNode>
-      <leafNode name="host-name" owner="${vyos_conf_scripts_dir}/host_name.py">
-        <properties>
-          <help>System host name (default: vyos)</help>
-          <constraint>
-            <regex>[A-Za-z0-9][-.A-Za-z0-9]*[A-Za-z0-9]</regex>
-          </constraint>
-        </properties>
-      </leafNode>
-      <leafNode name="domain-name" owner="${vyos_conf_scripts_dir}/host_name.py">
-        <properties>
-          <help>System domain name</help>
-          <constraint>
-            <regex>[A-Za-z0-9][-.A-Za-z0-9]*</regex>
-          </constraint>
-        </properties>
-      </leafNode>
-      <node name="domain-search" owner="${vyos_conf_scripts_dir}/host_name.py">
-        <properties>
-          <help>Domain Name Server (DNS) domain completion order</help>
-          <priority>400</priority>
-        </properties>
-        <children>
-          <leafNode name="domain">
-            <properties>
-              <help>DNS domain completion order</help>
-              <constraint>
-                <regex>^[-a-zA-Z0-9.]+$</regex>
-              </constraint>
-              <constraintErrorMessage>Invalid domain name</constraintErrorMessage>
-              <multi/>
-            </properties>
-          </leafNode>
-        </children>
-      </node>
-      <leafNode name="disable-dhcp-nameservers" owner="${vyos_conf_scripts_dir}/host_name.py">
-        <properties>
-          <help>Disable DHCP updates of DNS settings</help>
-          <priority>300</priority>
-          <valueless/>
-        </properties>
-      </leafNode>
-      <node name="static-host-mapping" owner="${vyos_conf_scripts_dir}/host_name.py">
-        <properties>
-          <help>Map host names to addresses</help>
-          <priority>400</priority>
-        </properties>
-        <children>
-
-          <tagNode name="host-name">
-            <properties>
-              <help>Host name for static address mapping</help>
-              <constraint>
-                <regex>^[A-Za-z0-9][-.A-Za-z0-9]*[A-Za-z0-9]$</regex>
-              </constraint>
-              <constraintErrorMessage>invalid hostname</constraintErrorMessage>
-            </properties>
-            <children>
-              <leafNode name="alias">
-                <properties>
-                  <help>Alias for this address</help>
-                  <constraint>
-                    <regex>^.{1,63}$</regex>
-                  </constraint>
-                  <constraintErrorMessage>invalid alias hostname, needs to be between 1 and 63 charactes</constraintErrorMessage>
-                  <multi />
-                </properties>
-              </leafNode>
-              <leafNode name="inet">
-                <properties>
-                  <help>IP Address [REQUIRED]</help>
-                  <valueHelp>
-                    <format>ipv4</format>
-                    <description>IPv4 address</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>ipv6</format>
-                    <description>IPv6 address</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="ip-address"/>
-                  </constraint>
-                </properties>
-              </leafNode>
-            </children>
-          </tagNode>
-
-        </children>
-      </node>
-    </children>
-  </node>
-</interfaceDefinition>
-- 
cgit v1.2.3