[feature] OpenWrt: added support for Wifi6/802.11ax #199

Closes #199

Author: tkaefer

docs/source/backends/openwrt.rst

@@ -1350,13 +1350,13 @@ Radio object extensions
 In addition to the default *NetJSON Radio object options*, the ``OpenWrt`` backend
 also requires setting the following additional options for each radio in the list:
 
-+--------------+---------+-----------------------------------------------+
-| key name     | type    | allowed values                                |
-+==============+=========+===============================================+
-| ``driver``   | string  | mac80211, atheros, ath5k, ath9k, broadcom     |
-+--------------+---------+-----------------------------------------------+
-| ``protocol`` | string  | 802.11a, 802.11b, 802.11g, 802.11n, 802.11ac  |
-+--------------+---------+-----------------------------------------------+
++--------------+---------+---------------------------------------------------------+
+| key name     | type    | allowed values                                          |
++==============+=========+=========================================================+
+| ``driver``   | string  | mac80211, atheros, ath5k, ath9k, broadcom               |
++--------------+---------+---------------------------------------------------------+
+| ``protocol`` | string  | 802.11a, 802.11b, 802.11g, 802.11n, 802.11ac, 802.11ax  |
++--------------+---------+---------------------------------------------------------+
 
 Radio example
 ~~~~~~~~~~~~~
@@ -1417,7 +1417,7 @@ Automatic channel selection example
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 If you need to use the "automatic channel selection" feature of OpenWRT, you must set
-the channel to ``0`` and, unless you are using neither **802.11n** nor **802.11ac**,
+the channel to ``0`` and, unless you are using neither **802.11n** nor **802.11ac** nor **802.11ax**,
 you must set the ``hwmode`` property to tell OpenWRT which band to use
 (11g for 2.4 Ghz, 11a for 5 GHz).
 
@@ -1498,6 +1498,38 @@ UCI output::
             option phy 'phy0'
             option type 'mac80211'
 
+802.11ax example
+~~~~~~~~~~~~~~~~
+
+In the following example we show how to configure an *802.11ax* capable radio:
+
+.. code-block:: python
+
+    {
+        "radios": [
+            {
+                "name": "radio0",
+                "phy": "phy0",
+                "driver": "mac80211",
+                "protocol": "802.11ax",
+                "channel": 36,
+                "channel_width": 80,
+            }
+        ]
+    }
+
+UCI output::
+
+    package wireless
+
+    config wifi-device 'radio0'
+            option channel '36'
+            option htmode 'HE80'
+            option hwmode '11a'
+            option phy 'phy0'
+            option type 'mac80211'
+
+
 Static Routes
 -------------
 

netjsonconfig/backends/openwrt/converters/radios.py

@@ -66,6 +66,8 @@ def __intermediate_htmode(self, radio):
             return 'HT{0}'.format(channel_width)
         elif protocol == '802.11ac':
             return 'VHT{0}'.format(channel_width)
+        elif protocol == '802.11ax':
+            return 'HE{0}'.format(channel_width)
         # disables n
         return 'NONE'
 
@@ -98,6 +100,8 @@ def __netjson_protocol(self, radio):
             return '802.11n'
         elif htmode.startswith('VHT'):
             return '802.11ac'
+        elif htmode.startswith('HE'):
+            return '802.11ax'
         return '802.{0}'.format(hwmode)
 
     def __netjson_channel(self, radio):
@@ -118,7 +122,7 @@ def __netjson_channel_width(self, radio):
         htmode = radio.pop('htmode')
         if htmode == 'NONE':
             return 20
-        channel_width = htmode.replace('VHT', '').replace('HT', '')
+        channel_width = htmode.replace('VHT', '').replace('HT', '').replace('HE', '')
         # we need to override htmode
         if '+' in channel_width or '-' in channel_width:
             radio['htmode'] = htmode

netjsonconfig/schema.py

@@ -744,6 +744,9 @@
         "radio_ac_channel_width": {
             "properties": {"channel_width": {"enum": [20, 40, 80, 160]}}
         },
+        "radio_ax_channel_width": {
+            "properties": {"channel_width": {"enum": [20, 40, 80, 160]}}
+        },
         "radio_80211bg_settings": {
             "title": "802.11b/g (2.4 GHz legacy)",
             "allOf": [
@@ -798,6 +801,34 @@
                 {"$ref": "#/definitions/radio_ac_channel_width"},
             ],
         },
