[schema] Made bssid not required for wireless stations #94

It's still required for adhoc interfaces.

Fixes #94 and closes #95

Author: nemesifier

netjsonconfig/schema.py

@@ -7,6 +7,8 @@
 from .countries import countries
 
 DEFAULT_FILE_MODE = '0644'
+MAC_PATTERN = '([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})'
+MAC_PATTERN_BLANK = '^({0}|)$'.format(MAC_PATTERN)
 
 schema = {
     "$schema": "http://json-schema.org/draft-04/schema#",
@@ -157,7 +159,7 @@
                     "type": "string",
                     "title": "MAC address",
                     "description": "if specified overrides default macaddress for this interface",
-                    "pattern": "^(([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})|)$",  # can be empty
+                    "pattern": MAC_PATTERN_BLANK,  # can be empty
                     "maxLength": 17,
                     "propertyOrder": 3,
                 },
@@ -348,13 +350,11 @@
             }
         },
         "bssid_wireless_property": {
-            "required": ["bssid"],
             "properties": {
                 "bssid": {
                     "type": "string",
                     "title": "BSSID",
-                    "pattern": "^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$",
-                    "minLength": 17,
+                    "pattern": MAC_PATTERN_BLANK,
                     "maxLength": 17,
                     "propertyOrder": 4,
                 },
@@ -715,7 +715,16 @@
         "adhoc_wireless_settings": {
             "title": "Adhoc",
             "allOf": [
-                {"properties": {"mode": {"enum": ["adhoc"]}}},
+                {
+                    "required": ["bssid"],
+                    "properties": {
+                        "mode": {"enum": ["adhoc"]},
+                        "bssid": {
+                            "pattern": MAC_PATTERN,
+                            "minLength": 17,
+                        }
+                    }
+                },
                 {"$ref": "#/definitions/base_wireless_settings"},
                 {"$ref": "#/definitions/ssid_wireless_property"},
                 {"$ref": "#/definitions/bssid_wireless_property"},

tests/openwrt/test_wireless.py

@@ -813,21 +813,23 @@ def test_parse_mesh_80211s(self):
         o = OpenWrt(native=self._80211s_uci)
         self.assertEqual(o.config, self._80211s_netjson)
 
-    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"
-                    }
+    _bssid_netjson = {
+        "interfaces": [
+            {
+                "name": "wlan0",
+                "type": "wireless",
+                "wireless": {
+                    "radio": "radio0",
+                    "mode": "adhoc",
+                    "ssid": "bssid-test",
+                    "bssid": "00:11:22:33:44:55"
                 }
-            ]
-        })
+            }
+        ]
+    }
+
+    def test_bssid_format(self):
+        o = OpenWrt(self._bssid_netjson)
         o.validate()
         # too short
         o.config['interfaces'][0]['wireless']['bssid'] = '00:11:22:33:44'
@@ -840,11 +842,29 @@ def test_bssid_format(self):
         o.config['interfaces'][0]['wireless']['bssid'] = '00:11:22:33:44:ZY'
         with self.assertRaises(ValidationError):
             o.validate()
+
+    def test_bssid_adhoc(self):
+        o = OpenWrt(self._bssid_netjson)
+        # bssid is required
+        del o.config['interfaces'][0]['wireless']['bssid']
+        with self.assertRaises(ValidationError):
+            o.validate()
         # empty is not valid
         o.config['interfaces'][0]['wireless']['bssid'] = ''
         with self.assertRaises(ValidationError):
             o.validate()
 
+    def test_bssid_station(self):
+        o = OpenWrt(self._bssid_netjson)
+        o.config['interfaces'][0]['wireless']['mode'] = 'station'
+        o.validate()
+        # bssid is not required
+        del o.config['interfaces'][0]['wireless']['bssid']
+        o.validate()
+        # empty is valid
+        o.config['interfaces'][0]['wireless']['bssid'] = ''
+        o.validate()
+
     _list_option_netjson = {
         "interfaces": [
             {