From 9b116825b44ca1611976e0807f9bf22a38ca6812 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Fri, 6 Dec 2019 17:58:56 +0100
Subject: T1843: use include files to disable interface (admin down)

---
 interface-definitions/include/interface-disable.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-dummy.xml.in         |  7 +------
 interface-definitions/interfaces-ethernet.xml.in      |  7 +------
 interface-definitions/interfaces-geneve.xml.in        |  7 +------
 interface-definitions/interfaces-openvpn.xml.in       |  7 +------
 interface-definitions/interfaces-vxlan.xml.in         |  7 +------
 interface-definitions/interfaces-wireguard.xml.in     |  7 +------
 interface-definitions/interfaces-wireless.xml.in      |  7 +------
 12 files changed, 18 insertions(+), 72 deletions(-)
 create mode 100644 interface-definitions/include/interface-disable.xml.i

(limited to 'interface-definitions')

diff --git a/interface-definitions/include/interface-disable.xml.i b/interface-definitions/include/interface-disable.xml.i
new file mode 100644
index 000000000..c6c24f867
--- /dev/null
+++ b/interface-definitions/include/interface-disable.xml.i
@@ -0,0 +1,6 @@
+<leafNode name="disable">
+  <properties>
+    <help>Set interface to Administratively down</help>
+    <valueless/>
+  </properties>
+</leafNode>
diff --git a/interface-definitions/include/vif-s.xml.i b/interface-definitions/include/vif-s.xml.i
index ffb9de24a..b73a5cdbc 100644
--- a/interface-definitions/include/vif-s.xml.i
+++ b/interface-definitions/include/vif-s.xml.i
@@ -16,12 +16,7 @@
         <valueless/>
       </properties>
     </leafNode>
-    <leafNode name="disable">
-      <properties>
-        <help>Disable this bridge interface</help>
-        <valueless/>
-      </properties>
-    </leafNode>
+    #include <include/interface-disable.xml.i>
     <leafNode name="ethertype">
       <properties>
         <help>Set Ethertype</help>
@@ -85,12 +80,7 @@
             <valueless/>
           </properties>
         </leafNode>
-        <leafNode name="disable">
-          <properties>
-            <help>Disable this bridge interface</help>
-            <valueless/>
-          </properties>
-        </leafNode>
+        #include <include/interface-disable.xml.i>
         <leafNode name="mac">
           <properties>
             <help>Media Access Control (MAC) address</help>
diff --git a/interface-definitions/include/vif.xml.i b/interface-definitions/include/vif.xml.i
index d9b5cfe34..642ed31f3 100644
--- a/interface-definitions/include/vif.xml.i
+++ b/interface-definitions/include/vif.xml.i
@@ -20,12 +20,7 @@
         <valueless/>
       </properties>
     </leafNode>
-    <leafNode name="disable">
-      <properties>
-        <help>Disable this bridge interface</help>
-        <valueless/>
-      </properties>
-    </leafNode>
+    #include <include/interface-disable.xml.i>
     <leafNode name="egress-qos">
       <properties>
         <help>VLAN egress QoS</help>
diff --git a/interface-definitions/interfaces-bonding.xml.in b/interface-definitions/interfaces-bonding.xml.in
index 6a82ddd91..13295f899 100644
--- a/interface-definitions/interfaces-bonding.xml.in
+++ b/interface-definitions/interfaces-bonding.xml.in
@@ -57,12 +57,7 @@
               <valueless/>
             </properties>
           </leafNode>
-          <leafNode name="disable">
-            <properties>
-              <help>Disable this bridge interface</help>
-              <valueless/>
-            </properties>
-          </leafNode>
+          #include <include/interface-disable.xml.i>
           <leafNode name="hash-policy">
             <properties>
               <help>Bonding transmit hash policy</help>
diff --git a/interface-definitions/interfaces-bridge.xml.in b/interface-definitions/interfaces-bridge.xml.in
index 8bac2f244..bb96db625 100644
--- a/interface-definitions/interfaces-bridge.xml.in
+++ b/interface-definitions/interfaces-bridge.xml.in
@@ -41,12 +41,7 @@
               <valueless/>
             </properties>
           </leafNode>
-          <leafNode name="disable">
-            <properties>
-              <help>Disable this bridge interface</help>
-              <valueless/>
-            </properties>
-          </leafNode>
+          #include <include/interface-disable.xml.i>
           <leafNode name="forwarding-delay">
             <properties>
               <help>Forwarding delay</help>
diff --git a/interface-definitions/interfaces-dummy.xml.in b/interface-definitions/interfaces-dummy.xml.in
index db1afd803..445f6b2d4 100644
--- a/interface-definitions/interfaces-dummy.xml.in
+++ b/interface-definitions/interfaces-dummy.xml.in
@@ -18,12 +18,7 @@
         <children>
           #include <include/address-ipv4-ipv6.xml.i>
           #include <include/interface-description.xml.i>
