[schema] Added pattern for BSSID attribute

openwisp · Mar 24, 2016 · 26b62dd · 26b62dd
1 parent 468a5df
commit 26b62dd
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 0 deletions.
diff --git a/netjsonconfig/schema.py b/netjsonconfig/schema.py
@@ -331,6 +331,7 @@
                 "bssid": {
                     "type": "string",
                     "title": "BSSID",
+                    "pattern": "^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$",
                     "minLength": 17,
                     "maxLength": 17,
                     "propertyOrder": 4,

diff --git a/tests/openwrt/test_wireless.py b/tests/openwrt/test_wireless.py
@@ -1130,3 +1130,35 @@ def test_mesh_80211s(self):
     option network 'lan'
 """)
         self.assertEqual(o.render(), expected)
+
+    def test_bssid_format(self):
+        o = OpenWrt({
+            "interfaces": [
+                {
+                    "name": "wlan0",
+                    "type": "wireless",
+                    "wireless": {
+                        "radio": "radio1",
+                        "mode": "adhoc",
+                        "ssid": "adhoc-ssid",
+                        "bssid": "00:11:22:33:44:55"
+                    }
+                }
+            ]
+        })
+        o.validate()
+        # too short
+        o.config['interfaces'][0]['wireless']['bssid'] = '00:11:22:33:44'
+        with self.assertRaises(ValidationError):
+            o.validate()
+        # valid
+        o.config['interfaces'][0]['wireless']['bssid'] = '00-11-22-33-44-55'
+        o.validate()
+        # should not be valid
+        o.config['interfaces'][0]['wireless']['bssid'] = '00:11:22:33:44:ZY'
+        with self.assertRaises(ValidationError):
+            o.validate()
+        # empty is not valid
+        o.config['interfaces'][0]['wireless']['bssid'] = ''
+        with self.assertRaises(ValidationError):
+            o.validate()