Fix usage of mac address patterns in schema.py to allow using variabl…

…es (Closes openwisp#238)
lpalgarvio · Jun 20, 2022 · 05b361a · 05b361a
1 parent 6db272c
commit 05b361a
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/netjsonconfig/schema.py b/netjsonconfig/schema.py
@@ -8,8 +8,11 @@
 
 DEFAULT_FILE_MODE = '0644'
 X509_FILE_MODE = '0600'
+BLANK_PATTERN = '(\s)'
+VAR_PATTERN = '([{]{2}.*[}]{2})'
 MAC_PATTERN = '([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})'
-MAC_PATTERN_BLANK = '^({0}|)$'.format(MAC_PATTERN)
+MAC_VAR_PATTERN = '^({0}|)$'.format(MAC_PATTERN + '|' + VAR_PATTERN)
+MAC_VAR_BLANK_PATTERN = '^({0}|)$'.format(MAC_PATTERN + '|' + VAR_PATTERN + '|' + BLANK_PATTERN)
 
 schema = {
     "$schema": "http://json-schema.org/draft-04/schema#",
@@ -140,8 +143,7 @@
                     "type": "string",
                     "title": "MAC address",
                     "description": "if specified overrides default macaddress for this interface",
-                    "pattern": MAC_PATTERN_BLANK,  # can be empty
-                    "maxLength": 17,
+                    "pattern": MAC_VAR_BLANK_PATTERN,  # can be empty
                     "propertyOrder": 3,
                 },
                 "autostart": {
@@ -318,8 +320,7 @@
                 "bssid": {
                     "type": "string",
                     "title": "BSSID",
-                    "pattern": MAC_PATTERN_BLANK,
-                    "maxLength": 17,
+                    "pattern": MAC_VAR_BLANK_PATTERN,  # can be empty
                     "propertyOrder": 4,
                 },
             }
@@ -846,7 +847,7 @@
                     "required": ["bssid"],
                     "properties": {
                         "mode": {"enum": ["adhoc"]},
-                        "bssid": {"pattern": MAC_PATTERN, "minLength": 17},
+                        "bssid": {"pattern": MAC_VAR_PATTERN},
                     },
                 },
                 {"$ref": "#/definitions/base_wireless_settings"},