From 0a8a0188033d6b27c521f082fdddae9873dd5d3d Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Thu, 19 Aug 2021 13:07:18 +0200
Subject: xml: remove superfluous "interface" prefix from interface includes

---
 .../include/interface/arp-cache-timeout.xml.i      | 16 +++++++++++
 .../include/interface/description.xml.i            | 11 ++++++++
 .../include/interface/dial-on-demand.xml.i         |  8 ++++++
 .../include/interface/disable-arp-filter.xml.i     |  8 ++++++
 .../include/interface/disable-forwarding.xml.i     |  8 ++++++
 .../include/interface/disable-link-detect.xml.i    |  8 ++++++
 .../include/interface/disable.xml.i                |  8 ++++++
 .../include/interface/eapol.xml.i                  | 11 ++++++++
 .../include/interface/enable-arp-accept.xml.i      |  8 ++++++
 .../include/interface/enable-arp-announce.xml.i    |  8 ++++++
 .../include/interface/enable-arp-ignore.xml.i      |  8 ++++++
 .../include/interface/enable-proxy-arp.xml.i       |  8 ++++++
 .../include/interface/hw-id.xml.i                  | 14 ++++++++++
 .../interface/interface-arp-cache-timeout.xml.i    | 16 -----------
 .../include/interface/interface-description.xml.i  | 11 --------
 .../interface/interface-dial-on-demand.xml.i       |  8 ------
 .../interface/interface-disable-arp-filter.xml.i   |  8 ------
 .../interface/interface-disable-forwarding.xml.i   |  8 ------
 .../interface/interface-disable-link-detect.xml.i  |  8 ------
 .../include/interface/interface-disable.xml.i      |  8 ------
 .../include/interface/interface-eapol.xml.i        | 11 --------
 .../interface/interface-enable-arp-accept.xml.i    |  8 ------
 .../interface/interface-enable-arp-announce.xml.i  |  8 ------
 .../interface/interface-enable-arp-ignore.xml.i    |  8 ------
 .../interface/interface-enable-proxy-arp.xml.i     |  8 ------
 .../include/interface/interface-hw-id.xml.i        | 14 ----------
 .../include/interface/interface-ipv4-options.xml.i | 18 ------------
 .../include/interface/interface-ipv6-options.xml.i | 12 --------
 .../include/interface/interface-mac.xml.i          | 14 ----------
 .../include/interface/interface-mirror.xml.i       | 25 -----------------
 .../interface/interface-mtu-1200-16000.xml.i       | 16 -----------
 .../interface/interface-mtu-1450-16000.xml.i       | 16 -----------
 .../include/interface/interface-mtu-64-8024.xml.i  | 16 -----------
 .../include/interface/interface-mtu-68-1500.xml.i  | 16 -----------
 .../include/interface/interface-mtu-68-16000.xml.i | 16 -----------
 .../interface-parameters-dont-fragment.xml.i       |  8 ------
 .../interface/interface-parameters-flowlabel.xml.i | 15 ----------
 .../interface/interface-parameters-key.xml.i       | 15 ----------
 .../interface/interface-parameters-tos.xml.i       | 16 -----------
 .../interface/interface-parameters-ttl.xml.i       | 20 --------------
 .../interface/interface-proxy-arp-pvlan.xml.i      |  8 ------
 .../interface/interface-source-validation.xml.i    | 25 -----------------
 .../include/interface/interface-vrf.xml.i          | 14 ----------
 .../include/interface/interface-xdp.xml.i          |  8 ------
 .../include/interface/ipv4-options.xml.i           | 18 ++++++++++++
 .../include/interface/ipv6-options.xml.i           | 12 ++++++++
 interface-definitions/include/interface/mac.xml.i  | 14 ++++++++++
 .../include/interface/mirror.xml.i                 | 25 +++++++++++++++++
 .../include/interface/mtu-1200-16000.xml.i         | 16 +++++++++++
 .../include/interface/mtu-1450-16000.xml.i         | 16 +++++++++++
 .../include/interface/mtu-64-8024.xml.i            | 16 +++++++++++
 .../include/interface/mtu-68-1500.xml.i            | 16 +++++++++++
 .../include/interface/mtu-68-16000.xml.i           | 16 +++++++++++
 .../interface/parameters-dont-fragment.xml.i       |  8 ++++++
 .../include/interface/parameters-flowlabel.xml.i   | 15 ++++++++++
 .../include/interface/parameters-key.xml.i         | 15 ++++++++++
 .../include/interface/parameters-tos.xml.i         | 16 +++++++++++
 .../include/interface/parameters-ttl.xml.i         | 20 ++++++++++++++
 .../include/interface/proxy-arp-pvlan.xml.i        |  8 ++++++
 .../include/interface/source-validation.xml.i      | 25 +++++++++++++++++
 .../include/interface/vif-s.xml.i                  | 32 +++++++++++-----------
 interface-definitions/include/interface/vif.xml.i  | 16 +++++------
 interface-definitions/include/interface/vrf.xml.i  | 14 ++++++++++
 interface-definitions/include/interface/xdp.xml.i  |  8 ++++++
 64 files changed, 426 insertions(+), 426 deletions(-)
 create mode 100644 interface-definitions/include/interface/arp-cache-timeout.xml.i
 create mode 100644 interface-definitions/include/interface/description.xml.i
 create mode 100644 interface-definitions/include/interface/dial-on-demand.xml.i
 create mode 100644 interface-definitions/include/interface/disable-arp-filter.xml.i
 create mode 100644 interface-definitions/include/interface/disable-forwarding.xml.i
 create mode 100644 interface-definitions/include/interface/disable-link-detect.xml.i
 create mode 100644 interface-definitions/include/interface/disable.xml.i
 create mode 100644 interface-definitions/include/interface/eapol.xml.i
 create mode 100644 interface-definitions/include/interface/enable-arp-accept.xml.i
 create mode 100644 interface-definitions/include/interface/enable-arp-announce.xml.i
 create mode 100644 interface-definitions/include/interface/enable-arp-ignore.xml.i
 create mode 100644 interface-definitions/include/interface/enable-proxy-arp.xml.i
 create mode 100644 interface-definitions/include/interface/hw-id.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-arp-cache-timeout.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-description.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-dial-on-demand.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-disable-arp-filter.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-disable-forwarding.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-disable-link-detect.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-disable.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-eapol.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-enable-arp-accept.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-enable-arp-announce.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-enable-arp-ignore.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-enable-proxy-arp.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-hw-id.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-ipv4-options.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-ipv6-options.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-mac.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-mirror.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-mtu-1200-16000.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-mtu-1450-16000.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-mtu-64-8024.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-mtu-68-1500.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-mtu-68-16000.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-parameters-dont-fragment.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-parameters-flowlabel.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-parameters-key.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-parameters-tos.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-parameters-ttl.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-proxy-arp-pvlan.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-source-validation.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-vrf.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-xdp.xml.i
 create mode 100644 interface-definitions/include/interface/ipv4-options.xml.i
 create mode 100644 interface-definitions/include/interface/ipv6-options.xml.i
 create mode 100644 interface-definitions/include/interface/mac.xml.i
 create mode 100644 interface-definitions/include/interface/mirror.xml.i
 create mode 100644 interface-definitions/include/interface/mtu-1200-16000.xml.i
 create mode 100644 interface-definitions/include/interface/mtu-1450-16000.xml.i
 create mode 100644 interface-definitions/include/interface/mtu-64-8024.xml.i
 create mode 100644 interface-definitions/include/interface/mtu-68-1500.xml.i
 create mode 100644 interface-definitions/include/interface/mtu-68-16000.xml.i
 create mode 100644 interface-definitions/include/interface/parameters-dont-fragment.xml.i
 create mode 100644 interface-definitions/include/interface/parameters-flowlabel.xml.i
 create mode 100644 interface-definitions/include/interface/parameters-key.xml.i
 create mode 100644 interface-definitions/include/interface/parameters-tos.xml.i
 create mode 100644 interface-definitions/include/interface/parameters-ttl.xml.i
 create mode 100644 interface-definitions/include/interface/proxy-arp-pvlan.xml.i
 create mode 100644 interface-definitions/include/interface/source-validation.xml.i
 create mode 100644 interface-definitions/include/interface/vrf.xml.i
 create mode 100644 interface-definitions/include/interface/xdp.xml.i

