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

tests: Pass apdev to hostapd.add_iface()

Browse source 
Pass apdev param to hostapd.add_iface() to support operation with a
remote test host.

Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
This commit is contained in:
Janusz Dziedzic 2016-04-07 07:38:01 +02:00 committed by Jouni Malinen
parent 369f712a40
commit 29444a0863
4 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tests/hwsim/hostapd.py
View file

@ -399,8 +399,16 @@ def add_bss(phy, ifname, confname, ignore_error=False, hostname=None,
if not hapd.ping():
raise Exception("Could not ping hostapd")
def add_iface(ifname, confname, hostname=None, port=8878):
logger.info("Starting interface " + ifname)
def add_iface(apdev, confname):
ifname = apdev['ifname']
try:
hostname = apdev['hostname']
port = apdev['port']
logger.info("Starting interface " + hostname + "/" + port + " " + ifname)
except:
logger.info("Starting interface " + ifname)
hostname = None
port = 8878
hapd_global = HostapdGlobal(hostname=hostname, port=port)
hapd_global.add_iface(ifname, confname)
port = hapd_global.get_ctrl_iface_port(ifname)

2
tests/hwsim/test_ap_acs.py
View file

@ -95,7 +95,7 @@ def test_ap_multi_bss_acs(dev, apdev):
force_prev_ap_on_24g(apdev[0])
# start the actual test
hostapd.add_iface(ifname, 'multi-bss-acs.conf')
hostapd.add_iface(apdev[0], 'multi-bss-acs.conf')
hapd = hostapd.Hostapd(ifname)
hapd.enable()
wait_acs(hapd)

4
tests/hwsim/test_ap_dynamic.py
View file

@ -182,7 +182,7 @@ def test_ap_multi_bss_config(dev, apdev):
ifname2 = apdev[0]['ifname'] + '-2'
ifname3 = apdev[0]['ifname'] + '-3'
logger.info("Set up three BSSes with one configuration file")
hostapd.add_iface(ifname1, 'multi-bss.conf')
hostapd.add_iface(apdev[0], 'multi-bss.conf')
hapd = hostapd.Hostapd(ifname1)
hapd.enable()
multi_check(dev, [ True, True, True ])
@ -193,7 +193,7 @@ def test_ap_multi_bss_config(dev, apdev):
hostapd.remove_bss(apdev[0], ifname1)
multi_check(dev, [ False, False, False ])
hostapd.add_iface(ifname1, 'multi-bss.conf')
hostapd.add_iface(apdev[0], 'multi-bss.conf')
hapd = hostapd.Hostapd(ifname1)
hapd.enable()
hostapd.remove_bss(apdev[0], ifname1)

2
tests/hwsim/test_ap_vlan.py
View file

@ -330,7 +330,7 @@ def ap_vlan_iface_cleanup_multibss(dev, apdev, cfgfile):
ifname = apdev[0]['ifname']
# start the actual test
hostapd.add_iface(ifname, cfgfile)
hostapd.add_iface(apdev[0], cfgfile)
hapd = hostapd.Hostapd(ifname)
hapd1 = hostapd.Hostapd("wlan3-2", 1)
hapd1.enable()