From ece3796409b33c4255285ee872550e21edb4a9ba Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 23 Jan 2021 14:26:00 +0100
Subject: xml: use "macaddr" key over individual "h:h:h:h:h:h" notation

(cherry picked from commit 8926edf6b64adc550ee2f6bee9a78a43d46a2053)
---
 interface-definitions/arp.xml.in                    | 2 +-
 interface-definitions/dhcp-server.xml.in            | 2 +-
 interface-definitions/include/interface-hw-id.xml.i | 4 ++--
 interface-definitions/include/interface-mac.xml.i   | 2 +-
 interface-definitions/service_ipoe-server.xml.in    | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/interface-definitions/arp.xml.in b/interface-definitions/arp.xml.in
index b72f025a8..082afe00f 100644
--- a/interface-definitions/arp.xml.in
+++ b/interface-definitions/arp.xml.in
@@ -20,7 +20,7 @@
                 <properties>
                   <help>mac address to translate to</help>
                   <valueHelp>
-                    <format>h:h:h:h:h:h</format>
+                    <format>macaddr</format>
                     <description>Hardware (MAC) address</description>
                   </valueHelp>
                   <constraint>
diff --git a/interface-definitions/dhcp-server.xml.in b/interface-definitions/dhcp-server.xml.in
index aba2bea8a..28b61e92d 100644
--- a/interface-definitions/dhcp-server.xml.in
+++ b/interface-definitions/dhcp-server.xml.in
@@ -337,7 +337,7 @@
                         <properties>
                           <help>Media Access Control (MAC) address</help>
                           <valueHelp>
-                            <format>h:h:h:h:h:h</format>
+                            <format>macaddr</format>
                             <description>Hardware (MAC) address</description>
                           </valueHelp>
                           <constraint>
diff --git a/interface-definitions/include/interface-hw-id.xml.i b/interface-definitions/include/interface-hw-id.xml.i
index af58fae3c..55ef55add 100644
--- a/interface-definitions/include/interface-hw-id.xml.i
+++ b/interface-definitions/include/interface-hw-id.xml.i
@@ -3,8 +3,8 @@
   <properties>
     <help>Associate Ethernet Interface with given Media Access Control (MAC) address</help>
     <valueHelp>
-      <format>h:h:h:h:h:h</format>
-      <description>Hardware Media Access Control (MAC) address</description>
+      <format>macaddr</format>
+      <description>Hardware (MAC) address</description>
     </valueHelp>
     <constraint>
       <validator name="mac-address"/>
diff --git a/interface-definitions/include/interface-mac.xml.i b/interface-definitions/include/interface-mac.xml.i
index e277de85c..87dc5fb60 100644
--- a/interface-definitions/include/interface-mac.xml.i
+++ b/interface-definitions/include/interface-mac.xml.i
@@ -3,7 +3,7 @@
   <properties>
     <help>Media Access Control (MAC) address</help>
     <valueHelp>
-      <format>h:h:h:h:h:h</format>
+      <format>macaddr</format>
       <description>Hardware (MAC) address</description>
     </valueHelp>
     <constraint>
diff --git a/interface-definitions/service_ipoe-server.xml.in b/interface-definitions/service_ipoe-server.xml.in
index 07241fcc2..c54de58f5 100644
--- a/interface-definitions/service_ipoe-server.xml.in
+++ b/interface-definitions/service_ipoe-server.xml.in
@@ -153,7 +153,7 @@
                     <properties>
                       <help>Client mac address allowed to receive an IP address</help>
                       <valueHelp>
-                        <format>h:h:h:h:h:h</format>
+                        <format>macaddr</format>
                         <description>Hardware (MAC) address</description>
                       </valueHelp>
                       <constraint>
-- 
cgit v1.2.3