(limited to 'interface-definitions/include')

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..3fb64f1ff
--- /dev/null
+++ b/interface-definitions/include/interface/arp-cache-timeout.xml.i
@@ -0,0 +1,16 @@
+<!-- include start from interface/arp-cache-timeout.xml.i -->
+<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>
+  <defaultValue>30</defaultValue>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/description.xml.i b/interface-definitions/include/interface/description.xml.i
new file mode 100644
index 000000000..8579cf7d1
--- /dev/null
+++ b/interface-definitions/include/interface/description.xml.i
@@ -0,0 +1,11 @@
+<!-- include start from interface/description.xml.i -->
+<leafNode name="description">
+  <properties>
+    <help>Interface specific description</help>
+    <constraint>
+      <regex>.{1,256}$</regex>
+    </constraint>
+    <constraintErrorMessage>Description too long (limit 256 characters)</constraintErrorMessage>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/dial-on-demand.xml.i b/interface-definitions/include/interface/dial-on-demand.xml.i
new file mode 100644
index 000000000..30e8c7e97
--- /dev/null
+++ b/interface-definitions/include/interface/dial-on-demand.xml.i
@@ -0,0 +1,8 @@
+<!-- include start from interface/dial-on-demand.xml.i -->
+<leafNode name="connect-on-demand">
+  <properties>
+    <help>Establishment connection automatically when traffic is sent</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/disable-arp-filter.xml.i b/interface-definitions/include/interface/disable-arp-filter.xml.i
new file mode 100644
index 000000000..a69455d58
--- /dev/null
+++ b/interface-definitions/include/interface/disable-arp-filter.xml.i
@@ -0,0 +1,8 @@
+<!-- include start from interface/disable-arp-filter.xml.i -->
+<leafNode name="disable-arp-filter">
+  <properties>
+    <help>Disable ARP filter on this interface</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/disable-forwarding.xml.i b/interface-definitions/include/interface/disable-forwarding.xml.i
new file mode 100644
index 000000000..a32e5376f
--- /dev/null
+++ b/interface-definitions/include/interface/disable-forwarding.xml.i
@@ -0,0 +1,8 @@
+<!-- include start from interface/disable-forwarding.xml.i -->
+<leafNode name="disable-forwarding">
+  <properties>
+    <help>Disable IPv4 forwarding on this interface</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->
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..b101ec292
--- /dev/null
+++ b/interface-definitions/include/interface/disable-link-detect.xml.i
@@ -0,0 +1,8 @@
+<!-- include start from interface/disable-link-detect.xml.i -->
+<leafNode name="disable-link-detect">
+  <properties>
+    <help>Ignore link state changes</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/disable.xml.i b/interface-definitions/include/interface/disable.xml.i
new file mode 100644
index 000000000..b76bd3f53
--- /dev/null
+++ b/interface-definitions/include/interface/disable.xml.i
@@ -0,0 +1,8 @@
+<!-- include start from interface/disable.xml.i -->
+<leafNode name="disable">
+  <properties>
+    <help>Administratively disable interface</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/eapol.xml.i b/interface-definitions/include/interface/eapol.xml.i
new file mode 100644
index 000000000..c4cdeae0c
--- /dev/null
+++ b/interface-definitions/include/interface/eapol.xml.i
@@ -0,0 +1,11 @@
+<!-- include start from interface/eapol.xml.i -->
+<node name="eapol">
+  <properties>
+     <help>Extensible Authentication Protocol over Local Area Network</help>
+  </properties>
+  <children>
+    #include <include/pki/ca-certificate.xml.i>
+    #include <include/pki/certificate-key.xml.i>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/enable-arp-accept.xml.i b/interface-definitions/include/interface/enable-arp-accept.xml.i
new file mode 100644
index 000000000..90f6bc3db
--- /dev/null
+++ b/interface-definitions/include/interface/enable-arp-accept.xml.i
@@ -0,0 +1,8 @@
+<!-- include start from interface/enable-arp-accept.xml.i -->
+<leafNode name="enable-arp-accept">
+  <properties>
+    <help>Enable ARP accept on this interface</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/enable-arp-announce.xml.i b/interface-definitions/include/interface/enable-arp-announce.xml.i
new file mode 100644
index 000000000..cf02fce0b
--- /dev/null
+++ b/interface-definitions/include/interface/enable-arp-announce.xml.i
@@ -0,0 +1,8 @@
+<!-- include start from interface/enable-arp-announce.xml.i -->
+<leafNode name="enable-arp-announce">
+  <properties>
+    <help>Enable ARP announce on this interface</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/enable-arp-ignore.xml.i b/interface-definitions/include/interface/enable-arp-ignore.xml.i
new file mode 100644
index 000000000..5bb444f35
--- /dev/null
+++ b/interface-definitions/include/interface/enable-arp-ignore.xml.i
@@ -0,0 +1,8 @@
+<!-- include start from interface/enable-arp-ignore.xml.i -->
+<leafNode name="enable-arp-ignore">
+  <properties>
+    <help>Enable ARP ignore on this interface</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->
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..27e497f84
--- /dev/null
+++ b/interface-definitions/include/interface/enable-proxy-arp.xml.i
@@ -0,0 +1,8 @@
+<!-- include start from interface/enable-proxy-arp.xml.i -->
+<leafNode name="enable-proxy-arp">
+  <properties>
+    <help>Enable proxy-arp on this interface</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/hw-id.xml.i b/interface-definitions/include/interface/hw-id.xml.i
new file mode 100644
index 000000000..a3a1eec7c
--- /dev/null
+++ b/interface-definitions/include/interface/hw-id.xml.i
@@ -0,0 +1,14 @@
+<!-- include start from interface/hw-id.xml.i -->
+<leafNode name="hw-id">
+  <properties>
+    <help>Associate Ethernet Interface with given Media Access Control (MAC) address</help>
+    <valueHelp>
+      <format>macaddr</format>
+      <description>Hardware (MAC) address</description>
+    </valueHelp>
+    <constraint>
+      <validator name="mac-address"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-arp-cache-timeout.xml.i b/interface-definitions/include/interface/interface-arp-cache-timeout.xml.i
deleted file mode 100644
index b269fecd8..000000000
--- a/interface-definitions/include/interface/interface-arp-cache-timeout.xml.i
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- include start from interface/interface-arp-cache-timeout.xml.i -->
-<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>
-  <defaultValue>30</defaultValue>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-description.xml.i b/interface-definitions/include/interface/interface-description.xml.i
deleted file mode 100644
index d618b50d2..000000000
--- a/interface-definitions/include/interface/interface-description.xml.i
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- include start from interface/interface-description.xml.i -->
-<leafNode name="description">
-  <properties>
-    <help>Interface specific description</help>
-    <constraint>
-      <regex>.{1,256}$</regex>
-    </constraint>
-    <constraintErrorMessage>Description too long (limit 256 characters)</constraintErrorMessage>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-dial-on-demand.xml.i b/interface-definitions/include/interface/interface-dial-on-demand.xml.i
deleted file mode 100644
index 66edd9678..000000000
--- a/interface-definitions/include/interface/interface-dial-on-demand.xml.i
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- include start from interface/interface-dial-on-demand.xml.i -->
-<leafNode name="connect-on-demand">
-  <properties>
-    <help>Establishment connection automatically when traffic is sent</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-disable-arp-filter.xml.i b/interface-definitions/include/interface/interface-disable-arp-filter.xml.i
deleted file mode 100644
index 49cddaf76..000000000
--- a/interface-definitions/include/interface/interface-disable-arp-filter.xml.i
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- include start from interface/interface-disable-arp-filter.xml.i -->
-<leafNode name="disable-arp-filter">
-  <properties>
-    <help>Disable ARP filter on this interface</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-disable-forwarding.xml.i b/interface-definitions/include/interface/interface-disable-forwarding.xml.i
deleted file mode 100644
index cb6ef0475..000000000
--- a/interface-definitions/include/interface/interface-disable-forwarding.xml.i
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- include start from interface/interface-disable-forwarding.xml.i -->
-<leafNode name="disable-forwarding">
-  <properties>
-    <help>Disable IPv4 forwarding on this interface</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-disable-link-detect.xml.i b/interface-definitions/include/interface/interface-disable-link-detect.xml.i
deleted file mode 100644
index c528885b2..000000000
--- a/interface-definitions/include/interface/interface-disable-link-detect.xml.i
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- include start from interface/interface-disable-link-detect.xml.i -->
-<leafNode name="disable-link-detect">
-  <properties>
-    <help>Ignore link state changes</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-disable.xml.i b/interface-definitions/include/interface/interface-disable.xml.i
deleted file mode 100644
index d90e6395b..000000000
--- a/interface-definitions/include/interface/interface-disable.xml.i
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- include start from interface/interface-disable.xml.i -->
-<leafNode name="disable">
-  <properties>
-    <help>Administratively disable interface</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-eapol.xml.i b/interface-definitions/include/interface/interface-eapol.xml.i
deleted file mode 100644
index 270ec5b13..000000000
--- a/interface-definitions/include/interface/interface-eapol.xml.i
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- include start from interface/interface-eapol.xml.i -->
-<node name="eapol">
-  <properties>
-     <help>Extensible Authentication Protocol over Local Area Network</help>
-  </properties>
-  <children>
-    #include <include/pki/ca-certificate.xml.i>
-    #include <include/pki/certificate-key.xml.i>
-  </children>
-</node>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-enable-arp-accept.xml.i b/interface-definitions/include/interface/interface-enable-arp-accept.xml.i
deleted file mode 100644
index 7c5d51857..000000000
--- a/interface-definitions/include/interface/interface-enable-arp-accept.xml.i
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- include start from interface/interface-enable-arp-accept.xml.i -->
-<leafNode name="enable-arp-accept">
-  <properties>
-    <help>Enable ARP accept on this interface</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-enable-arp-announce.xml.i b/interface-definitions/include/interface/interface-enable-arp-announce.xml.i
deleted file mode 100644
index f44599c54..000000000
--- a/interface-definitions/include/interface/interface-enable-arp-announce.xml.i
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- include start from interface/interface-enable-arp-announce.xml.i -->
-<leafNode name="enable-arp-announce">
-  <properties>
-    <help>Enable ARP announce on this interface</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-enable-arp-ignore.xml.i b/interface-definitions/include/interface/interface-enable-arp-ignore.xml.i
deleted file mode 100644
index 3ea39613c..000000000
--- a/interface-definitions/include/interface/interface-enable-arp-ignore.xml.i
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- include start from interface/interface-enable-arp-ignore.xml.i -->
-<leafNode name="enable-arp-ignore">
-  <properties>
-    <help>Enable ARP ignore on this interface</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-enable-proxy-arp.xml.i b/interface-definitions/include/interface/interface-enable-proxy-arp.xml.i
deleted file mode 100644
index dbdeeb7a7..000000000
--- a/interface-definitions/include/interface/interface-enable-proxy-arp.xml.i
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- include start from interface/interface-enable-proxy-arp.xml.i -->
-<leafNode name="enable-proxy-arp">
-  <properties>
-    <help>Enable proxy-arp on this interface</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-hw-id.xml.i b/interface-definitions/include/interface/interface-hw-id.xml.i
deleted file mode 100644
index 989cd9cb7..000000000
--- a/interface-definitions/include/interface/interface-hw-id.xml.i
+++ /dev/null
@@ -1,14 +0,0 @@
-<!-- include start from interface/interface-hw-id.xml.i -->
-<leafNode name="hw-id">
-  <properties>
-    <help>Associate Ethernet Interface with given Media Access Control (MAC) address</help>
-    <valueHelp>
-      <format>macaddr</format>
-      <description>Hardware (MAC) address</description>
-    </valueHelp>
-    <constraint>
-      <validator name="mac-address"/>
-    </constraint>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-ipv4-options.xml.i b/interface-definitions/include/interface/interface-ipv4-options.xml.i
deleted file mode 100644
index c2d0677b7..000000000
--- a/interface-definitions/include/interface/interface-ipv4-options.xml.i
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- include start from interface/interface-ipv4-options.xml.i -->
-<node name="ip">
-  <properties>
-    <help>IPv4 routing parameters</help>
-  </properties>
-  <children>
-    #include <include/interface/interface-arp-cache-timeout.xml.i>
-    #include <include/interface/interface-disable-arp-filter.xml.i>
-    #include <include/interface/interface-disable-forwarding.xml.i>
-    #include <include/interface/interface-enable-arp-accept.xml.i>
-    #include <include/interface/interface-enable-arp-announce.xml.i>
-    #include <include/interface/interface-enable-arp-ignore.xml.i>
-    #include <include/interface/interface-enable-proxy-arp.xml.i>
-    #include <include/interface/interface-proxy-arp-pvlan.xml.i>
-    #include <include/interface/interface-source-validation.xml.i>
-  </children>
-</node>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-ipv6-options.xml.i b/interface-definitions/include/interface/interface-ipv6-options.xml.i
deleted file mode 100644
index dcd5a8710..000000000
--- a/interface-definitions/include/interface/interface-ipv6-options.xml.i
+++ /dev/null
@@ -1,12 +0,0 @@
-<!-- include start from interface/interface-ipv6-options.xml.i -->
-<node name="ipv6">
-  <properties>
-    <help>IPv6 routing parameters</help>
-  </properties>
-  <children>
-    #include <include/interface/ipv6-address.xml.i>
-    #include <include/interface/ipv6-disable-forwarding.xml.i>
-    #include <include/interface/ipv6-dup-addr-detect-transmits.xml.i>
-  </children>
-</node>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-mac.xml.i b/interface-definitions/include/interface/interface-mac.xml.i
deleted file mode 100644
index d7107ad23..000000000
--- a/interface-definitions/include/interface/interface-mac.xml.i
+++ /dev/null
@@ -1,14 +0,0 @@
-<!-- include start from interface/interface-mac.xml.i -->
-<leafNode name="mac">
-  <properties>
-    <help>Media Access Control (MAC) address</help>
-    <valueHelp>
-      <format>macaddr</format>
-      <description>Hardware (MAC) address</description>
-    </valueHelp>
-    <constraint>
-      <validator name="mac-address"/>
-    </constraint>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-mirror.xml.i b/interface-definitions/include/interface/interface-mirror.xml.i
deleted file mode 100644
index b3b45fb43..000000000
--- a/interface-definitions/include/interface/interface-mirror.xml.i
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- include start from interface/interface-mirror.xml.i -->
-<node name="mirror">
-  <properties>
-    <help>Incoming/outgoing packet mirroring destination</help>
-  </properties>
-  <children>
-    <leafNode name="ingress">
-      <properties>
-        <help>Mirror the ingress traffic of the interface to the destination interface</help>
-        <completionHelp>
-            <script>${vyos_completion_dir}/list_interfaces.py</script>
-        </completionHelp>
-      </properties>
-    </leafNode>
-    <leafNode name="egress">
-      <properties>
-        <help>Mirror the egress traffic of the interface to the destination interface</help>
-        <completionHelp>
-            <script>${vyos_completion_dir}/list_interfaces.py</script>
-        </completionHelp>
-      </properties>
-    </leafNode>
-  </children>
-</node>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-mtu-1200-16000.xml.i b/interface-definitions/include/interface/interface-mtu-1200-16000.xml.i
deleted file mode 100644
index 3241ba912..000000000
--- a/interface-definitions/include/interface/interface-mtu-1200-16000.xml.i
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- include start from interface/interface-mtu-1200-16000.xml.i -->
-<leafNode name="mtu">
-  <properties>
-    <help>Maximum Transmission Unit (MTU)</help>
-    <valueHelp>
-      <format>1200-16000</format>
-      <description>Maximum Transmission Unit in byte</description>
-    </valueHelp>
-    <constraint>
-      <validator name="numeric" argument="--range 1200-16000"/>
-    </constraint>
-    <constraintErrorMessage>MTU must be between 1200 and 16000</constraintErrorMessage>
-  </properties>
-  <defaultValue>1500</defaultValue>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-mtu-1450-16000.xml.i b/interface-definitions/include/interface/interface-mtu-1450-16000.xml.i
deleted file mode 100644
index 0a35bbbaa..000000000
--- a/interface-definitions/include/interface/interface-mtu-1450-16000.xml.i
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- include start from interface/interface-mtu-1450-16000.xml.i -->
-<leafNode name="mtu">
-  <properties>
-    <help>Maximum Transmission Unit (MTU)</help>
-    <valueHelp>
-      <format>1450-16000</format>
-      <description>Maximum Transmission Unit in byte</description>
-    </valueHelp>
-    <constraint>
-      <validator name="numeric" argument="--range 1450-16000"/>
-    </constraint>
-    <constraintErrorMessage>MTU must be between 1450 and 16000</constraintErrorMessage>
-  </properties>
-  <defaultValue>1500</defaultValue>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-mtu-64-8024.xml.i b/interface-definitions/include/interface/interface-mtu-64-8024.xml.i
deleted file mode 100644
index f75de02ba..000000000
--- a/interface-definitions/include/interface/interface-mtu-64-8024.xml.i
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- include start from interface/interface-mtu-68-8024.xml.i -->
-<leafNode name="mtu">
-  <properties>
-    <help>Maximum Transmission Unit (MTU)</help>
-    <valueHelp>
-      <format>64-8024</format>
-      <description>Maximum Transmission Unit in byte</description>
-    </valueHelp>
-    <constraint>
-      <validator name="numeric" argument="--range 64-8024"/>
-    </constraint>
-    <constraintErrorMessage>MTU must be between 64 and 8024</constraintErrorMessage>
-  </properties>
-  <defaultValue>1500</defaultValue>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-mtu-68-1500.xml.i b/interface-definitions/include/interface/interface-mtu-68-1500.xml.i
deleted file mode 100644
index 9e6fe8760..000000000
--- a/interface-definitions/include/interface/interface-mtu-68-1500.xml.i
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- include start from interface/interface-mtu-68-1500.xml.i -->
-<leafNode name="mtu">
-  <properties>
-    <help>Maximum Transmission Unit (MTU)</help>
-    <valueHelp>
-      <format>68-1500</format>
-      <description>Maximum Transmission Unit in byte</description>
-    </valueHelp>
-    <constraint>
-      <validator name="numeric" argument="--range 68-1500"/>
-    </constraint>
-    <constraintErrorMessage>MTU must be between 68 and 1500</constraintErrorMessage>
-  </properties>
-  <defaultValue>1500</defaultValue>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-mtu-68-16000.xml.i b/interface-definitions/include/interface/interface-mtu-68-16000.xml.i
deleted file mode 100644
index 83af7bbd4..000000000
--- a/interface-definitions/include/interface/interface-mtu-68-16000.xml.i
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- include start from interface/interface-mtu-68-16000.xml.i -->
-<leafNode name="mtu">
-  <properties>
-    <help>Maximum Transmission Unit (MTU)</help>
-    <valueHelp>
-      <format>68-16000</format>
-      <description>Maximum Transmission Unit in byte</description>
-    </valueHelp>
-    <constraint>
-      <validator name="numeric" argument="--range 68-16000"/>
-    </constraint>
-    <constraintErrorMessage>MTU must be between 68 and 16000</constraintErrorMessage>
-  </properties>
-  <defaultValue>1500</defaultValue>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-parameters-dont-fragment.xml.i b/interface-definitions/include/interface/interface-parameters-dont-fragment.xml.i
deleted file mode 100644
index 166c31115..000000000
--- a/interface-definitions/include/interface/interface-parameters-dont-fragment.xml.i
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- include start from interface/interface-parameters-df.xml.i -->
-<leafNode name="dont-fragment">
-  <properties>
-    <help>Specifies the usage of the dont fragment (DF) bit</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-parameters-flowlabel.xml.i b/interface-definitions/include/interface/interface-parameters-flowlabel.xml.i
deleted file mode 100644
index ed075e40d..000000000
--- a/interface-definitions/include/interface/interface-parameters-flowlabel.xml.i
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- include start from interface/interface-parameters-flowlabel.xml.i -->
-<leafNode name="flowlabel">
-  <properties>
-    <help>Specifies the flow label to use in outgoing packets</help>
-    <valueHelp>
-      <format>0x0-0x0FFFFF</format>
-      <description>Tunnel key, 'inherit' or hex value</description>
-    </valueHelp>
-    <constraint>
-      <regex>^((0x){0,1}(0?[0-9A-Fa-f]{1,5})|inherit)$</regex>
-    </constraint>
-    <constraintErrorMessage>Must be 'inherit' or a number</constraintErrorMessage>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-parameters-key.xml.i b/interface-definitions/include/interface/interface-parameters-key.xml.i
deleted file mode 100644
index 6c59f7879..000000000
--- a/interface-definitions/include/interface/interface-parameters-key.xml.i
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- include start from interface/interface-parameters-key.xml.i -->
-<leafNode name="key">
-  <properties>
-    <help>Tunnel key (only GRE tunnels)</help>
-    <valueHelp>
-      <format>u32</format>
-      <description>Tunnel key</description>
-    </valueHelp>
-    <constraint>
-      <validator name="numeric" argument="--range 0-4294967295"/>
-    </constraint>
-    <constraintErrorMessage>key must be between 0-4294967295</constraintErrorMessage>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-parameters-tos.xml.i b/interface-definitions/include/interface/interface-parameters-tos.xml.i
deleted file mode 100644
index 83b4e0671..000000000
--- a/interface-definitions/include/interface/interface-parameters-tos.xml.i
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- include start from interface/tunnel-parameters-tos.xml.i -->
-<leafNode name="tos">
-  <properties>
-    <help>Specifies TOS value to use in outgoing packets</help>
-    <valueHelp>
-      <format>0-99</format>
-      <description>Type of Service (TOS)</description>
-    </valueHelp>
-    <constraint>
-      <validator name="numeric" argument="--range 0-99"/>
-    </constraint>
-    <constraintErrorMessage>TOS must be between 0 and 99</constraintErrorMessage>
-  </properties>
-  <defaultValue>inherit</defaultValue>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-parameters-ttl.xml.i b/interface-definitions/include/interface/interface-parameters-ttl.xml.i
deleted file mode 100644
index df193cf24..000000000
--- a/interface-definitions/include/interface/interface-parameters-ttl.xml.i
+++ /dev/null
@@ -1,20 +0,0 @@
-<!-- include start from interface/interface-parameters-ttl.xml.i -->
-<leafNode name="ttl">
-  <properties>
-    <help>Specifies TTL value to use in outgoing packets</help>
-    <valueHelp>
-      <format>0</format>
-      <description>Inherit - copy value from original IP header</description>
-    </valueHelp>
-    <valueHelp>
-      <format>1-255</format>
-      <description>Time to Live</description>
-    </valueHelp>
-    <constraint>
-      <validator name="numeric" argument="--range 0-255"/>
-    </constraint>
-    <constraintErrorMessage>TTL must be between 0 and 255</constraintErrorMessage>
-  </properties>
-  <defaultValue>0</defaultValue>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-proxy-arp-pvlan.xml.i b/interface-definitions/include/interface/interface-proxy-arp-pvlan.xml.i
deleted file mode 100644
index 153dfc072..000000000
--- a/interface-definitions/include/interface/interface-proxy-arp-pvlan.xml.i
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- include start from interface/interface-proxy-arp-pvlan.xml.i -->
-<leafNode name="proxy-arp-pvlan">
-  <properties>
-    <help>Enable private VLAN proxy ARP on this interface</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-source-validation.xml.i b/interface-definitions/include/interface/interface-source-validation.xml.i
deleted file mode 100644
index 70914f2e9..000000000
--- a/interface-definitions/include/interface/interface-source-validation.xml.i
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- include start from interface/interface-source-validation.xml.i -->
-<leafNode name="source-validation">
-  <properties>
-    <help>Source validation by reversed path (RFC3704)</help>
-    <completionHelp>
-      <list>strict loose disable</list>
-    </completionHelp>
-    <valueHelp>
-      <format>strict</format>
-      <description>Enable Strict Reverse Path Forwarding as defined in RFC3704</description>
-    </valueHelp>
-    <valueHelp>
-      <format>loose</format>
-      <description>Enable Loose Reverse Path Forwarding as defined in RFC3704</description>
-    </valueHelp>
-    <valueHelp>
-      <format>disable</format>
-      <description>No source validation</description>
-    </valueHelp>
-    <constraint>
-      <regex>^(strict|loose|disable)$</regex>
-    </constraint>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-vrf.xml.i b/interface-definitions/include/interface/interface-vrf.xml.i
deleted file mode 100644
index ef6ca1241..000000000
--- a/interface-definitions/include/interface/interface-vrf.xml.i
+++ /dev/null
@@ -1,14 +0,0 @@
-<!-- include start from interface/interface-vrf.xml.i -->
-<leafNode name="vrf">
-  <properties>
-    <help>VRF instance name</help>
-    <valueHelp>
-      <format>text</format>
-      <description>VRF instance name</description>
-    </valueHelp>
-    <completionHelp>
-      <path>vrf name</path>
-    </completionHelp>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-xdp.xml.i b/interface-definitions/include/interface/interface-xdp.xml.i
deleted file mode 100644
index 0253f6dad..000000000
--- a/interface-definitions/include/interface/interface-xdp.xml.i
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- include start from interface/interface-xdp.xml.i -->
-<leafNode name="xdp">
-  <properties>
-    <help>Enable eXpress Data Path</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/ipv4-options.xml.i b/interface-definitions/include/interface/ipv4-options.xml.i
new file mode 100644
index 000000000..10884b6eb
--- /dev/null
+++ b/interface-definitions/include/interface/ipv4-options.xml.i
@@ -0,0 +1,18 @@
+<!-- include start from interface/ipv4-options.xml.i -->
+<node name="ip">
+  <properties>
+    <help>IPv4 routing parameters</help>
+  </properties>
+  <children>
+    #include <include/interface/arp-cache-timeout.xml.i>
+    #include <include/interface/disable-arp-filter.xml.i>
+    #include <include/interface/disable-forwarding.xml.i>
+    #include <include/interface/enable-arp-accept.xml.i>
+    #include <include/interface/enable-arp-announce.xml.i>
+    #include <include/interface/enable-arp-ignore.xml.i>
+    #include <include/interface/enable-proxy-arp.xml.i>
+    #include <include/interface/proxy-arp-pvlan.xml.i>
+    #include <include/interface/source-validation.xml.i>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/ipv6-options.xml.i b/interface-definitions/include/interface/ipv6-options.xml.i
new file mode 100644
index 000000000..e57c242b0
--- /dev/null
+++ b/interface-definitions/include/interface/ipv6-options.xml.i
@@ -0,0 +1,12 @@
+<!-- include start from interface/ipv6-options.xml.i -->
+<node name="ipv6">
+  <properties>
+    <help>IPv6 routing parameters</help>
+  </properties>
+  <children>
+    #include <include/interface/ipv6-address.xml.i>
+    #include <include/interface/ipv6-disable-forwarding.xml.i>
+    #include <include/interface/ipv6-dup-addr-detect-transmits.xml.i>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/mac.xml.i b/interface-definitions/include/interface/mac.xml.i
new file mode 100644
index 000000000..705330dce
--- /dev/null
+++ b/interface-definitions/include/interface/mac.xml.i
@@ -0,0 +1,14 @@
+<!-- include start from interface/mac.xml.i -->
+<leafNode name="mac">
+  <properties>
+    <help>Media Access Control (MAC) address</help>
+    <valueHelp>
+      <format>macaddr</format>
+      <description>Hardware (MAC) address</description>
+    </valueHelp>
+    <constraint>
+      <validator name="mac-address"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/mirror.xml.i b/interface-definitions/include/interface/mirror.xml.i
new file mode 100644
index 000000000..2959551f0
--- /dev/null
+++ b/interface-definitions/include/interface/mirror.xml.i
@@ -0,0 +1,25 @@
+<!-- include start from interface/mirror.xml.i -->
+<node name="mirror">
+  <properties>
+    <help>Incoming/outgoing packet mirroring destination</help>
+  </properties>
+  <children>
+    <leafNode name="ingress">
+      <properties>
+        <help>Mirror the ingress traffic of the interface to the destination interface</help>
+        <completionHelp>
+            <script>${vyos_completion_dir}/list_interfaces.py</script>
+        </completionHelp>
+      </properties>
+    </leafNode>
+    <leafNode name="egress">
+      <properties>
+        <help>Mirror the egress traffic of the interface to the destination interface</help>
+        <completionHelp>
+            <script>${vyos_completion_dir}/list_interfaces.py</script>
+        </completionHelp>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/mtu-1200-16000.xml.i b/interface-definitions/include/interface/mtu-1200-16000.xml.i
new file mode 100644
index 000000000..ccd986d55
--- /dev/null
+++ b/interface-definitions/include/interface/mtu-1200-16000.xml.i
@@ -0,0 +1,16 @@
+<!-- include start from interface/mtu-1200-16000.xml.i -->
+<leafNode name="mtu">
+  <properties>
+    <help>Maximum Transmission Unit (MTU)</help>
+    <valueHelp>
+      <format>1200-16000</format>
+      <description>Maximum Transmission Unit in byte</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1200-16000"/>
+    </constraint>
+    <constraintErrorMessage>MTU must be between 1200 and 16000</constraintErrorMessage>
+  </properties>
+  <defaultValue>1500</defaultValue>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/mtu-1450-16000.xml.i b/interface-definitions/include/interface/mtu-1450-16000.xml.i
new file mode 100644
index 000000000..2dc3a2029
--- /dev/null
+++ b/interface-definitions/include/interface/mtu-1450-16000.xml.i
@@ -0,0 +1,16 @@
+<!-- include start from interface/mtu-1450-16000.xml.i -->
+<leafNode name="mtu">
+  <properties>
+    <help>Maximum Transmission Unit (MTU)</help>
+    <valueHelp>
+      <format>1450-16000</format>
+      <description>Maximum Transmission Unit in byte</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1450-16000"/>
+    </constraint>
+    <constraintErrorMessage>MTU must be between 1450 and 16000</constraintErrorMessage>
+  </properties>
+  <defaultValue>1500</defaultValue>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/mtu-64-8024.xml.i b/interface-definitions/include/interface/mtu-64-8024.xml.i
new file mode 100644
index 000000000..9b8bc4697
--- /dev/null
+++ b/interface-definitions/include/interface/mtu-64-8024.xml.i
@@ -0,0 +1,16 @@
+<!-- include start from interface/mtu-68-8024.xml.i -->
+<leafNode name="mtu">
+  <properties>
+    <help>Maximum Transmission Unit (MTU)</help>
+    <valueHelp>
+      <format>64-8024</format>
+      <description>Maximum Transmission Unit in byte</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 64-8024"/>
+    </constraint>
+    <constraintErrorMessage>MTU must be between 64 and 8024</constraintErrorMessage>
+  </properties>
+  <defaultValue>1500</defaultValue>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/mtu-68-1500.xml.i b/interface-definitions/include/interface/mtu-68-1500.xml.i
new file mode 100644
index 000000000..e3b70302f
--- /dev/null
+++ b/interface-definitions/include/interface/mtu-68-1500.xml.i
@@ -0,0 +1,16 @@
+<!-- include start from interface/mtu-68-1500.xml.i -->
+<leafNode name="mtu">
+  <properties>
+    <help>Maximum Transmission Unit (MTU)</help>
+    <valueHelp>
+      <format>68-1500</format>
+      <description>Maximum Transmission Unit in byte</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 68-1500"/>
+    </constraint>
+    <constraintErrorMessage>MTU must be between 68 and 1500</constraintErrorMessage>
+  </properties>
+  <defaultValue>1500</defaultValue>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/mtu-68-16000.xml.i b/interface-definitions/include/interface/mtu-68-16000.xml.i
new file mode 100644
index 000000000..b610ab3e2
--- /dev/null
+++ b/interface-definitions/include/interface/mtu-68-16000.xml.i
@@ -0,0 +1,16 @@
+<!-- include start from interface/mtu-68-16000.xml.i -->
+<leafNode name="mtu">
+  <properties>
+    <help>Maximum Transmission Unit (MTU)</help>
+    <valueHelp>
+      <format>68-16000</format>
+      <description>Maximum Transmission Unit in byte</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 68-16000"/>
+    </constraint>
+    <constraintErrorMessage>MTU must be between 68 and 16000</constraintErrorMessage>
+  </properties>
+  <defaultValue>1500</defaultValue>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/parameters-dont-fragment.xml.i b/interface-definitions/include/interface/parameters-dont-fragment.xml.i
new file mode 100644
index 000000000..d34f0a97b
--- /dev/null
+++ b/interface-definitions/include/interface/parameters-dont-fragment.xml.i
@@ -0,0 +1,8 @@
+<!-- include start from interface/parameters-df.xml.i -->
+<leafNode name="dont-fragment">
+  <properties>
+    <help>Specifies the usage of the dont fragment (DF) bit</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/parameters-flowlabel.xml.i b/interface-definitions/include/interface/parameters-flowlabel.xml.i
new file mode 100644
index 000000000..7fa571634
--- /dev/null
+++ b/interface-definitions/include/interface/parameters-flowlabel.xml.i
@@ -0,0 +1,15 @@
+<!-- include start from interface/parameters-flowlabel.xml.i -->
+<leafNode name="flowlabel">
+  <properties>
+    <help>Specifies the flow label to use in outgoing packets</help>
+    <valueHelp>
+      <format>0x0-0x0FFFFF</format>
+      <description>Tunnel key, 'inherit' or hex value</description>
+    </valueHelp>
+    <constraint>
+      <regex>^((0x){0,1}(0?[0-9A-Fa-f]{1,5})|inherit)$</regex>
+    </constraint>
+    <constraintErrorMessage>Must be 'inherit' or a number</constraintErrorMessage>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/parameters-key.xml.i b/interface-definitions/include/interface/parameters-key.xml.i
new file mode 100644
index 000000000..25a6c0303
--- /dev/null
+++ b/interface-definitions/include/interface/parameters-key.xml.i
@@ -0,0 +1,15 @@
+<!-- include start from interface/parameters-key.xml.i -->
+<leafNode name="key">
+  <properties>
+    <help>Tunnel key (only GRE tunnels)</help>
+    <valueHelp>
+      <format>u32</format>
+      <description>Tunnel key</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 0-4294967295"/>
+    </constraint>
+    <constraintErrorMessage>key must be between 0-4294967295</constraintErrorMessage>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/parameters-tos.xml.i b/interface-definitions/include/interface/parameters-tos.xml.i
new file mode 100644
index 000000000..83b4e0671
--- /dev/null
+++ b/interface-definitions/include/interface/parameters-tos.xml.i
@@ -0,0 +1,16 @@
+<!-- include start from interface/tunnel-parameters-tos.xml.i -->
+<leafNode name="tos">
+  <properties>
+    <help>Specifies TOS value to use in outgoing packets</help>
+    <valueHelp>
+      <format>0-99</format>
+      <description>Type of Service (TOS)</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 0-99"/>
+    </constraint>
+    <constraintErrorMessage>TOS must be between 0 and 99</constraintErrorMessage>
+  </properties>
+  <defaultValue>inherit</defaultValue>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/parameters-ttl.xml.i b/interface-definitions/include/interface/parameters-ttl.xml.i
new file mode 100644
index 000000000..da5ce69c2
--- /dev/null
+++ b/interface-definitions/include/interface/parameters-ttl.xml.i
@@ -0,0 +1,20 @@
+<!-- include start from interface/parameters-ttl.xml.i -->
+<leafNode name="ttl">
+  <properties>
+    <help>Specifies TTL value to use in outgoing packets</help>
+    <valueHelp>
+      <format>0</format>
+      <description>Inherit - copy value from original IP header</description>
+    </valueHelp>
+    <valueHelp>
+      <format>1-255</format>
+      <description>Time to Live</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 0-255"/>
+    </constraint>
+    <constraintErrorMessage>TTL must be between 0 and 255</constraintErrorMessage>
+  </properties>
+  <defaultValue>0</defaultValue>
+</leafNode>
+<!-- include end -->
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..c00b2fe85
--- /dev/null
+++ b/interface-definitions/include/interface/proxy-arp-pvlan.xml.i
@@ -0,0 +1,8 @@
+<!-- include start from interface/proxy-arp-pvlan.xml.i -->
+<leafNode name="proxy-arp-pvlan">
+  <properties>
+    <help>Enable private VLAN proxy ARP on this interface</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/source-validation.xml.i b/interface-definitions/include/interface/source-validation.xml.i
new file mode 100644
index 000000000..f38065f4d
--- /dev/null
+++ b/interface-definitions/include/interface/source-validation.xml.i
@@ -0,0 +1,25 @@
+<!-- include start from interface/source-validation.xml.i -->
+<leafNode name="source-validation">
+  <properties>
+    <help>Source validation by reversed path (RFC3704)</help>
+    <completionHelp>
+      <list>strict loose disable</list>
+    </completionHelp>
+    <valueHelp>
+      <format>strict</format>
+      <description>Enable Strict Reverse Path Forwarding as defined in RFC3704</description>
+    </valueHelp>
+    <valueHelp>
+      <format>loose</format>
+      <description>Enable Loose Reverse Path Forwarding as defined in RFC3704</description>
+    </valueHelp>
+    <valueHelp>
+      <format>disable</format>
+      <description>No source validation</description>
+    </valueHelp>
+    <constraint>
+      <regex>^(strict|loose|disable)$</regex>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/vif-s.xml.i b/interface-definitions/include/interface/vif-s.xml.i
index 17d1746be..3fd69d9d1 100644
--- a/interface-definitions/include/interface/vif-s.xml.i
+++ b/interface-definitions/include/interface/vif-s.xml.i
@@ -9,11 +9,11 @@
   </properties>
   <children>
     #include <include/interface/address-ipv4-ipv6-dhcp.xml.i>
