From 24c99947f4a7ca8b3519a69f8c61eba8af55d859 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Fri, 6 Dec 2019 18:12:22 +0100
Subject: T1843: use include files for interface link-detect feature

---
 .../include/interface-disable-link-detect.xml.i            |  6 ++++++
 interface-definitions/include/vif-s.xml.i                  | 14 ++------------
 interface-definitions/include/vif.xml.i                    |  7 +------
 interface-definitions/interfaces-bonding.xml.in            |  7 +------
 interface-definitions/interfaces-bridge.xml.in             |  7 +------
 interface-definitions/interfaces-ethernet.xml.in           |  7 +------
 interface-definitions/interfaces-wireless.xml.in           |  7 +------
 7 files changed, 13 insertions(+), 42 deletions(-)
 create mode 100644 interface-definitions/include/interface-disable-link-detect.xml.i

(limited to 'interface-definitions')

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..619cd03b0
--- /dev/null
+++ b/interface-definitions/include/interface-disable-link-detect.xml.i
@@ -0,0 +1,6 @@
+<leafNode name="disable-link-detect">
+  <properties>
+    <help>Ignore link state changes</help>
+    <valueless/>
+  </properties>
+</leafNode>
diff --git a/interface-definitions/include/vif-s.xml.i b/interface-definitions/include/vif-s.xml.i
index a109eed6b..772804f53 100644
--- a/interface-definitions/include/vif-s.xml.i
+++ b/interface-definitions/include/vif-s.xml.i
@@ -10,12 +10,7 @@
     #include <include/address-ipv4-ipv6-dhcp.xml.i>
     #include <include/interface-description.xml.i>
     #include <include/dhcp-dhcpv6-options.xml.i>
-    <leafNode name="disable-link-detect">
-      <properties>
-        <help>Ignore link state changes</help>
-        <valueless/>
-      </properties>
-    </leafNode>
+    #include <include/interface-disable-link-detect.xml.i>
     #include <include/interface-disable.xml.i>
     <leafNode name="ethertype">
       <properties>
@@ -51,12 +46,7 @@
         #include <include/address-ipv4-ipv6-dhcp.xml.i>
         #include <include/interface-description.xml.i>
         #include <include/dhcp-dhcpv6-options.xml.i>
-        <leafNode name="disable-link-detect">
-          <properties>
-            <help>Ignore link state changes</help>
-            <valueless/>
-          </properties>
-        </leafNode>
+        #include <include/interface-disable-link-detect.xml.i>
         #include <include/interface-disable.xml.i>
         #include <include/interface-mac.xml.i>
         #include <include/interface-mtu-68-9000.xml.i>
diff --git a/interface-definitions/include/vif.xml.i b/interface-definitions/include/vif.xml.i
index c74d7815e..597137828 100644
--- a/interface-definitions/include/vif.xml.i
+++ b/interface-definitions/include/vif.xml.i
@@ -14,12 +14,7 @@
     #include <include/address-ipv4-ipv6-dhcp.xml.i>
     #include <include/interface-description.xml.i>
     #include <include/dhcp-dhcpv6-options.xml.i>
-    <leafNode name="disable-link-detect">
-      <properties>
-        <help>Ignore link state changes</help>
-        <valueless/>
-      </properties>
-    </leafNode>
+    #include <include/interface-disable-link-detect.xml.i>
     #include <include/interface-disable.xml.i>
     <leafNode name="egress-qos">
       <properties>
diff --git a/interface-definitions/interfaces-bonding.xml.in b/interface-definitions/interfaces-bonding.xml.in
index 71d1672bb..97962fbec 100644
--- a/interface-definitions/interfaces-bonding.xml.in
+++ b/interface-definitions/interfaces-bonding.xml.in
@@ -51,12 +51,7 @@
           </node>
           #include <include/interface-description.xml.i>
           #include <include/dhcp-dhcpv6-options.xml.i>
-          <leafNode name="disable-link-detect">
-            <properties>
-              <help>Ignore link state changes</help>
-              <valueless/>
-            </properties>
-          </leafNode>
+          #include <include/interface-disable-link-detect.xml.i>
           #include <include/interface-disable.xml.i>
           <leafNode name="hash-policy">
             <properties>
diff --git a/interface-definitions/interfaces-bridge.xml.in b/interface-definitions/interfaces-bridge.xml.in
index abaddf5f1..12998e9ce 100644
--- a/interface-definitions/interfaces-bridge.xml.in
+++ b/interface-definitions/interfaces-bridge.xml.in
@@ -35,12 +35,7 @@
           </leafNode>
           #include <include/interface-description.xml.i>
           #include <include/dhcp-dhcpv6-options.xml.i>
-          <leafNode name="disable-link-detect">
-            <properties>
-              <help>Ignore link state changes</help>
-              <valueless/>
-            </properties>
-          </leafNode>
+          #include <include/interface-disable-link-detect.xml.i>
           #include <include/interface-disable.xml.i>
           <leafNode name="forwarding-delay">
             <properties>
diff --git a/interface-definitions/interfaces-ethernet.xml.in b/interface-definitions/interfaces-ethernet.xml.in
index 96f7a9454..f86bdf78f 100644
--- a/interface-definitions/interfaces-ethernet.xml.in
+++ b/interface-definitions/interfaces-ethernet.xml.in
@@ -29,12 +29,7 @@
               <valueless/>
             </properties>
           </leafNode>
-          <leafNode name="disable-link-detect">
-            <properties>
-              <help>Ignore link state changes</help>
-              <valueless/>
-            </properties>
-          </leafNode>
+          #include <include/interface-disable-link-detect.xml.i>
           #include <include/interface-disable.xml.i>
           <leafNode name="duplex">
             <properties>
diff --git a/interface-definitions/interfaces-wireless.xml.in b/interface-definitions/interfaces-wireless.xml.in
index 5f77b78b2..53c448930 100644
--- a/interface-definitions/interfaces-wireless.xml.in
+++ b/interface-definitions/interfaces-wireless.xml.in
@@ -452,12 +452,7 @@
               <help>Disable broadcast of SSID from access-point</help>
             </properties>
           </leafNode>
-          <leafNode name="disable-link-detect">
-            <properties>
-              <help>Ignore link state changes</help>
-              <valueless/>
-            </properties>
-          </leafNode>
+          #include <include/interface-disable-link-detect.xml.i>
           #include <include/interface-disable.xml.i>
           <leafNode name="expunge-failing-stations">
             <properties>
-- 
cgit v1.2.3