[OpenWrt] Allow overriding htmode option

openwisp · Apr 1, 2016 · 45159e8 · 45159e8
1 parent 361ffe1
commit 45159e8
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 0 deletions.
diff --git a/netjsonconfig/backends/openwrt/renderers.py b/netjsonconfig/backends/openwrt/renderers.py
@@ -298,6 +298,9 @@ def __get_htmode(self, radio):
         """
         only for mac80211 driver
         """
+        # allow overriding htmode
+        if 'htmode' in radio:
+            return radio['htmode']
         if radio['protocol'] == '802.11n':
             return 'HT{0}'.format(radio['channel_width'])
         elif radio['protocol'] == '802.11ac':

diff --git a/tests/openwrt/test_wireless.py b/tests/openwrt/test_wireless.py
@@ -1441,5 +1441,30 @@ def test_macaddr_override(self):
     option mode 'ap'
     option network 'wlan0'
     option ssid 'open'
+""")
+        self.assertEqual(o.render(), expected)
+
+    def test_htmode_override(self):
+        o = OpenWrt({
+            "radios": [
+                {
+                    "name": "radio0",
+                    "phy": "phy0",
+                    "driver": "mac80211",
+                    "protocol": "802.11n",
+                    "channel": 140,
+                    "channel_width": 40,
+                    "htmode": "HT40+"
+                },
+            ]
+        })
+        expected = self._tabs("""package wireless
+
+config wifi-device 'radio0'
+    option channel '140'
+    option htmode 'HT40+'
+    option hwmode '11a'
+    option phy 'phy0'
+    option type 'mac80211'
 """)
         self.assertEqual(o.render(), expected)