-    #include <include/interface/interface-description.xml.i>
+    #include <include/interface/description.xml.i>
     #include <include/interface/dhcp-options.xml.i>
     #include <include/interface/dhcpv6-options.xml.i>
-    #include <include/interface/interface-disable-link-detect.xml.i>
-    #include <include/interface/interface-disable.xml.i>
+    #include <include/interface/disable-link-detect.xml.i>
+    #include <include/interface/disable.xml.i>
     <leafNode name="protocol">
       <properties>
         <help>Protocol used for service VLAN (default: 802.1ad)</help>
@@ -35,10 +35,10 @@
       </properties>
       <defaultValue>802.1ad</defaultValue>
     </leafNode>
-    #include <include/interface/interface-ipv4-options.xml.i>
-    #include <include/interface/interface-ipv6-options.xml.i>
-    #include <include/interface/interface-mac.xml.i>
-    #include <include/interface/interface-mtu-68-16000.xml.i>
+    #include <include/interface/ipv4-options.xml.i>
+    #include <include/interface/ipv6-options.xml.i>
+    #include <include/interface/mac.xml.i>
+    #include <include/interface/mtu-68-16000.xml.i>
     <tagNode name="vif-c">
       <properties>
         <help>QinQ TAG-C Virtual Local Area Network (VLAN) ID</help>
