DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

tests/remote: Fix execution of setup_hw

Browse source 
The code contained some places that used an additional argument for
setup_hw after -R and also contained places where setup_hw cmdline was
passed as a string instead of an argument list. It also contained places
where the ifname was only treated as a single interface and disregarded
the possiblity of multiple interfaces. This commit fixes these issues
and executes setup_hw from a single function for all cases.

Signed-off-by: Jonathan Afek <jonathanx.afek@intel.com>
This commit is contained in:
Jonathan Afek 2016-05-19 16:06:50 +03:00 • committed by Jouni Malinen
parent 8efc83d4e7
commit 483053b9d8
3 changed files with 32 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

24
tests/remote/rutils.py
View file

@ -4,6 +4,7 @@
# This software may be distributed under the terms of the BSD license.
# See README for more details.
import re
import time
from remotehost import Host
import hostapd
@ -26,23 +27,32 @@ def get_host(devices, dev_name):
return host
# run setup_hw - hw specyfic
def setup_hw(hosts, setup_params):
for host in hosts:
setup_hw_host(host, setup_params)
def setup_hw_host(host, setup_params):
def setup_hw_host_iface(host, iface, setup_params, force_restart=False):
try:
setup_hw = setup_params['setup_hw']
restart = ""
try:
if setup_params['restart_device'] == True:
restart = " -R "
restart = "-R"
except:
pass
host.execute([setup_hw, "-I", host.ifname, restart])
if force_restart:
restart = "-R"
host.execute([setup_hw, "-I", iface, restart])
except:
pass
def setup_hw_host(host, setup_params, force_restart=False):
ifaces = re.split('; | |, ', host.ifname)
for iface in ifaces:
setup_hw_host_iface(host, iface, setup_params, force_restart)
def setup_hw(hosts, setup_params, force_restart=False):
for host in hosts:
setup_hw_host(host, setup_params, force_restart)
# get traces - hw specific
def trace_start(hosts, setup_params):
for host in hosts: