[feature] Added htmode to wireless interface stats #117

Closes #117

Author: Aryamanz29

openwisp-monitoring/files/sbin/netjson-monitoring.lua

@@ -77,6 +77,7 @@ for _, radio in pairs(wireless_status) do
     local name = interface.ifname
     local is_mesh = false
     local clients = nil
+    local htmode = radio.config.htmode
     if name and not monitoring.utils.is_excluded(name) then
       local iwinfo = ubus:call('iwinfo', 'info', {device = name})
       local netjson_interface = {
@@ -90,7 +91,8 @@ for _, radio in pairs(wireless_status) do
           tx_power = iwinfo.txpower,
           signal = iwinfo.signal,
           noise = iwinfo.noise,
-          country = iwinfo.country
+          country = iwinfo.country,
+          htmode = htmode
         }
       }
       if iwinfo.mode == 'Ad-Hoc' or iwinfo.mode == 'Mesh Point' then

openwisp-monitoring/tests/test_wifi.lua

@@ -1,10 +1,10 @@
 package.path = package.path ..
                  ";../files/lib/openwisp-monitoring/?.lua;../files/sbin/?.lua"
 
-local cjson = require('cjson')
-local wifi_data = require('test_files/wireless_data')
+local cjson = require("cjson")
 local luaunit = require('luaunit')
 local wifi_functions = require('wifi')
+local wifi_data = require('test_files/wireless_data')
 
 TestWifi = {setUp = function() end, tearDown = function() end}
 
@@ -134,4 +134,17 @@ function TestNetJSON.test_wifi_interfaces_stats_include()
   luaunit.assertEquals(netjson["interfaces"][5]["statistics"]["tx_errors"], 0)
 end
 
+function TestNetJSON.test_wifi_interfaces_stats_include_htmode()
+  local netjson_file = assert(loadfile('../files/sbin/netjson-monitoring.lua'))
+  local netjson = cjson.decode(netjson_file('wlan0 wlan1 mesh1'))
+  luaunit.assertEquals(netjson["interfaces"][1]["name"], "mesh1")
+  luaunit.assertEquals(netjson["interfaces"][1]["wireless"]["htmode"], "VHT80")
+  luaunit.assertEquals(netjson["interfaces"][3]["name"], "wlan1")
+  luaunit.assertEquals(netjson["interfaces"][3]["wireless"]["htmode"], "VHT80")
+  luaunit.assertEquals(netjson["interfaces"][4]["name"], "mesh0")
+  luaunit.assertEquals(netjson["interfaces"][4]["wireless"]["htmode"], "HT20")
+  luaunit.assertEquals(netjson["interfaces"][5]["name"], "wlan0")
+  luaunit.assertEquals(netjson["interfaces"][5]["wireless"]["htmode"], "HT20")
+end
+
 os.exit(luaunit.LuaUnit.run())