-          <leafNode name="disable">
-            <properties>
-              <help>Disable interface</help>
-              <valueless/>
-            </properties>
-          </leafNode>
+          #include <include/interface-disable.xml.i>
         </children>
       </tagNode>
     </children>
diff --git a/interface-definitions/interfaces-ethernet.xml.in b/interface-definitions/interfaces-ethernet.xml.in
index 293c147d8..800588232 100644
--- a/interface-definitions/interfaces-ethernet.xml.in
+++ b/interface-definitions/interfaces-ethernet.xml.in
@@ -35,12 +35,7 @@
               <valueless/>
             </properties>
           </leafNode>
-          <leafNode name="disable">
-            <properties>
-              <help>Disable this bridge interface</help>
-              <valueless/>
-            </properties>
-          </leafNode>
+          #include <include/interface-disable.xml.i>
           <leafNode name="duplex">
             <properties>
               <help>Duplex mode</help>
diff --git a/interface-definitions/interfaces-geneve.xml.in b/interface-definitions/interfaces-geneve.xml.in
index 3fbafd2ec..146c40152 100644
--- a/interface-definitions/interfaces-geneve.xml.in
+++ b/interface-definitions/interfaces-geneve.xml.in
@@ -18,12 +18,7 @@
         <children>
           #include <include/address-ipv4-ipv6.xml.i>
           #include <include/interface-description.xml.i>
-          <leafNode name="disable">
-            <properties>
-              <help>Disable interface</help>
-              <valueless/>
-            </properties>
-          </leafNode>
+          #include <include/interface-disable.xml.i>
           <node name="ip">
             <properties>
               <help>IPv4 routing parameters</help>
diff --git a/interface-definitions/interfaces-openvpn.xml.in b/interface-definitions/interfaces-openvpn.xml.in
index d08dba78a..638e9048b 100644
--- a/interface-definitions/interfaces-openvpn.xml.in
+++ b/interface-definitions/interfaces-openvpn.xml.in
@@ -53,12 +53,7 @@
               </constraint>
             </properties>
           </leafNode>
-          <leafNode name="disable">
-            <properties>
-              <help>Disable interface</help>
-              <valueless/>
-            </properties>
-          </leafNode>
+          #include <include/interface-disable.xml.i>
           <node name="encryption">
             <properties>
               <help>Data Encryption settings</help>
diff --git a/interface-definitions/interfaces-vxlan.xml.in b/interface-definitions/interfaces-vxlan.xml.in
index 9434c2f5a..5be7125ce 100644
--- a/interface-definitions/interfaces-vxlan.xml.in
+++ b/interface-definitions/interfaces-vxlan.xml.in
@@ -18,12 +18,7 @@
         <children>
           #include <include/address-ipv4-ipv6.xml.i>
           #include <include/interface-description.xml.i>
-          <leafNode name="disable">
-            <properties>
-              <help>Disable interface</help>
-              <valueless/>
-            </properties>
-          </leafNode>
+          #include <include/interface-disable.xml.i>
           <leafNode name="group">
             <properties>
               <help>Multicast group address for VXLAN interface</help>
diff --git a/interface-definitions/interfaces-wireguard.xml.in b/interface-definitions/interfaces-wireguard.xml.in
index ef0b643bb..6be0292a1 100644
--- a/interface-definitions/interfaces-wireguard.xml.in
+++ b/interface-definitions/interfaces-wireguard.xml.in
@@ -19,12 +19,7 @@
         <children>
           #include <include/address-ipv4-ipv6.xml.i>
           #include <include/interface-description.xml.i>
-          <leafNode name="disable">
-            <properties>
-              <help>disables interface</help>
-              <valueless/>
-            </properties>
-          </leafNode>
+          #include <include/interface-disable.xml.i>
           <leafNode name="port">
             <properties>
               <help>Local port number to accept connections</help>
diff --git a/interface-definitions/interfaces-wireless.xml.in b/interface-definitions/interfaces-wireless.xml.in
index 65ad14228..4e8c9a932 100644
--- a/interface-definitions/interfaces-wireless.xml.in
+++ b/interface-definitions/interfaces-wireless.xml.in
@@ -458,12 +458,7 @@
               <valueless/>
             </properties>
           </leafNode>
-          <leafNode name="disable">
-            <properties>
-              <help>Disable this bridge interface</help>
-              <valueless/>
-            </properties>
-          </leafNode>
+          #include <include/interface-disable.xml.i>
           <leafNode name="expunge-failing-stations">
             <properties>
               <help>Disassociate stations based on excessive transmission failures</help>
-- 
cgit v1.2.3