commit d4ee8ccbe2567a848be33817f3fbb2701a5fd980
author Paul Stewart <pstew@chromium.org> Mon Apr 20 20:27:03 2015 -0700
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Wed Apr 29 01:49:09 2015 +0000
tree e0e5d4b8753596239dd35b21ed03c03b3e2a5578
parent 64350bd4622e01b78d83ce4b9953b3f392cdb4e0

autotest: Report supported phy features in iw_runner

List the features listed as supported by iw in a new "features"
member of the IwPhy namedtuple.

BUG=chrome-os-partner:37850
TEST=wifi_matfunc for regressions

Change-Id: I8a74d48819c2646146f5cd03992c3df11acea5c3
Reviewed-on: https://chromium-review.googlesource.com/266598
Tested-by: Paul Stewart <pstew@chromium.org>
Reviewed-by: Christopher Wiley <wiley@chromium.org>
Commit-Queue: Paul Stewart <pstew@chromium.org>

client/common_lib/cros/network/iw_runner.py

diff --git a/client/common_lib/cros/network/iw_runner.py b/client/common_lib/cros/network/iw_runner.py
index d761bf1..16f252d 100644
--- a/client/common_lib/cros/network/iw_runner.py
+++ b/client/common_lib/cros/network/iw_runner.py
@@ -40,12 +40,14 @@
 #   name: string name of the phy, such as "phy0"
 #   bands: list of IwBand objects.
 #   modes: List of strings containing interface modes supported, such as "AP".
-#   command: List of strings containing nl80211 commands supported, such as
+#   commands: List of strings containing nl80211 commands supported, such as
 #          "authenticate".
+#   features: List of strings containing nl80211 features supported, such as
+#          "T-DLS".
 #   max_scan_ssids: Maximum number of SSIDs which can be scanned at once.
 IwPhy = collections.namedtuple(
-    'Phy', ['name', 'bands', 'modes', 'commands', 'max_scan_ssids',
-            'avail_tx_antennas', 'avail_rx_antennas',
+    'Phy', ['name', 'bands', 'modes', 'commands', 'features',
+            'max_scan_ssids', 'avail_tx_antennas', 'avail_rx_antennas',
             'supports_setting_antenna_mask', 'support_vht'])
 
 DEFAULT_COMMAND_IW = 'iw'
@@ -305,6 +307,7 @@
                             bands,
                             tuple(pending_phy_modes),
                             tuple(pending_phy_commands),
+                            tuple(pending_phy_features),
                             pending_phy_max_scan_ssids,
                             pending_phy_tx_antennas,
                             pending_phy_rx_antennas,
@@ -321,6 +324,7 @@
                 pending_phy_bands = []
                 pending_phy_modes = []
                 pending_phy_commands = []
+                pending_phy_features = []
                 pending_phy_max_scan_ssids = None
                 pending_phy_tx_antennas = 0
                 pending_phy_rx_antennas = 0
@@ -375,6 +379,11 @@
                         match_avail_antennas.group(2), 16)
                 continue
 
+            match_device_support = re.match('\s*Device supports (.*)\.', line)
+            if match_device_support and pending_phy_name:
+                pending_phy_features.append(match_device_support.group(1))
+                continue
+
             if not all([current_band, pending_phy_name,
                         line.startswith('\t')]):
                 continue