Add parser to parse wifi interface name which is not start with phy (BugFix)

.github/workflows/tox-provider-resource.yaml

@@ -47,6 +47,10 @@ jobs:
           python-version: ${{ matrix.python }}
         env:
           PIP_TRUSTED_HOST: pypi.python.org pypi.org files.pythonhosted.org
+      - name: Install libsystemd-dev
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libsystemd-dev
       - name: Install tox
         run: pip install tox
       - name: Run tox

providers/base/units/wireless/nm-hotspot.pxu

@@ -15,7 +15,7 @@ category_id: wifi_ap
 estimated_duration: 10
 flags: preserve-locale also-after-suspend
 requires:
- wifi_interface_mode.{{ interface }}_AP == 'supported'
+ ( wifi_interface_mode.interface == '{{ interface }}' and wifi_interface_mode.AP == 'supported' )
  net_if_management.device == '{{ interface }}' and net_if_management.master_mode_managed_by == 'NetworkManager'
  {%- if __on_ubuntucore__ %}
  connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager'
@@ -39,7 +39,7 @@ category_id: wifi_ap
 estimated_duration: 10
 flags: preserve-locale also-after-suspend
 requires:
- wifi_interface_mode.{{ interface }}_AP == 'supported'
+ ( wifi_interface_mode.interface == '{{ interface }}' and wifi_interface_mode.AP == 'supported' )
  net_if_management.device == '{{ interface }}' and net_if_management.master_mode_managed_by == 'NetworkManager'
  {%- if __on_ubuntucore__ %}
  connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager'

providers/base/units/wireless/wifi-ap.pxu

@@ -8,7 +8,7 @@ category_id: wifi_ap
 _summary: Create open 802.11a Wi-Fi AP on {interface} with no STA (Manual)
 plugin: manual
 requires:
- wifi_interface_mode.{interface}_AP == 'supported'
+ ( wifi_interface_mode.interface == '{interface}' and wifi_interface_mode.AP == 'supported' )
  net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 estimated_duration: 120.0
 _purpose:
@@ -65,7 +65,7 @@ command:
     exit 1;
  fi
 requires:
- wifi_interface_mode.{interface}_AP == 'supported'
+ ( wifi_interface_mode.interface == '{interface}' and wifi_interface_mode.AP == 'supported' )
  net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 estimated_duration: 120.0
 environ: WIFI_AP_SETUPTIME
@@ -81,7 +81,7 @@ category_id: wifi_ap
 _summary: Create open 802.11b Wi-Fi AP on {interface} with no STA (Manual)
 plugin: manual
 requires:
- wifi_interface_mode.{interface}_AP == 'supported'
+ ( wifi_interface_mode.interface == '{interface}' and wifi_interface_mode.AP == 'supported' )
  net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 estimated_duration: 120.0
 _purpose:
@@ -138,7 +138,7 @@ command:
     exit 1;
  fi
 requires:
- wifi_interface_mode.{interface}_AP == 'supported'
+ ( wifi_interface_mode.interface == '{interface}' and wifi_interface_mode.AP == 'supported' )
  net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 estimated_duration: 120.0
 environ: WIFI_AP_SETUPTIME
@@ -154,7 +154,7 @@ category_id: wifi_ap
 _summary: Create open 802.11g Wi-Fi AP on {interface} with no STA (Manual)
 plugin: manual
 requires:
- wifi_interface_mode.{interface}_AP == 'supported'
+ ( wifi_interface_mode.interface == '{interface}' and wifi_interface_mode.AP == 'supported' )
  net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 estimated_duration: 120.0
 _purpose:
@@ -211,7 +211,7 @@ command:
     exit 1;
  fi
 requires:
- wifi_interface_mode.{interface}_AP == 'supported'
+ ( wifi_interface_mode.interface == '{interface}' and wifi_interface_mode.AP == 'supported' )
  net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 estimated_duration: 120.0
 environ: WIFI_AP_SETUPTIME
@@ -227,7 +227,7 @@ category_id: wifi_ap
 _summary: Create open 802.11ad Wi-Fi AP on {interface} with no STA (Manual)
 plugin: manual
 requires:
