commit 0941e553af0368b533ac67bc3408b2bfc8014962
author Mike Mu <mikemu@google.com> Tue Sep 06 16:22:04 2016 -0400
committer Mike Mu <mikemu@google.com> Tue Sep 06 16:22:04 2016 -0400
tree 9bc2585eca4ffd599675065d9fa72a84235f6097
parent ed03973d6d356cf998c7fe0308b712fa2d5c1c65

Fix Quantenna interface suffix.

Change-Id: Ie4cc500521353189e09f2bdd83ed182dda9f6392

wifi/quantenna.py

diff --git a/wifi/quantenna.py b/wifi/quantenna.py
index 1408574..f1d5da5 100755
--- a/wifi/quantenna.py
+++ b/wifi/quantenna.py
@@ -40,7 +40,6 @@
   # IDs start at 2). The client interface must map to wifi0, so it must have
   # VLAN ID 2.
   prefix = 'wlan' if mode == 'ap' else 'wcli'
-  suffix = '_' + suffix if suffix else ''
   for hif in _get_quantenna_interfaces():
     if re.match(prefix + r'\d*' + suffix, hif):
       vlan = _get_vlan(hif)

wifi/quantenna_test.py

diff --git a/wifi/quantenna_test.py b/wifi/quantenna_test.py
index 177f557..b0fb485 100755
--- a/wifi/quantenna_test.py
+++ b/wifi/quantenna_test.py
@@ -35,7 +35,7 @@
   quantenna._get_vlan = lambda _: 3
   wvtest.WVPASSEQ(quantenna._get_interface('ap', ''),
                   ('wlan0', 'wifi1', '00:00:00:00:00:00', 3))
-  wvtest.WVPASSEQ(quantenna._get_interface('ap', 'portal'),
+  wvtest.WVPASSEQ(quantenna._get_interface('ap', '_portal'),
                   ('wlan0_portal', 'wifi1', '00:00:00:00:00:00', 3))
   wvtest.WVPASSEQ(quantenna._get_interface('sta', ''),
                   (None, None, None, None))