T1843: use include files for interface MAC address

7 files changed, 19 insertions, 84 deletions

diff --git a/interface-definitions/include/interface-mac.xml.i b/interface-definitions/include/interface-mac.xml.i
new file mode 100644
index 000000000..7b2456236
--- /dev/null
+++ b/interface-definitions/include/interface-mac.xml.i
@@ -0,0 +1,12 @@
+<leafNode name="mac">
+  <properties>
+    <help>Media Access Control (MAC) address</help>
+    <valueHelp>
+      <format>h:h:h:h:h:h</format>
+      <description>Hardware (MAC) address</description>
+    </valueHelp>
+    <constraint>
+      <validator name="mac-address"/>
+    </constraint>
+  </properties>
+</leafNode>
diff --git a/interface-definitions/include/vif-s.xml.i b/interface-definitions/include/vif-s.xml.i
index b73a5cdbc..3cb28d7e0 100644
--- a/interface-definitions/include/vif-s.xml.i
+++ b/interface-definitions/include/vif-s.xml.i
@@ -37,18 +37,7 @@
         <constraintErrorMessage>Ethertype must be 0x88A8 or 0x8100</constraintErrorMessage>

       </properties>

     </leafNode>

-    <leafNode name="mac">

-      <properties>

-        <help>Media Access Control (MAC) address</help>

-        <valueHelp>

-          <format>h:h:h:h:h:h</format>

-          <description>Hardware (MAC) address</description>

-        </valueHelp>

-        <constraint>

-          <validator name="mac-address"/>

-        </constraint>

-      </properties>

-    </leafNode>

+    #include <include/interface-mac.xml.i>

     <leafNode name="mtu">

       <properties>

         <help>Maximum Transmission Unit (MTU)</help>

@@ -81,18 +70,7 @@
           </properties>

         </leafNode>

         #include <include/interface-disable.xml.i>

-        <leafNode name="mac">

-          <properties>

-            <help>Media Access Control (MAC) address</help>

-            <valueHelp>

-              <format>h:h:h:h:h:h</format>

-              <description>Hardware (MAC) address</description>

-            </valueHelp>

-            <constraint>

-              <validator name="mac-address"/>

-            </constraint>

-          </properties>

-        </leafNode>

+        #include <include/interface-mac.xml.i>

         <leafNode name="mtu">

           <properties>

             <help>Maximum Transmission Unit (MTU)</help>

diff --git a/interface-definitions/include/vif.xml.i b/interface-definitions/include/vif.xml.i
index 642ed31f3..954803319 100644
--- a/interface-definitions/include/vif.xml.i
+++ b/interface-definitions/include/vif.xml.i
@@ -74,18 +74,7 @@
         </leafNode>
       </children>
     </node>
-    <leafNode name="mac">
-      <properties>
-        <help>Media Access Control (MAC) address</help>
-        <valueHelp>
-          <format>h:h:h:h:h:h</format>
-          <description>Hardware (MAC) address</description>
-        </valueHelp>
-        <constraint>
-          <validator name="mac-address"/>
-        </constraint>
-      </properties>
-    </leafNode>
+    #include <include/interface-mac.xml.i>
     <leafNode name="mtu">
       <properties>
         <help>Maximum Transmission Unit (MTU)</help>
diff --git a/interface-definitions/interfaces-bonding.xml.in b/interface-definitions/interfaces-bonding.xml.in
index 13295f899..c36001d5d 100644
--- a/interface-definitions/interfaces-bonding.xml.in
+++ b/interface-definitions/interfaces-bonding.xml.in
@@ -111,18 +111,7 @@
               </leafNode>
             </children>
           </node>
-          <leafNode name="mac">
-            <properties>
-              <help>Media Access Control (MAC) address</help>
-              <valueHelp>
-                <format>h:h:h:h:h:h</format>
-                <description>Hardware (MAC) address</description>
-              </valueHelp>
-              <constraint>
-                <validator name="mac-address"/>
-              </constraint>
-            </properties>
-          </leafNode>
+          #include <include/interface-mac.xml.i>
           <leafNode name="mode">
             <properties>
               <help>Bonding mode</help>
diff --git a/interface-definitions/interfaces-bridge.xml.in b/interface-definitions/interfaces-bridge.xml.in
index bb96db625..abaddf5f1 100644
--- a/interface-definitions/interfaces-bridge.xml.in
+++ b/interface-definitions/interfaces-bridge.xml.in
@@ -98,18 +98,7 @@
               </leafNode>
             </children>
           </node>
-          <leafNode name="mac">
-            <properties>
-              <help>Media Access Control (MAC) address</help>
-              <valueHelp>
-                <format>h:h:h:h:h:h</format>
-                <description>Hardware (MAC) address</description>
-              </valueHelp>
-              <constraint>
-                <validator name="mac-address"/>
-              </constraint>
-            </properties>
-          </leafNode>
+          #include <include/interface-mac.xml.i>
           <leafNode name="max-age">
             <properties>
               <help>Interval at which neighbor bridges are removed</help>
diff --git a/interface-definitions/interfaces-ethernet.xml.in b/interface-definitions/interfaces-ethernet.xml.in
index 800588232..dec2619ee 100644
--- a/interface-definitions/interfaces-ethernet.xml.in
+++ b/interface-definitions/interfaces-ethernet.xml.in
@@ -101,18 +101,7 @@
               </leafNode>
             </children>
           </node>
-          <leafNode name="mac">
-            <properties>
-              <help>Media Access Control (MAC) address</help>
-              <valueHelp>
-                <format>h:h:h:h:h:h</format>
-                <description>Hardware (MAC) address</description>
-              </valueHelp>
-              <constraint>
-                <validator name="mac-address"/>
-              </constraint>
-            </properties>
-          </leafNode>
+          #include <include/interface-mac.xml.i>
           <leafNode name="mtu">
             <properties>
               <help>Maximum Transmission Unit (MTU)</help>
diff --git a/interface-definitions/interfaces-wireless.xml.in b/interface-definitions/interfaces-wireless.xml.in
index 4e8c9a932..5f77b78b2 100644
--- a/interface-definitions/interfaces-wireless.xml.in
+++ b/interface-definitions/interfaces-wireless.xml.in
@@ -483,18 +483,7 @@
               <valueless/>
             </properties>
           </leafNode>
-          <leafNode name="mac">
-            <properties>
-              <help>Media Access Control (MAC) address</help>
-              <valueHelp>
-                <format>h:h:h:h:h:h</format>
-                <description>Hardware (MAC) address</description>
-              </valueHelp>
-              <constraint>
-                <validator name="mac-address"/>
-              </constraint>
-            </properties>
-          </leafNode>
+          #include <include/interface-mac.xml.i>
           <leafNode name="max-stations">
             <properties>
               <help>Maximum number of wireless radio stations. Excess stations will be rejected upon authentication request.</help>