- wifi_interface_mode.{interface}_AP == 'supported'
+ ( wifi_interface_mode.interface == '{interface}' and wifi_interface_mode.AP == 'supported' )
  net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 estimated_duration: 120.0
 _purpose:
@@ -284,7 +284,7 @@ command:
     exit 1;
  fi
 requires:
- wifi_interface_mode.{interface}_AP == 'supported'
+ ( wifi_interface_mode.interface == '{interface}' and wifi_interface_mode.AP == 'supported' )
  net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 estimated_duration: 120.0
 environ: WIFI_AP_SETUPTIME
@@ -300,7 +300,7 @@ category_id: wifi_ap
 _summary: Create WPA2 802.11a Wi-Fi AP on {interface} with no STA (Manual)
 plugin: manual
 requires:
- wifi_interface_mode.{interface}_AP == 'supported'
+ ( wifi_interface_mode.interface == '{interface}' and wifi_interface_mode.AP == 'supported' )
  net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 estimated_duration: 120.0
 _purpose:
@@ -359,7 +359,7 @@ command:
     exit 1;
  fi
 requires:
- wifi_interface_mode.{interface}_AP == 'supported'
+ ( wifi_interface_mode.interface == '{interface}' and wifi_interface_mode.AP == 'supported' )
  net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 estimated_duration: 120.0
 environ: WIFI_AP_SETUPTIME
@@ -375,7 +375,7 @@ category_id: wifi_ap
 _summary: Create WPA2 802.11b Wi-Fi AP on {interface} with no STA (Manual)
 plugin: manual
 requires:
- wifi_interface_mode.{interface}_AP == 'supported'
+ ( wifi_interface_mode.interface == '{interface}' and wifi_interface_mode.AP == 'supported' )
  net_if_management.device == '{{ interface }}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 estimated_duration: 120.0
 _purpose:
@@ -434,7 +434,7 @@ command:
     exit 1;
  fi
 requires:
- wifi_interface_mode.{interface}_AP == 'supported'
+ ( wifi_interface_mode.interface == '{interface}' and wifi_interface_mode.AP == 'supported' )
  net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 estimated_duration: 120.0
 environ: WIFI_AP_SETUPTIME
@@ -450,7 +450,7 @@ category_id: wifi_ap
 _summary: Create WPA2 802.11g Wi-Fi AP on {interface} with no STA (Manual)
 plugin: manual
 requires:
- wifi_interface_mode.{interface}_AP == 'supported'
+ ( wifi_interface_mode.interface == '{interface}' and wifi_interface_mode.AP == 'supported' )
  net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 estimated_duration: 120.0
 _purpose:
@@ -507,7 +507,7 @@ command:
     exit 1;
  fi
 requires:
- wifi_interface_mode.{interface}_AP == 'supported'
+ ( wifi_interface_mode.interface == '{interface}' and wifi_interface_mode.AP == 'supported' )
  net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 estimated_duration: 120.0
 environ: WIFI_AP_SETUPTIME
@@ -523,7 +523,7 @@ category_id: wifi_ap
 _summary: Create WPA2 802.11ad Wi-Fi AP on {interface} with no STA (Manual)
 plugin: manual
 requires:
- wifi_interface_mode.{interface}_AP == 'supported'
+ ( wifi_interface_mode.interface == '{interface}' and wifi_interface_mode.AP == 'supported' )
  net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 estimated_duration: 120.0
 _purpose:
@@ -582,7 +582,7 @@ command:
     exit 1;
  fi
 requires:
- wifi_interface_mode.{interface}_AP == 'supported'
+ ( wifi_interface_mode.interface == '{interface}' and wifi_interface_mode.AP == 'supported' )
  net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 estimated_duration: 120.0
 environ: WIFI_AP_SETUPTIME
@@ -598,7 +598,7 @@ category_id: wifi_ap
 _summary: Create WPA2 802.11a Wi-Fi AP on {interface} with active STA (Manual)
 plugin: user-interact-verify
 requires:
- wifi_interface_mode.{interface}_AP == 'supported'
+ ( wifi_interface_mode.interface == '{interface}' and wifi_interface_mode.AP == 'supported' )
  net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 estimated_duration: 120.0
 environ: LD_LIBRARY_PATH OPEN_BG_SSID
