From 0c9499c5b3f7cc053c1f29ecf28d679c1a3156e2 Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Fri, 5 Jul 2024 08:47:54 +0200
Subject: wireless: T6496: use mac-address validator on BSSID and move it up
 one CLI level

---
 interface-definitions/interfaces_wireless.xml.in | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to 'interface-definitions/interfaces_wireless.xml.in')

diff --git a/interface-definitions/interfaces_wireless.xml.in b/interface-definitions/interfaces_wireless.xml.in
index 0f52812db..fdcb79b19 100644
--- a/interface-definitions/interfaces_wireless.xml.in
+++ b/interface-definitions/interfaces_wireless.xml.in
@@ -723,15 +723,6 @@
               <help>Wireless security settings</help>
             </properties>
             <children>
-              <leafNode name="bssid">
-                <properties>
-                  <help>Basic Service Set Identifier (BSSID)</help>
-                  <constraint>
-                    <regex>([0-9a-fA-F]{2}:){5}[0-9a-fA-F]{2}</regex>
-                  </constraint>
-                  <constraintErrorMessage>Invalid BSSID</constraintErrorMessage>
-                </properties>
-              </leafNode>
               <node name="station-address">
                 <properties>
                   <help>Station MAC address based authentication</help>
@@ -950,6 +941,19 @@
               <constraintErrorMessage>Invalid SSID</constraintErrorMessage>
             </properties>
           </leafNode>
+          <leafNode name="bssid">
+            <properties>
+              <help>Basic Service Set Identifier (BSSID) - currently station mode only</help>
+              <valueHelp>
+                <format>macaddr</format>
+                <description>BSSID (MAC) address</description>
+              </valueHelp>
+              <constraint>
+                <validator name="mac-address"/>
+              </constraint>
+              <constraintErrorMessage>Invalid BSSID</constraintErrorMessage>
+            </properties>
+          </leafNode>
           <leafNode name="type">
             <properties>
               <help>Wireless device type for this interface</help>
-- 
cgit v1.2.3