tests: Add terminate support for hostapd/wpa_supplicant
Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
This commit is contained in:
parent
13073011b9
commit
e3b36d420e
2 changed files with 27 additions and 0 deletions
tests/hwsim
|
@ -101,6 +101,13 @@ class HostapdGlobal:
|
||||||
words = line.split(":")
|
words = line.split(":")
|
||||||
return int(words[1])
|
return int(words[1])
|
||||||
|
|
||||||
|
def terminate(self):
|
||||||
|
self.mon.detach()
|
||||||
|
self.mon.close()
|
||||||
|
self.mon = None
|
||||||
|
self.ctrl.terminate()
|
||||||
|
self.ctrl = None
|
||||||
|
|
||||||
class Hostapd:
|
class Hostapd:
|
||||||
def __init__(self, ifname, bssidx=0, hostname=None, port=8877):
|
def __init__(self, ifname, bssidx=0, hostname=None, port=8877):
|
||||||
self.ifname = ifname
|
self.ifname = ifname
|
||||||
|
@ -114,6 +121,14 @@ class Hostapd:
|
||||||
self.bssid = None
|
self.bssid = None
|
||||||
self.bssidx = bssidx
|
self.bssidx = bssidx
|
||||||
|
|
||||||
|
def close_ctrl(self):
|
||||||
|
if self.mon is not None:
|
||||||
|
self.mon.detach()
|
||||||
|
self.mon.close()
|
||||||
|
self.mon = None
|
||||||
|
self.ctrl.close()
|
||||||
|
self.ctrl = None
|
||||||
|
|
||||||
def own_addr(self):
|
def own_addr(self):
|
||||||
if self.bssid is None:
|
if self.bssid is None:
|
||||||
self.bssid = self.get_status_field('bssid[%d]' % self.bssidx)
|
self.bssid = self.get_status_field('bssid[%d]' % self.bssidx)
|
||||||
|
@ -365,6 +380,11 @@ def remove_bss(ifname, hostname=None, port=8878):
|
||||||
hapd_global = HostapdGlobal(hostname=hostname, port=port)
|
hapd_global = HostapdGlobal(hostname=hostname, port=port)
|
||||||
hapd_global.remove(ifname)
|
hapd_global.remove(ifname)
|
||||||
|
|
||||||
|
def terminate(hostname=None, port=8878):
|
||||||
|
logger.info("Terminating hostapd")
|
||||||
|
hapd_global = HostapdGlobal(hostname=hostname, port=port)
|
||||||
|
hapd_global.terminate()
|
||||||
|
|
||||||
def wpa2_params(ssid=None, passphrase=None):
|
def wpa2_params(ssid=None, passphrase=None):
|
||||||
params = { "wpa": "2",
|
params = { "wpa": "2",
|
||||||
"wpa_key_mgmt": "WPA-PSK",
|
"wpa_key_mgmt": "WPA-PSK",
|
||||||
|
|
|
@ -39,6 +39,13 @@ class WpaSupplicant:
|
||||||
else:
|
else:
|
||||||
self.global_mon = None
|
self.global_mon = None
|
||||||
|
|
||||||
|
def terminate(self):
|
||||||
|
if self.global_mon:
|
||||||
|
self.global_mon.detach()
|
||||||
|
self.global_mon = None
|
||||||
|
self.global_ctrl.terminate()
|
||||||
|
self.global_ctrl = None
|
||||||
|
|
||||||
def close_ctrl(self):
|
def close_ctrl(self):
|
||||||
if self.global_mon:
|
if self.global_mon:
|
||||||
self.global_mon.detach()
|
self.global_mon.detach()
|
||||||
|
|
Loading…
Reference in a new issue