From 81c3919271b20c0818ea7b2ed5c468685c6d7d4a Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Fri, 6 Dec 2019 18:21:58 +0100
Subject: T1843: use include files for interface proxy-arp configuration

---
 .../include/interface-enable-proxy-arp.xml.i                |  6 ++++++
 interface-definitions/include/vif.xml.i                     | 13 +------------
 interface-definitions/interfaces-bonding.xml.in             |  7 +------
 interface-definitions/interfaces-ethernet.xml.in            |  7 +------
 interface-definitions/interfaces-geneve.xml.in              |  7 +------
 interface-definitions/interfaces-vxlan.xml.in               |  7 +------
 6 files changed, 11 insertions(+), 36 deletions(-)
 create mode 100644 interface-definitions/include/interface-enable-proxy-arp.xml.i

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..14ab08875
--- /dev/null
+++ b/interface-definitions/include/interface-enable-proxy-arp.xml.i
@@ -0,0 +1,6 @@
+<leafNode name="enable-proxy-arp">
+  <properties>
+    <help>Enable proxy-arp on this interface</help>
+    <valueless/>
+  </properties>
+</leafNode>
diff --git a/interface-definitions/include/vif.xml.i b/interface-definitions/include/vif.xml.i
index 4adae6016..7c8a29a93 100644
--- a/interface-definitions/include/vif.xml.i
+++ b/interface-definitions/include/vif.xml.i
@@ -43,18 +43,7 @@
     <node name="ip">
       <children>
         #include <include/interface-arp-cache-timeout.xml.i>
-        <leafNode name="enable-proxy-arp">
-          <properties>
-            <help>Enable proxy-arp on this interface</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-        <leafNode name="proxy-arp-pvlan">
-          <properties>
-            <help>Enable private VLAN proxy ARP on this interface</help>
-            <valueless/>
-          </properties>
-        </leafNode>
+        #include <include/interface-enable-proxy-arp.xml.i>
       </children>
     </node>
     #include <include/interface-mac.xml.i>
diff --git a/interface-definitions/interfaces-bonding.xml.in b/interface-definitions/interfaces-bonding.xml.in
index 6e4bef649..e2e20b4a3 100644
--- a/interface-definitions/interfaces-bonding.xml.in
+++ b/interface-definitions/interfaces-bonding.xml.in
@@ -80,12 +80,7 @@
           <node name="ip">
             <children>
               #include <include/interface-arp-cache-timeout.xml.i>
-              <leafNode name="enable-proxy-arp">
-                <properties>
-                  <help>Enable proxy-arp on this interface</help>
-                  <valueless/>
-                </properties>
-              </leafNode>
+              #include <include/interface-enable-proxy-arp.xml.i>
               <leafNode name="proxy-arp-pvlan">
                 <properties>
                   <help>Enable private VLAN proxy ARP on this interface</help>
diff --git a/interface-definitions/interfaces-ethernet.xml.in b/interface-definitions/interfaces-ethernet.xml.in
index e44661d10..2f7d62f46 100644
--- a/interface-definitions/interfaces-ethernet.xml.in
+++ b/interface-definitions/interfaces-ethernet.xml.in
@@ -70,12 +70,7 @@
           <node name="ip">
             <children>
               #include <include/interface-arp-cache-timeout.xml.i>
-              <leafNode name="enable-proxy-arp">
-                <properties>
-                  <help>Enable proxy-arp on this interface</help>
-                  <valueless/>
-                </properties>
-              </leafNode>
+              #include <include/interface-enable-proxy-arp.xml.i>
               <leafNode name="proxy-arp-pvlan">
                 <properties>
                   <help>Enable private VLAN proxy ARP on this interface</help>
diff --git a/interface-definitions/interfaces-geneve.xml.in b/interface-definitions/interfaces-geneve.xml.in
index ae5b3c59f..0a866143e 100644
--- a/interface-definitions/interfaces-geneve.xml.in
+++ b/interface-definitions/interfaces-geneve.xml.in
@@ -25,12 +25,7 @@
             </properties>
             <children>
               #include <include/interface-arp-cache-timeout.xml.i>
-              <leafNode name="enable-proxy-arp">
-                <properties>
-                  <help>Enable proxy-arp on this interface</help>
-                  <valueless/>
-                </properties>
-              </leafNode>
+              #include <include/interface-enable-proxy-arp.xml.i>
             </children>
           </node>
           #include <include/interface-mtu-1450-9000.xml.i>
diff --git a/interface-definitions/interfaces-vxlan.xml.in b/interface-definitions/interfaces-vxlan.xml.in
index a78b46023..f6b5cadac 100644
--- a/interface-definitions/interfaces-vxlan.xml.in
+++ b/interface-definitions/interfaces-vxlan.xml.in
@@ -34,12 +34,7 @@
           <node name="ip">
             <children>
               #include <include/interface-arp-cache-timeout.xml.i>
-              <leafNode name="enable-proxy-arp">
-                <properties>
-                  <help>Enable proxy-arp on this interface</help>
-                  <valueless/>
-                </properties>
-              </leafNode>
+              #include <include/interface-enable-proxy-arp.xml.i>
             </children>
           </node>
           <leafNode name="link">
-- 
cgit v1.2.3