Merge ~dirksu/plainbox-provider-resource:check_wifi6e into plainbox-provider-resource:master

[Dirk Su]

Add 802.11ax 6GHz band check

[StanleyHuang (stanley31)]

You have to call system.exit or raise SystemExit in python script, or this job would always return ax_6g is supported

https://docs.python.org/3/library/sys.html#sys.exit

review: Needs Fixing

[Sylvain Pineau (sylvain-pineau)]

I'd simplify a bit the python code:

#!/usr/bin/env python3
# -*- coding: utf-8 -*-

import re
import subprocess
import sys

def main():
    if len(sys.argv) < 2:
        sys.exit(1)

    _6ghz_start = 5945
    _6ghz_end = 7125

    data = subprocess.getoutput(
        "iw phy{} info".format(sys.argv[1])).splitlines()
    check = False
    for line in data:
        if 'Frequencies' in line:
            check = True
            continue
        if check:
            if 'disabled' in line:
                continue
            match = re.search('^\s+\*\s+(\d{4})\s+MHz', line)
            if match:
                freq = int(match.group(1))
                if freq > _6ghz_start and freq < _6ghz_end:
                    sys.exit(0)
            else:
                check = False
    sys.exit(1)

if __name__ == '__main__':
    main()

review: Needs Fixing

[Sylvain Pineau (sylvain-pineau)]

to work the script that I propose requires the job definition to be modified like this:

for i in $(iw dev | grep -oP 'Interface\s+\K\w+'); do check_wifi6e.py $(iw dev "$i" info | grep -oP 'wiphy\s+\K\d+') && echo "$i""_ax_6GHz: supported" || echo "$i""_ax_6GHz: unsupported"; done

review: Needs Fixing

Unmerged commits

f1e433a... by Dirk Su on 2022-03-10

Add 802.11ax 6GHz band check

diff --git a/bin/check_wifi6e.py b/bin/check_wifi6e.py
 new file mode 100755
index 0000000..79650e9
--- /dev/null
+++ b/bin/check_wifi6e.py
@@ -0,0 +1,37 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+import subprocess
+import sys
+
+
+def main():
+    if len(sys.argv) < 2:
+        print(sys.argv[0] + " [interface]")
+        sys.exit(1)
+
+    _6ghz_start = 5945
+    _6ghz_end = 7125
+
+    data = subprocess.run(
+            ['iw', sys.argv[1], 'info'],
+            capture_output=True,
+            encoding='utf-8')
+    if data.returncode:
+        print(sys.argv[1] + " is not valid wireless interface")
+        sys.exit(1)
+    index = data.stdout[data.stdout.find('wiphy') + 6]
+    data = subprocess.getoutput("iw phy" + index + " info").splitlines()
+    for i, line in enumerate(data):
+        if 'Frequencies' in line:
+            while data[i + 1].startswith('\t\t\t'):
+                if 'disabled' not in (data[i + 1]):
+                    freq = int(data[i + 1].split()[1])
+                    if freq > _6ghz_start and freq < _6ghz_end:
+                        sys.exit(0)
+                i = i + 1
+    sys.exit(1)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/jobs/resource.pxu b/jobs/resource.pxu
index b84432e..da969eb 100644
--- a/jobs/resource.pxu
+++ b/jobs/resource.pxu
@@ -276,6 +276,7 @@ command:
  # MCS 10 and 11 if present support the ax only 1024-QAM 
  # shellcheck disable=SC2046
  for i in $(iw dev | grep -oP 'Interface\s+\K\w+'); do iw phy phy$(iw dev "$i" info | grep -oP 'wiphy\s+\K\d+') info | grep -q 'MCS 0-11' && echo "$i""_ax: supported" || echo "$i""_ax: unsupported"; done
+ for i in $(iw dev | grep -oP 'Interface\s+\K\w+'); do check_wifi6e.py $i && echo "$i""_ax_6GHz: supported" || echo "$i""_ax_6GHz: unsupported"; done
 estimated_duration: 0.5
 flags: preserve-locale