[schema] Added regexp pattern for interface mac address

openwisp · Mar 24, 2016 · 4679282 · 4679282
1 parent de98ae6
commit 4679282
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 3 deletions.
diff --git a/netjsonconfig/schema.py b/netjsonconfig/schema.py
@@ -141,9 +141,8 @@
                 },
                 "mac": {
                     "type": "string",
-                    "title": "mac address",
-                    "minLength": 17,
-                    "maxLength": 17,
+                    "title": "override mac-address",
+                    "pattern": "^(([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})|)$",  # can be empty
                     "propertyOrder": 2,
                 },
                 "mtu": {

diff --git a/tests/openwrt/test_network.py b/tests/openwrt/test_network.py
@@ -848,3 +848,29 @@ def test_empty_dns(self):
     option proto 'none'
 """)
         self.assertEqual(o.render(), expected)
+
+    def test_mac_address_format(self):
+        o = OpenWrt({
+            "interfaces": [
+                {
+                    "name": "eth0",
+                    "type": "ethernet",
+                    "mac": "00:11:22:33:44:55"
+                }
+            ]
+        })
+        o.validate()
+        # too short
+        o.config['interfaces'][0]['mac'] = '00:11:22:33:44'
+        with self.assertRaises(ValidationError):
+            o.validate()
+        # valid
+        o.config['interfaces'][0]['mac'] = '00-11-22-33-44-55'
+        o.validate()
+        # should not be valid
+        o.config['interfaces'][0]['mac'] = '00:11:22:33:44:ZY'
+        with self.assertRaises(ValidationError):
+            o.validate()
+        # empty is valid (will be ignored)
+        o.config['interfaces'][0]['mac'] = ''
+        o.validate()