+        "radio_80211ax_2ghz_settings": {
+            "title": "802.11AX (2.4 GHz AX)",
+            "allOf": [
+                {
+                    "properties": {
+                        "protocol": {"enum": ["802.11ax"]},
+                        "hwmode": {"enum": ["11g"]},
+                    }
+                },
+                {"$ref": "#/definitions/base_radio_settings"},
+                {"$ref": "#/definitions/radio_2ghz_channels"},
+                {"$ref": "#/definitions/radio_ax_channel_width"},
+            ],
+        },
+        "radio_80211ax_5ghz_settings": {
+            "title": "802.11ax (5 GHz AX)",
+            "allOf": [
+                {
+                    "properties": {
+                        "protocol": {"enum": ["802.11ax"]},
+                        "hwmode": {"enum": ["11a"]},
+                    }
+                },
+                {"$ref": "#/definitions/base_radio_settings"},
+                {"$ref": "#/definitions/radio_5ghz_channels"},
+                {"$ref": "#/definitions/radio_ax_channel_width"},
+            ],
+        },
     },
     "properties": {
         "general": {
@@ -856,6 +887,8 @@
                     {"$ref": "#/definitions/radio_80211an_settings"},
                     {"$ref": "#/definitions/radio_80211ac_2ghz_settings"},
                     {"$ref": "#/definitions/radio_80211ac_5ghz_settings"},
+                    {"$ref": "#/definitions/radio_80211ax_2ghz_settings"},
+                    {"$ref": "#/definitions/radio_80211ax_5ghz_settings"},
                     {"$ref": "#/definitions/radio_80211bg_settings"},
                     {"$ref": "#/definitions/radio_80211a_settings"},
                 ],

tests/openwrt/test_radio.py

@@ -530,6 +530,92 @@ def test_auto_80211ac_5ghz_channel(self):
         )
         self.assertEqual(o.render(), expected)
 
+    def test_parse_auto_80211ax_5ghz_channel(self):
+        native = self._tabs(
+            """package wireless
+
+config wifi-device 'radio0'
+    option channel 'auto'
+    option htmode 'HE20'
+    option hwmode '11a'
+    option phy 'phy0'
+    option type 'mac80211'
+"""
+        )
+        expected = {
+            "radios": [
+                {
+                    "name": "radio0",
+                    "phy": "phy0",
+                    "driver": "mac80211",
+                    "protocol": "802.11ax",
+                    "channel": 0,
+                    "channel_width": 20,
+                    "hwmode": "11a",
+                }
+            ]
+        }
+        o = OpenWrt(native=native)
+        self.assertEqual(o.config, expected)
+
+    def test_auto_80211ax_2ghz_channel(self):
+        o = OpenWrt(
+            {
+                "radios": [
+                    {
+                        "name": "radio0",
+                        "phy": "phy0",
+                        "driver": "mac80211",
+                        "protocol": "802.11ax",
+                        "channel": 0,
+                        "channel_width": 80,
+                        "hwmode": "11g",
+                    }
+                ]
+            }
+        )
+        expected = self._tabs(
+            """package wireless
+
+config wifi-device 'radio0'
+    option channel 'auto'
+    option htmode 'HE80'
+    option hwmode '11g'
+    option phy 'phy0'
+    option type 'mac80211'
+"""
+        )
+        self.assertEqual(o.render(), expected)
+
+    def test_auto_80211ax_5ghz_channel(self):
+        o = OpenWrt(
+            {
+                "radios": [
+                    {
+                        "name": "radio0",
+                        "phy": "phy0",
+                        "driver": "mac80211",
+                        "protocol": "802.11ax",
+                        "channel": 0,
+                        "channel_width": 160,
+                        "hwmode": "11a",
+                    }
+                ]
+            }
+        )
+        expected = self._tabs(
+            """package wireless
+
+config wifi-device 'radio0'
+    option channel 'auto'
+    option htmode 'HE160'
+    option hwmode '11a'
+    option phy 'phy0'
+    option type 'mac80211'
+"""
+        )
+        self.assertEqual(o.render(), expected)
+
     def test_auto_80211g_channel(self):
         o = OpenWrt(
             {