Updated main NetJSON schema #30

Updated DeviceConfiguration according to latest NetJSON spec. Closes #30.
openwisp · Nov 30, 2015 · 86ca33a · 86ca33a
1 parent e5597a0
commit 86ca33a
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 30 deletions.
diff --git a/netjsonconfig/schema.py b/netjsonconfig/schema.py
@@ -50,15 +50,17 @@
                         "type": "object",
                         "title": "Address",
                         "additionalProperties": True,
+                        "required": [
+                            "proto",
+                            "family"
+                        ],
                         "properties": {
-                            "address": {
-                                "type": "string"
-                            },
-                            "mask": {
-                                "type": "integer"
-                            },
-                            "gateway": {
-                                "type": "string"
+                            "proto": {
+                                "type": "string",
+                                "enum": [
+                                    "static",
+                                    "dhcp"
+                                ]
                             },
                             "family": {
                                 "type": "string",
@@ -67,12 +69,14 @@
                                     "ipv6"
                                 ]
                             },
-                            "proto": {
-                                "type": "string",
-                                "enum": [
-                                    "static",
-                                    "dhcp"
-                                ]
+                            "address": {
+                                "type": "string"
+                            },
+                            "mask": {
+                                "type": "integer"
+                            },
+                            "gateway": {
+                                "type": "string"
                             }
                         }
                     }
@@ -184,12 +188,15 @@
                                                 "wps"
                                             ]
                                         },
-                                        "ciphers": {
-                                            "type": "array"
-                                        },
                                         "key": {
                                             "type": "string"
                                         },
+                                        "ciphers": {
+                                            "type": "array",
+                                            "items": {
+                                                "type": "string"
+                                            }
+                                        },
                                         "disabled": {
                                             "type": "boolean",
                                             "default": False

diff --git a/tests/openwrt/test_network.py b/tests/openwrt/test_network.py
@@ -263,7 +263,8 @@ def test_additional_proto(self):
                     "type": "wireless",
                     "addresses": [
                         {
-                            "proto": "3g"
+                            "proto": "3g",
+                            "family": "ipv4"
                         }
                     ]
                 }
@@ -307,7 +308,8 @@ def test_interface_custom_attrs(self):
                     "empty": "",
                     "addresses": [
                         {
-                            "proto": "3g"
+                            "proto": "3g",
+                            "family": "ipv4"
                         }
                     ]
                 }
@@ -335,7 +337,8 @@ def test_simple_bridge(self):
                     "type": "ethernet",
                     "addresses": [
                         {
-                            "proto": "dhcp"
+                            "proto": "dhcp",
+                            "family": "ipv4"
                         }
                     ]
                 },
@@ -379,7 +382,8 @@ def test_eth_bridge(self):
                     "type": "ethernet",
                     "addresses": [
                         {
-                            "proto": "dhcp"
+                            "proto": "dhcp",
+                            "family": "ipv4"
                         }
                     ]
                 },

diff --git a/tests/openwrt/test_wireless.py b/tests/openwrt/test_wireless.py
@@ -252,7 +252,8 @@ def test_wifi_encryption_wep_open(self):
                     "type": "wireless",
                     "addresses": [
                         {
-                            "proto": "dhcp"
+                            "proto": "dhcp",
+                            "family": "ipv4"
                         }
                     ],
                     "wireless": {
@@ -295,7 +296,8 @@ def test_wifi_encryption_wep_shared(self):
                     "type": "wireless",
                     "addresses": [
                         {
-                            "proto": "dhcp"
+                            "proto": "dhcp",
+                            "family": "ipv4"
                         }
                     ],
                     "wireless": {
@@ -338,7 +340,8 @@ def test_wifi_encryption_wpa_personal(self):
                     "type": "wireless",
                     "addresses": [
                         {
-                            "proto": "dhcp"
+                            "proto": "dhcp",
+                            "family": "ipv4"
                         }
                     ],
                     "wireless": {
@@ -383,7 +386,8 @@ def test_wifi_encryption_wpa2_personal(self):
                     "type": "wireless",
                     "addresses": [
                         {
-                            "proto": "dhcp"
+                            "proto": "dhcp",
+                            "family": "ipv4"
                         }
                     ],
                     "wireless": {
@@ -429,7 +433,8 @@ def test_encryption_disabled(self):
                     "type": "wireless",
                     "addresses": [
                         {
-                            "proto": "dhcp"
+                            "proto": "dhcp",
+                            "family": "ipv4"
                         }
                     ],
                     "wireless": {
@@ -474,7 +479,8 @@ def test_multiple_wifi(self):
                     "type": "wireless",
                     "addresses": [
                         {
-                            "proto": "dhcp"
+                            "proto": "dhcp",
+                            "family": "ipv4"
                         }
                     ],
                     "wireless": {
@@ -496,7 +502,8 @@ def test_multiple_wifi(self):
                     "type": "wireless",
                     "addresses": [
                         {
-                            "proto": "dhcp"
+                            "proto": "dhcp",
+                            "family": "ipv4"
                         }
                     ],
                     "wireless": {
@@ -549,7 +556,8 @@ def test_wifi_bridge(self):
                     "type": "wireless",
                     "addresses": [
                         {
-                            "proto": "dhcp"
+                            "proto": "dhcp",
+                            "family": "ipv4"
                         }
                     ],
                     "wireless": {
@@ -615,7 +623,8 @@ def test_wifi_network(self):
                     "type": "wireless",
                     "addresses": [
                         {
-                            "proto": "dhcp"
+                            "proto": "dhcp",
+                            "family": "ipv4"
                         }
                     ],
                     "wireless": {