@@ -49,19 +49,19 @@
       </properties>
       <children>
         #include <include/interface/address-ipv4-ipv6-dhcp.xml.i>
-        #include <include/interface/interface-description.xml.i>
+        #include <include/interface/description.xml.i>
         #include <include/interface/dhcp-options.xml.i>
         #include <include/interface/dhcpv6-options.xml.i>
-        #include <include/interface/interface-disable-link-detect.xml.i>
-        #include <include/interface/interface-disable.xml.i>
-        #include <include/interface/interface-ipv4-options.xml.i>
-        #include <include/interface/interface-ipv6-options.xml.i>
-        #include <include/interface/interface-mac.xml.i>
-        #include <include/interface/interface-mtu-68-16000.xml.i>
-        #include <include/interface/interface-vrf.xml.i>
+        #include <include/interface/disable-link-detect.xml.i>
+        #include <include/interface/disable.xml.i>
+        #include <include/interface/ipv4-options.xml.i>
+        #include <include/interface/ipv6-options.xml.i>
+        #include <include/interface/mac.xml.i>
+        #include <include/interface/mtu-68-16000.xml.i>
+        #include <include/interface/vrf.xml.i>
       </children>
     </tagNode>
-    #include <include/interface/interface-vrf.xml.i>
+    #include <include/interface/vrf.xml.i>
   </children>
 </tagNode>
 <!-- include end -->