@@ -637,7 +637,7 @@ category_id: wifi_ap
 _summary: Create WPA2 802.11a Wi-Fi Access Point on {interface} with active STA
 plugin: shell
 requires:
- wifi_interface_mode.{interface}_AP == 'supported'
+ ( wifi_interface_mode.interface == '{interface}' and wifi_interface_mode.AP == 'supported' )
  net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 estimated_duration: 120.0
 environ: LD_LIBRARY_PATH OPEN_BG_SSID WIFI_AP_SETUPTIME
@@ -686,7 +686,7 @@ category_id: wifi_ap
 _summary: Create WPA2 802.11b Wi-Fi AP on {interface} with active STA (Manual)
 plugin: user-interact-verify
 requires:
- wifi_interface_mode.{interface}_AP == 'supported'
+ ( wifi_interface_mode.interface == '{interface}' and wifi_interface_mode.AP == 'supported' )
  net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 estimated_duration: 120.0
 environ: LD_LIBRARY_PATH OPEN_BG_SSID
@@ -725,7 +725,7 @@ category_id: wifi_ap
 _summary: Create a WPA2 802.11b Wi-Fi Access Point on {interface} with active STA
 plugin: shell
 requires:
- wifi_interface_mode.{interface}_AP == 'supported'
+ ( wifi_interface_mode.interface == '{interface}' and wifi_interface_mode.AP == 'supported' )
  net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 estimated_duration: 120.0
 environ: LD_LIBRARY_PATH OPEN_BG_SSID WIFI_AP_SETUPTIME
@@ -774,7 +774,7 @@ category_id: wifi_ap
 _summary: Create WPA2 802.11g Wi-Fi AP on {interface} with active STA (Manual)
 plugin: user-interact-verify
 requires:
- wifi_interface_mode.{interface}_AP == 'supported'
+ ( wifi_interface_mode.interface == '{interface}' and wifi_interface_mode.AP == 'supported' )
  net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 estimated_duration: 120.0
 environ: LD_LIBRARY_PATH OPEN_BG_SSID
@@ -813,7 +813,7 @@ category_id: wifi_ap
 _summary: Create WPA2 802.11g Wi-Fi Access Point on {interface} with active STA
 plugin: shell
 requires:
- wifi_interface_mode.{interface}_AP == 'supported'
+ ( wifi_interface_mode.interface == '{interface}' and wifi_interface_mode.AP == 'supported' )
  net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 estimated_duration: 120.0
 environ: LD_LIBRARY_PATH OPEN_BG_SSID WIFI_AP_SETUPTIME
@@ -862,7 +862,7 @@ category_id: wifi_ap
 _summary: Create WPA2 802.11ad Wi-Fi AP on {interface} with active STA (Manual)
 plugin: user-interact-verify
 requires:
- wifi_interface_mode.{interface}_AP == 'supported'
+ ( wifi_interface_mode.interface == '{interface}' and wifi_interface_mode.AP == 'supported' )
  net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 estimated_duration: 120.0
 environ: LD_LIBRARY_PATH OPEN_BG_SSID
@@ -901,7 +901,7 @@ category_id: wifi_ap
 _summary: Create WPA2 802.11ad Wi-Fi Access Point on {interface} with active STA
 plugin: shell
 requires:
- wifi_interface_mode.{interface}_AP == 'supported'
+ ( wifi_interface_mode.interface == '{interface}' and wifi_interface_mode.AP == 'supported' )
  net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 estimated_duration: 120.0
 environ: LD_LIBRARY_PATH OPEN_BG_SSID WIFI_AP_SETUPTIME
@@ -950,7 +950,7 @@ category_id: wifi_ap
 _summary: Create Access Point on {interface} using wifi-ap.setup-wizard
 plugin: shell
 requires:
- wifi_interface_mode.{interface}_AP == 'supported'
+ ( wifi_interface_mode.interface == '{interface}' and wifi_interface_mode.AP == 'supported' )
  net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 estimated_duration: 20.0
 user: root
@@ -998,7 +998,7 @@ command:
  echo "Rebooting"
  reboot
 requires:
- wifi_interface_mode.{interface}_AP == 'supported'
+ ( wifi_interface_mode.interface == '{interface}' and wifi_interface_mode.AP == 'supported' )
  net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 estimated_duration: 120.0
 environ: WIFI_AP_SETUPTIME
