commit a5d2848078b541c3a2949e59deb7c5f5376667cb
author Girish Moturu <gmoturu@google.com> Wed Oct 23 10:15:37 2019 -0700
committer Girish Moturu <gmoturu@google.com> Wed Oct 23 10:27:56 2019 -0700
tree 316f708877a472cacc0717e5129e2f6a3d9aa579
parent fe62a4e0e3c8d7ab18806d15c0cbe695dcb651da

[WifiSoftApAcsTest] Update sniffer band and channel

Added UUIDs to new tests and updated sniffer's band and channel as per
test case

Bug: 143084592
Bug: 142125692
Test: Verified the changes
Change-Id: Icee865b94f6cea6e15561b38b5907cf1075cc787

acts/tests/google/wifi/WifiSoftApAcsTest.py

diff --git a/acts/tests/google/wifi/WifiSoftApAcsTest.py b/acts/tests/google/wifi/WifiSoftApAcsTest.py
index 7ce18af..0bf47a9 100644
--- a/acts/tests/google/wifi/WifiSoftApAcsTest.py
+++ b/acts/tests/google/wifi/WifiSoftApAcsTest.py
@@ -69,15 +69,17 @@
                      "iperf_server_port"]
         self.unpack_userparams(
             req_param_names=req_params, opt_param_names=opt_param)
-        if hasattr(self, 'packet_capture'):
-            self.configure_packet_capture()
+        self.chan_map = {v: k for k, v in hostapd_constants.CHANNEL_MAP.items()}
+        self.pcap_procs = None
 
     def setup_test(self):
         if hasattr(self, 'packet_capture'):
-            band = '2G' if '2G' in self.test_name else \
-                ('5G' if '5G' in self.test_name else 'dual')
-            self.pcap_procs = wutils.start_pcap(
-                self.packet_capture, band, self.test_name)
+            chan = self.test_name.split('_')[-1]
+            if chan.isnumeric():
+                band = '2G' if self.chan_map[int(chan)] < 5000 else '5G'
+                self.packet_capture[0].configure_monitor_mode(band, int(chan))
+                self.pcap_procs = wutils.start_pcap(
+                    self.packet_capture[0], band, self.test_name)
         self.dut.droid.wakeLockAcquireBright()
         self.dut.droid.wakeUpNow()
 
@@ -87,8 +89,9 @@
         wutils.stop_wifi_tethering(self.dut)
         wutils.reset_wifi(self.dut)
         wutils.reset_wifi(self.dut_client)
-        if hasattr(self, 'packet_capture'):
-            wutils.stop_pcap(self.packet_capture, self.pcap_procs, False)
+        if hasattr(self, 'packet_capture') and self.pcap_procs:
+            wutils.stop_pcap(self.packet_capture[0], self.pcap_procs, False)
+            self.pcap_procs = None
         try:
             if "AccessPoint" in self.user_params:
                 del self.user_params["reference_networks"]