diff --git a/interface-definitions/include/interface/vif.xml.i b/interface-definitions/include/interface/vif.xml.i
index 9e89cbbf6..8daafeaf4 100644
--- a/interface-definitions/include/interface/vif.xml.i
+++ b/interface-definitions/include/interface/vif.xml.i
@@ -13,12 +13,12 @@
   </properties>
   <children>
     #include <include/interface/address-ipv4-ipv6-dhcp.xml.i>
-    #include <include/interface/interface-description.xml.i>
+    #include <include/interface/description.xml.i>
     #include <include/interface/dhcp-options.xml.i>
     #include <include/interface/dhcpv6-options.xml.i>
-    #include <include/interface/interface-disable-link-detect.xml.i>
-    #include <include/interface/interface-disable.xml.i>
-    #include <include/interface/interface-vrf.xml.i>
+    #include <include/interface/disable-link-detect.xml.i>
+    #include <include/interface/disable.xml.i>
+    #include <include/interface/vrf.xml.i>
     <leafNode name="egress-qos">
       <properties>
         <help>VLAN egress QoS</help>
@@ -45,10 +45,10 @@
         <constraintErrorMessage>QoS mapping should be in the format of '0:7 2:3' with numbers 0-9</constraintErrorMessage>
       </properties>
     </leafNode>
