[airos] added channel width support for radio interfaces, updated tests

Author: edoput

netjsonconfig/backends/airos/radio.py

@@ -54,16 +54,30 @@
 }
 
 
+def channel_to_mode(channel):
+    """
+    Returns the ``ieee_mode`` value from the channel width
+    """
+    mapping = {
+        10: '11acvht20',
+        20: '11acvht20',
+        40: '11acvht40',
+        60: '11acvht40',
+        80: '11acvht80',
+    }
+    return mapping[channel]
+
+
 def access_point(radio):
     """
     Return the configuration for a radio device whose wireless
     interface is in ``access_point`` mode
     """
-    base = _radio_device_base.copy()
+    base = radio_device_base.copy()
     base.update({
         'devname': radio['name'],
-        'chanbw': 80,
-        'ieee_mode': '11acvht80',
+        'chanbw': radio['channel_width'],
+        'ieee_mode': channel_to_mode(radio['channel_width']),
         'mode': 'master',
     })
     return base
@@ -74,9 +88,10 @@ def station(radio):
     Return the configuration for a radio device whose wireless
     interface is in ``station`` mode
     """
-    base = _radio_device_base.copy()
+    base = radio_device_base.copy()
     base.update({
         'devname': radio['name'],
+        'chanbw': radio['channel_width'],
         'txpower': radio.get('tx_power', 24),
     })
     return base
@@ -87,6 +102,7 @@ def station(radio):
     'station': station,
 }
 
+
 __all__ = [
     radio_available_mode,
     radio_configuration,

tests/airos/test_radio.py

@@ -63,7 +63,88 @@ def test_active_radio(self):
                 '1.atpc.threshold': 36,
                 '1.cable.loss': 0,
                 '1.center.1.freq': 0,
-                '1.chanbw': 0,
+                '1.chanbw': 20,
+                '1.cmsbias': 0,
+                '1.countrycode': 380,
+                '1.cwm.enable': 0,
+                '1.cwm.mode': 1,
+                '1.devname': 'ath0',
+                '1.dfs.status': 'enabled',
+                '1.freq': 0,
+                '1.ieee_mode': 'auto',
+                '1.low_txpower_mode': 'disabled',
+                '1.mode': 'managed',
+                '1.obey': 'enabled',
+                '1.polling': 'enabled',
+                '1.polling_11ac_11n_compat': 0,
+                '1.polling_ff_dl_ratio': 50,
+                '1.polling_ff_dur': 0,
+                '1.polling_ff_timing': 0,
+                '1.pollingnoack': 0,
+                '1.pollingpri': 2,
+                '1.ptpmode': 1,
+                '1.reg_obey': 'enabled',
+                '1.rx_sensitivity': -96,
+                '1.scan_list.status': 'disabled',
+                '1.scanbw.status': 'disabled',
+                '1.status': 'enabled',
+                '1.subsystemid': 0xe7f5,
+                '1.txpower': 24,
+            },
+            {
+                'countrycode': 380,
+                'status': 'enabled',
+            }
+        ]
+
+        self.assertEqualConfig(o.intermediate_data['radio'], expected)
+
+
+    def test_channel_width(self):
+        """
+        TODO: channel brandwidth tested only on 802.11ac
+        """
+        o = self.backend({
+            "interfaces": [
+                {
+                    'type': 'wireless',
+                    'name': 'wlan0',
+                    'wireless': {
+                        'radio': 'ath0',
+                        'mode': 'station',
+                        'ssid': 'ubnt',
+                        'bssid': '00:11:22:33:44:55',
+                        'encryption': {
+                            'protocol': 'none',
+                        },
+                    },
+                },
+            ],
+            "radios": [
+                {
+                    'name': 'ath0',
+                    'channel': 1,
+                    'channel_width': 80,
+                    'protocol': '802.11ac',
+                }
+            ]
+        })
+        o.to_intermediate()
+        expected = [
+            {
+                '1.ack.auto': 'enabled',
+                '1.ackdistance': 643,
+                '1.acktimeout': 35,
+                '1.ampdu.frames': 32,
+                '1.ampdu.status': 'enabled',
+                '1.antenna.gain': 3,
+                '1.antenna.id': 2,
+                '1.atpc.sta.status': 'enabled',
+                '1.atpc.status': 'disabled',
+                '1.atpc.threshold': 36,
+                '1.cable.loss': 0,
+                '1.center.1.freq': 0,
+                '1.chanbw': 80,
                 '1.cmsbias': 0,
                 '1.countrycode': 380,
                 '1.cwm.enable': 0,
@@ -148,15 +229,15 @@ def test_active_radio(self):
                 '1.atpc.threshold': 36,
                 '1.cable.loss': 0,
                 '1.center.1.freq': 0,
-                '1.chanbw': 80,
+                '1.chanbw': 20,
                 '1.cmsbias': 0,
                 '1.countrycode': 380,
                 '1.cwm.enable': 0,
                 '1.cwm.mode': 1,
                 '1.devname': 'ath0',
                 '1.dfs.status': 'enabled',
                 '1.freq': 0,
-                '1.ieee_mode': '11acvht80',
+                '1.ieee_mode': '11acvht20',
                 '1.low_txpower_mode': 'disabled',
                 '1.mode': 'master',
                 '1.obey': 'enabled',