@@ -1035,7 +1035,7 @@ command:
  sleep "${{WIFI_AP_SETUPTIME:-10}}"
  reboot
 requires:
- wifi_interface_mode.{interface}_AP == 'supported'
+ ( wifi_interface_mode.interface == '{interface}' and wifi_interface_mode.AP == 'supported' )
  net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 estimated_duration: 120.0
 environ: WIFI_AP_SETUPTIME
@@ -1067,7 +1067,7 @@ command:
     exit 1;
  fi
 requires:
- wifi_interface_mode.{interface}_AP == 'supported'
+ ( wifi_interface_mode.interface == '{interface}' and wifi_interface_mode.AP == 'supported' )
  net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 depends: wireless/wifi_ap_across_reboot_{interface}_setup
 estimated_duration: 120.0
@@ -1093,7 +1093,7 @@ command:
  wifi-ap.config set disabled=true
  if [ "$RES" -eq 2 ]; then exit 0; else exit 1; fi
 requires:
- wifi_interface_mode.{interface}_AP == 'supported'
+ ( wifi_interface_mode.interface == '{interface}' and wifi_interface_mode.AP == 'supported' )
  net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 depends: wireless/wifi_ap_across_reboot_{interface}_setup_manual
 estimated_duration: 120.0

providers/resource/bin/wifi_interface_mode.py

@@ -0,0 +1,68 @@
+#!/usr/bin/env python3
+from subprocess import check_output
+import re
+from typing import List, Tuple, Dict
+
+
+def get_interfaces() -> List[Tuple[str, str]]:
+    output = check_output(["iw", "dev"], universal_newlines=True)
+    device_pattern = r"phy#(\d+).*?Interface (\S+)"
+    if output:
+        matches = re.findall(device_pattern, output, re.DOTALL)
+        return [
+            (device_id, interface_name)
+            for device_id, interface_name in matches
+        ]
+    raise SystemExit(0)
+
+
+def get_wiphy_info() -> Dict[int, List[str]]:
+    # We can not use command "iw phy0 info" to get the infomation of sepcific
+    # interface.
+    # Because of "phy0" in command could be other pattern like "mwiphy0".
+    # And such pattern as "mwiphy0" will only show in the output of command
+    # "iw phy".
+    output = check_output(["iw", "phy"], universal_newlines=True)
+    if not output:
+        return []
+
+    interfaces_info = (info.strip() for info in output.split("Wiphy"))
+    # drop empty sections
+    interfaces_info = filter(bool, interfaces_info)
+    index_re = re.compile(r"phy(\d+)")
+    wiphy_info = {}
+    supported_modes_re = re.compile(
+        r"Supported interface modes:\s*((?:\s*\*\s*[\w/-]+\s*)+)"
+    )
+    for interface_info in interfaces_info:
+        interface_id = index_re.search(interface_info).group(1)
+        match_modes = supported_modes_re.search(interface_info).group(1)
+
+        supported_modes = map(str.strip, match_modes.split("*"))
+        # remove first element because it is spaces before the first *
+        _ = next(supported_modes)
+        wiphy_info[interface_id] = list(supported_modes)
+    return wiphy_info
+
+
+def print_supported_modes() -> str:
+    interfaces = get_interfaces()
+    wiphy_info = get_wiphy_info()
+    for wiphy_index, modes in wiphy_info.items():
+        interface = interfaces[int(wiphy_index)][1]
+        print("interface: {}".format(interface))
+        for mode in modes:
+            print(
+                "{}: supported".format(
+                    mode.replace("-", "_").replace("/", "_")
+                )
+            )
+        print()
+
+
+def main():
+    print_supported_modes()
+
+
+if __name__ == "__main__":
+    main()

providers/resource/jobs/resource.pxu

@@ -372,12 +372,7 @@ estimated_duration: 0.1
 plugin: resource
 category_id: information_gathering
 command:
- # 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 -Pzo '(?s)Supported interface modes:\n\K(\s+\*\s.*?\n)+' |
- sed "s/.*\* \(.*\)/""$i""_\1: supported/" | tr -d '\000';
- done
+  wifi_interface_mode.py
 _summary: Create resource info for supported wifi interface modes
 
 id: snap