[schema] Cleanup

openwisp · Apr 1, 2016 · 5d8e4c7 · 5d8e4c7
1 parent 43db6b6
commit 5d8e4c7
Showing 1 changed file with 9 additions and 13 deletions.
diff --git a/netjsonconfig/schema.py b/netjsonconfig/schema.py
@@ -250,12 +250,7 @@
                             "default": False,
                             "format": "checkbox",
                             "propertyOrder": 4,
-                        }
-                    }
-                },
-                {"$ref": "#/definitions/interface_settings"},
-                {
-                    "properties": {
+                        },
                         "bridge_members": {
                             "type": "array",
                             "title": "Bridge Members",
@@ -268,7 +263,8 @@
                             }
                         }
                     }
-                }
+                },
+                {"$ref": "#/definitions/interface_settings"},
             ]
         },
         "base_wireless_settings": {
@@ -556,53 +552,53 @@
         "radio_80211bg_settings": {
             "title": "802.11b/g (2.4 GHz legacy)",
             "allOf": [
-                {"$ref": "#/definitions/base_radio_settings"},
                 {"properties": {"protocol": {"enum": ["802.11b", "802.11g"]}}},
+                {"$ref": "#/definitions/base_radio_settings"},
                 {"$ref": "#/definitions/radio_2ghz_channels"},
                 {"$ref": "#/definitions/radio_legacy_channel_width"}
             ]
         },
         "radio_80211a_settings": {
             "title": "802.11a (5 GHz legacy)",
             "allOf": [
-                {"$ref": "#/definitions/base_radio_settings"},
                 {"properties": {"protocol": {"enum": ["802.11a"]}}},
+                {"$ref": "#/definitions/base_radio_settings"},
                 {"$ref": "#/definitions/radio_5ghz_channels"},
                 {"$ref": "#/definitions/radio_legacy_channel_width"}
             ]
         },
         "radio_80211gn_settings": {
             "title": "802.11n (2.4 GHz N)",
             "allOf": [
+                {"properties": {"protocol": {"enum": ["802.11n"]}}},
                 {"$ref": "#/definitions/base_radio_settings"},
                 {"$ref": "#/definitions/radio_2ghz_channels"},
                 {"$ref": "#/definitions/radio_n_channel_width"},
-                {"properties": {"protocol": {"enum": ["802.11n"]}}},
             ]
         },
         "radio_80211an_settings": {
             "title": "802.11n (5 GHz N)",
             "allOf": [
-                {"$ref": "#/definitions/base_radio_settings"},
                 {"properties": {"protocol": {"enum": ["802.11n"]}}},
+                {"$ref": "#/definitions/base_radio_settings"},
                 {"$ref": "#/definitions/radio_5ghz_channels"},
                 {"$ref": "#/definitions/radio_n_channel_width"},
             ]
         },
         "radio_80211ac_2ghz_settings": {
             "title": "802.11ac (2.4 GHz AC)",
             "allOf": [
-                {"$ref": "#/definitions/base_radio_settings"},
                 {"properties": {"protocol": {"enum": ["802.11ac"]}}},
+                {"$ref": "#/definitions/base_radio_settings"},
                 {"$ref": "#/definitions/radio_2ghz_channels"},
                 {"$ref": "#/definitions/radio_ac_channel_width"},
             ]
         },
         "radio_80211ac_5ghz_settings": {
             "title": "802.11ac (5 GHz AC)",
             "allOf": [
-                {"$ref": "#/definitions/base_radio_settings"},
                 {"properties": {"protocol": {"enum": ["802.11ac"]}}},
+                {"$ref": "#/definitions/base_radio_settings"},
                 {"$ref": "#/definitions/radio_5ghz_channels"},
                 {"$ref": "#/definitions/radio_ac_channel_width"},
             ]