-    #include <include/interface/interface-ipv4-options.xml.i>
-    #include <include/interface/interface-ipv6-options.xml.i>
-    #include <include/interface/interface-mac.xml.i>
-    #include <include/interface/interface-mtu-68-16000.xml.i>
+    #include <include/interface/ipv4-options.xml.i>
+    #include <include/interface/ipv6-options.xml.i>
+    #include <include/interface/mac.xml.i>
+    #include <include/interface/mtu-68-16000.xml.i>
   </children>
 </tagNode>
 <!-- include end -->
diff --git a/interface-definitions/include/interface/vrf.xml.i b/interface-definitions/include/interface/vrf.xml.i
new file mode 100644
index 000000000..5ad978a27
--- /dev/null
+++ b/interface-definitions/include/interface/vrf.xml.i
@@ -0,0 +1,14 @@
+<!-- include start from interface/vrf.xml.i -->
+<leafNode name="vrf">
+  <properties>
+    <help>VRF instance name</help>
+    <valueHelp>
+      <format>text</format>
+      <description>VRF instance name</description>
+    </valueHelp>
+    <completionHelp>
+      <path>vrf name</path>
+    </completionHelp>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/xdp.xml.i b/interface-definitions/include/interface/xdp.xml.i
new file mode 100644
index 000000000..10223e766
--- /dev/null
+++ b/interface-definitions/include/interface/xdp.xml.i
@@ -0,0 +1,8 @@
+<!-- include start from interface/xdp.xml.i -->
+<leafNode name="xdp">
+  <properties>
+    <help>Enable eXpress Data Path</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->
-- 
cgit v1.2.3