[chores] Adjustments to WiFi6 schema #199

Related to #199
openwisp · Feb 18, 2022 · a0a7e0c · a0a7e0c
1 parent f1a94f2
commit a0a7e0c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 deletions.
diff --git a/netjsonconfig/backends/openwrt/schema.py b/netjsonconfig/backends/openwrt/schema.py
@@ -471,6 +471,12 @@
             "radio_80211ac_5ghz_settings": {
                 "allOf": [{"$ref": "#/definitions/radio_hwmode_11a"}]
             },
+            "radio_80211ax_2ghz_settings": {
+                "allOf": [{"$ref": "#/definitions/radio_hwmode_11g"}]
+            },
+            "radio_80211ax_5ghz_settings": {
+                "allOf": [{"$ref": "#/definitions/radio_hwmode_11a"}]
+            },
         },
         "properties": {
             "general": {

diff --git a/netjsonconfig/schema.py b/netjsonconfig/schema.py
@@ -802,14 +802,9 @@
             ],
         },
         "radio_80211ax_2ghz_settings": {
-            "title": "802.11AX (2.4 GHz AX)",
+            "title": "802.11ax (2.4 GHz AX)",
             "allOf": [
-                {
-                    "properties": {
-                        "protocol": {"enum": ["802.11ax"]},
-                        "hwmode": {"enum": ["11g"]},
-                    }
-                },
+                {"properties": {"protocol": {"enum": ["802.11ax"]}}},
                 {"$ref": "#/definitions/base_radio_settings"},
                 {"$ref": "#/definitions/radio_2ghz_channels"},
                 {"$ref": "#/definitions/radio_ax_channel_width"},
@@ -818,12 +813,7 @@
         "radio_80211ax_5ghz_settings": {
             "title": "802.11ax (5 GHz AX)",
             "allOf": [
-                {
-                    "properties": {
-                        "protocol": {"enum": ["802.11ax"]},
-                        "hwmode": {"enum": ["11a"]},
-                    }
-                },
+                {"properties": {"protocol": {"enum": ["802.11ax"]}}},
                 {"$ref": "#/definitions/base_radio_settings"},
                 {"$ref": "#/definitions/radio_5ghz_channels"},
                 {"$ref": "#/definitions/radio_ax_channel_width"},