From: Michael Braun <michael-dev@xxxxxxxxxxxxx> This adds a new test to run test_ap_vlan_iface_cleanup_multibss with per_sta_vif enabled. Signed-off-by: Michael Braun <michael-dev@xxxxxxxxxxxxx> --- tests/hwsim/multi-bss-iface-per_sta_vif.conf | 42 ++++++++++++++++++++++++++++ tests/hwsim/test_ap_vlan.py | 14 ++++++++-- 2 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 tests/hwsim/multi-bss-iface-per_sta_vif.conf diff --git a/tests/hwsim/multi-bss-iface-per_sta_vif.conf b/tests/hwsim/multi-bss-iface-per_sta_vif.conf new file mode 100644 index 0000000..3b25883 --- /dev/null +++ b/tests/hwsim/multi-bss-iface-per_sta_vif.conf @@ -0,0 +1,42 @@ +driver=nl80211 + +hw_mode=g +channel=0 +ieee80211n=1 + +interface=wlan3 +ctrl_interface=/var/run/hostapd + +ssid=bss-1 +dynamic_vlan=1 +vlan_tagged_interface=dummy0 +vlan_bridge=brvlan +wpa=2 +wpa_key_mgmt=WPA-EAP +rsn_pairwise=CCMP +ieee8021x=1 +auth_server_addr=127.0.0.1 +auth_server_port=18128 +auth_server_shared_secret=radius +nas_identifier=nas.w1.fi +vlan_naming=1 +per_sta_vif=1 + +bss=wlan3-2 +bssid=02:00:00:00:03:01 +ctrl_interface=/var/run/hostapd +ssid=bss-2 + +dynamic_vlan=1 +vlan_tagged_interface=dummy0 +vlan_bridge=brvlan +wpa=2 +wpa_key_mgmt=WPA-EAP +rsn_pairwise=CCMP +ieee8021x=1 +auth_server_addr=127.0.0.1 +auth_server_port=18128 +auth_server_shared_secret=radius +nas_identifier=nas.w1.fi +vlan_naming=1 +per_sta_vif=1 diff --git a/tests/hwsim/test_ap_vlan.py b/tests/hwsim/test_ap_vlan.py index af6dedd..afaa9e8 100644 --- a/tests/hwsim/test_ap_vlan.py +++ b/tests/hwsim/test_ap_vlan.py @@ -242,7 +242,7 @@ def ap_vlan_iface_test_and_prepare_environ(): if "dummy0.1" in ifaces: raise Exception("dummy0.1 was not removed before testing") -def test_ap_vlan_iface_cleanup_multibss(dev, apdev): +def test_ap_vlan_iface_cleanup_multibss(dev, apdev, p, cfgfile='multi-bss-iface.conf'): """AP VLAN operation in multi-BSS multi-VLAN case""" # AP VLAN with WPA2-Enterprise and RADIUS attributes changing VLANID @@ -271,7 +271,7 @@ def test_ap_vlan_iface_cleanup_multibss(dev, apdev): ifname = apdev[0]['ifname'] # start the actual test - hostapd.add_iface(ifname, 'multi-bss-iface.conf') + hostapd.add_iface(ifname, cfgfile) hapd = hostapd.Hostapd(ifname) hapd1 = hostapd.Hostapd("wlan3-2", 1) hapd1.enable() @@ -385,6 +385,16 @@ def test_ap_vlan_iface_cleanup_multibss(dev, apdev): finally: ap_vlan_iface_cleanup_multibss_cleanup() +def test_ap_vlan_iface_cleanup_multibss_per_sta_vif(dev, apdev, p): + """AP VLAN operation in multi-BSS multi-VLAN case with per-sta-vif set""" + + # AP VLAN with WPA2-Enterprise and RADIUS attributes changing VLANID + # check that multiple bss do not interfere with each other with respect + # to deletion of bridge and tagged interface + # per_sta_vif is enabled + + test_ap_vlan_iface_cleanup_multibss(dev, apdev, p, cfgfile='multi-bss-iface-per_sta_vif.conf') + def test_ap_vlan_without_station(dev, apdev, p): """AP VLAN with WPA2-PSK and no station""" try: -- 2.1.4 _______________________________________________ Hostap mailing list Hostap@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/hostap