diff mbox

[v2,03/17] tests: pass apdev to hostapd.add_iface()

Message ID 1460007495-17921-3-git-send-email-janusz.dziedzic@tieto.com
State Accepted
Headers show

Commit Message

Janusz.Dziedzic@tieto.com April 7, 2016, 5:38 a.m. UTC 
Pass apdev param to hostapd.add_iface()

Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
---
 tests/hwsim/hostapd.py         | 13 +++++++++++--
 tests/hwsim/test_ap_acs.py     |  2 +-
 tests/hwsim/test_ap_dynamic.py |  4 ++--
 tests/hwsim/test_ap_vlan.py    |  2 +-
 4 files changed, 15 insertions(+), 6 deletions(-)
diff mbox

Patch

diff --git a/tests/hwsim/hostapd.py b/tests/hwsim/hostapd.py
index 931c666..868f664 100644
--- a/tests/hwsim/hostapd.py
+++ b/tests/hwsim/hostapd.py
@@ -399,8 +399,17 @@  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=None):
+    if ifname == None:
+        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)
diff --git a/tests/hwsim/test_ap_acs.py b/tests/hwsim/test_ap_acs.py
index 71feb76..8f1f492 100644
--- a/tests/hwsim/test_ap_acs.py
+++ b/tests/hwsim/test_ap_acs.py
@@ -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)
diff --git a/tests/hwsim/test_ap_dynamic.py b/tests/hwsim/test_ap_dynamic.py
index 0ba0bae..a859651 100644
--- a/tests/hwsim/test_ap_dynamic.py
+++ b/tests/hwsim/test_ap_dynamic.py
@@ -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', ifname1)
     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', ifname1)
     hapd = hostapd.Hostapd(ifname1)
     hapd.enable()
     hostapd.remove_bss(apdev[0], ifname1)
diff --git a/tests/hwsim/test_ap_vlan.py b/tests/hwsim/test_ap_vlan.py
index 030f3cb..79c4166 100644
--- a/tests/hwsim/test_ap_vlan.py
+++ b/tests/hwsim/test_ap_vlan.py
@@ -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()