tests/remote: Extend get_monitor_params() to support P2P interfaces

This function is used for remote tests when a monitor interface is
needed on the channel on which the AP operates. This change enables us
to also query P2P interfaces for the channel information to use for
monitor interfaces.

Signed-off-by: Jonathan Afek <jonathanx.afek@intel.com>
This commit is contained in:
Jonathan Afek 2016-05-19 16:06:45 +03:00 committed by Jouni Malinen
parent 04fd8ea1ba
commit a73cdd69c7

View file

@ -138,17 +138,21 @@ def remove(host):
host.monitors.remove(monitor) host.monitors.remove(monitor)
# get monitor params from hostapd # get monitor params from hostapd/wpa_supplicant
def get_monitor_params(hapd): def get_monitor_params(wpa, is_p2p=False):
freq = hapd.get_status_field("freq") if is_p2p:
get_status_field_f = wpa.get_group_status_field
else:
get_status_field_f = wpa.get_status_field
freq = get_status_field_f("freq")
bw = "20" bw = "20"
center_freq1="" center_freq1=""
center_freq2="" center_freq2=""
vht_oper_chwidth = hapd.get_status_field("vht_oper_chwidth") vht_oper_chwidth = get_status_field_f("vht_oper_chwidth")
secondary_channel = hapd.get_status_field("secondary_channel") secondary_channel = get_status_field_f("secondary_channel")
vht_oper_centr_freq_seg0_idx = hapd.get_status_field("vht_oper_centr_freq_seg0_idx") vht_oper_centr_freq_seg0_idx = get_status_field_f("vht_oper_centr_freq_seg0_idx")
vht_oper_centr_freq_seg1_idx = hapd.get_status_field("vht_oper_centr_freq_seg1_idx") vht_oper_centr_freq_seg1_idx = get_status_field_f("vht_oper_centr_freq_seg1_idx")
if vht_oper_chwidth == "0" or vht_oper_chwidth is None: if vht_oper_chwidth == "0" or vht_oper_chwidth is None:
if secondary_channel == "1": if secondary_channel == "1":
bw = "40" bw = "40"