From patchwork Thu Apr 7 05:37:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janusz.Dziedzic@tieto.com X-Patchwork-Id: 607245 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3qgWcP2cv6z9t4T for ; Thu, 7 Apr 2016 15:39:17 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=tieto.com header.i=@tieto.com header.b=HfJ142Iz; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ao2es-00056p-5f; Thu, 07 Apr 2016 05:39:10 +0000 Received: from mail-lf0-x22f.google.com ([2a00:1450:4010:c07::22f]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ao2ef-0004wX-CZ for hostap@lists.infradead.org; Thu, 07 Apr 2016 05:39:02 +0000 Received: by mail-lf0-x22f.google.com with SMTP id j11so48841482lfb.1 for ; Wed, 06 Apr 2016 22:38:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tieto.com; s=google; h=from:to:cc:subject:date:message-id; bh=I50tAmMFG0qL+tiWmiv9B2XQ/9pRaNCwyJExdOwbe5E=; b=HfJ142IzbChjlRvQyMAm63Vwpk0+aE22o/Kui6PnHnNTmo/9FJySAMviJGl7HoRcMH c7OgH3o8wzKn6eNfj+7mvo6SErsVWlSPQqeVklhvBX4sHHzWJxYSkUdfkOnHWVQl8wEe qqec8wx1+eLAxXE8Jmwq7wA6rboGZyvKT/cCc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=I50tAmMFG0qL+tiWmiv9B2XQ/9pRaNCwyJExdOwbe5E=; b=Jm1hhIfCL7s7hn+Y+I2DpJRCjgOOw5CqfrXrZrAxxTZlfMk0TqAuTupo3Q564r6C+x Pdia/Tgg/neh+sWY16d60mf2cF8avHrEOwY+XDB+TPbSSFfwAcaIKG2+UsRmwP4efFHG ZoVCQz0LVtZFlRxpuQ9oxjOt3yK2ChGHsY8yzdWQGSyDm2oRf/4FE6I5WohAYgwpgPhB 2zvuDhZsrZsxvswf6Pkro8cBcZ94995RzpmYtIPMoFNx3nsZF0sncpRYRxXrxTHqigVS YwHg7H2BKDC2SIRzTAEMSsMOCi5loVS883KsyjelHd7uMSgArDOga19028iZ6PlXzBNX lg8Q== X-Gm-Message-State: AD7BkJK/qwBxe0jn55UpyNgkYnMbjGZcnEtqQ1dc55csiw4QzmYN9P4TcL1xDRFpizji1zA73WzDR9hLecv2jsSiq2YNt4zb0hHYaGFpS1fOa0znCPdQUKgflmRiGaENZJ2G8gIPCI6OdfNbTWJyE4ydGBw95bhZf9ZSk0JAchKUTOzSfwr/BwoJtZCXpx/JiwqQ X-Received: by 10.25.78.80 with SMTP id c77mr593064lfb.62.1460007511355; Wed, 06 Apr 2016 22:38:31 -0700 (PDT) Received: from localhost.localdomain ([213.192.73.50]) by smtp.gmail.com with ESMTPSA id f134sm938018lff.34.2016.04.06.22.38.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 06 Apr 2016 22:38:30 -0700 (PDT) From: Janusz Dziedzic To: hostap@lists.infradead.org Subject: [PATCH v2 01/17] tests: pass apdev to remove_bss() Date: Thu, 7 Apr 2016 07:37:59 +0200 Message-Id: <1460007495-17921-1-git-send-email-janusz.dziedzic@tieto.com> X-Mailer: git-send-email 1.9.1 X-DomainID: tieto.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160406_223858_050861_9866467F X-CRM114-Status: UNSURE ( 8.70 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2a00:1450:4010:c07:0:0:0:22f listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: j@w1.fi, Janusz Dziedzic MIME-Version: 1.0 Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org We need this for remote host support. From apdev we can get apdev['hostname'] and apdev['port']. Signed-off-by: Janusz Dziedzic --- tests/hwsim/hostapd.py | 13 +++++++++++-- tests/hwsim/test_ap_dynamic.py | 40 ++++++++++++++++++++-------------------- 2 files changed, 31 insertions(+), 22 deletions(-) diff --git a/tests/hwsim/hostapd.py b/tests/hwsim/hostapd.py index 47a3262..6becb8e 100644 --- a/tests/hwsim/hostapd.py +++ b/tests/hwsim/hostapd.py @@ -408,8 +408,17 @@ def add_iface(ifname, confname, hostname=None, port=8878): if not hapd.ping(): raise Exception("Could not ping hostapd") -def remove_bss(ifname, hostname=None, port=8878): - logger.info("Removing BSS " + ifname) +def remove_bss(apdev, ifname=None): + if ifname == None: + ifname = apdev['ifname'] + try: + hostname = apdev['hostname'] + port = apdev['port'] + logger.info("Removing BSS " + hostname + "/" + port + " " + ifname) + except: + logger.info("Removing BSS " + ifname) + hostname = None + port = 8878 hapd_global = HostapdGlobal(hostname=hostname, port=port) hapd_global.remove(ifname) diff --git a/tests/hwsim/test_ap_dynamic.py b/tests/hwsim/test_ap_dynamic.py index de1c4d9..0ba0bae 100644 --- a/tests/hwsim/test_ap_dynamic.py +++ b/tests/hwsim/test_ap_dynamic.py @@ -104,19 +104,19 @@ def _test_ap_bss_add_remove(dev, apdev): multi_check(dev, [ True, True, True ]) logger.info("Remove the last BSS and re-add it") - hostapd.remove_bss(ifname3) + hostapd.remove_bss(apdev[0], ifname3) multi_check(dev, [ True, True, False ]) hostapd.add_bss('phy3', ifname3, 'bss-3.conf') multi_check(dev, [ True, True, True ]) logger.info("Remove the middle BSS and re-add it") - hostapd.remove_bss(ifname2) + hostapd.remove_bss(apdev[0], ifname2) multi_check(dev, [ True, False, True ]) hostapd.add_bss('phy3', ifname2, 'bss-2.conf') multi_check(dev, [ True, True, True ]) logger.info("Remove the first BSS and re-add it and other BSSs") - hostapd.remove_bss(ifname1) + hostapd.remove_bss(apdev[0], ifname1) multi_check(dev, [ False, False, False ]) hostapd.add_bss('phy3', ifname1, 'bss-1.conf') hostapd.add_bss('phy3', ifname2, 'bss-2.conf') @@ -124,9 +124,9 @@ def _test_ap_bss_add_remove(dev, apdev): multi_check(dev, [ True, True, True ]) logger.info("Remove two BSSes and re-add them") - hostapd.remove_bss(ifname2) + hostapd.remove_bss(apdev[0], ifname2) multi_check(dev, [ True, False, True ]) - hostapd.remove_bss(ifname3) + hostapd.remove_bss(apdev[0], ifname3) multi_check(dev, [ True, False, False ]) hostapd.add_bss('phy3', ifname2, 'bss-2.conf') multi_check(dev, [ True, True, False ]) @@ -134,11 +134,11 @@ def _test_ap_bss_add_remove(dev, apdev): multi_check(dev, [ True, True, True ]) logger.info("Remove three BSSes in and re-add them") - hostapd.remove_bss(ifname3) + hostapd.remove_bss(apdev[0], ifname3) multi_check(dev, [ True, True, False ]) - hostapd.remove_bss(ifname2) + hostapd.remove_bss(apdev[0], ifname2) multi_check(dev, [ True, False, False ]) - hostapd.remove_bss(ifname1) + hostapd.remove_bss(apdev[0], ifname1) multi_check(dev, [ False, False, False ]) hostapd.add_bss('phy3', ifname1, 'bss-1.conf') multi_check(dev, [ True, False, False ]) @@ -160,18 +160,18 @@ def test_ap_bss_add_remove_during_ht_scan(dev, apdev): hostapd.add_bss('phy3', ifname1, 'bss-ht40-1.conf') hostapd.add_bss('phy3', ifname2, 'bss-ht40-2.conf') multi_check(dev, [ True, True ], scan_opt=False) - hostapd.remove_bss(ifname2) - hostapd.remove_bss(ifname1) + hostapd.remove_bss(apdev[0], ifname2) + hostapd.remove_bss(apdev[0], ifname1) hostapd.add_bss('phy3', ifname1, 'bss-ht40-1.conf') hostapd.add_bss('phy3', ifname2, 'bss-ht40-2.conf') - hostapd.remove_bss(ifname2) + hostapd.remove_bss(apdev[0], ifname2) multi_check(dev, [ True, False ], scan_opt=False) - hostapd.remove_bss(ifname1) + hostapd.remove_bss(apdev[0], ifname1) hostapd.add_bss('phy3', ifname1, 'bss-ht40-1.conf') hostapd.add_bss('phy3', ifname2, 'bss-ht40-2.conf') - hostapd.remove_bss(ifname1) + hostapd.remove_bss(apdev[0], ifname1) multi_check(dev, [ False, False ]) def test_ap_multi_bss_config(dev, apdev): @@ -186,17 +186,17 @@ def test_ap_multi_bss_config(dev, apdev): hapd = hostapd.Hostapd(ifname1) hapd.enable() multi_check(dev, [ True, True, True ]) - hostapd.remove_bss(ifname2) + hostapd.remove_bss(apdev[0], ifname2) multi_check(dev, [ True, False, True ]) - hostapd.remove_bss(ifname3) + hostapd.remove_bss(apdev[0], ifname3) multi_check(dev, [ True, False, False ]) - hostapd.remove_bss(ifname1) + hostapd.remove_bss(apdev[0], ifname1) multi_check(dev, [ False, False, False ]) hostapd.add_iface(ifname1, 'multi-bss.conf') hapd = hostapd.Hostapd(ifname1) hapd.enable() - hostapd.remove_bss(ifname1) + hostapd.remove_bss(apdev[0], ifname1) multi_check(dev, [ False, False, False ]) def invalid_ap(hapd_global, ifname): @@ -415,7 +415,7 @@ def test_ap_bss_add_reuse_existing(dev, apdev): subprocess.check_call(["iw", "dev", ifname1, "interface", "add", ifname2, "type", "__ap"]) hostapd.add_bss('phy3', ifname2, 'bss-2.conf') - hostapd.remove_bss(ifname2) + hostapd.remove_bss(apdev[0], ifname2) subprocess.check_call(["iw", "dev", ifname2, "del"]) def hapd_bss_out_of_mem(hapd, phy, confname, count, func): @@ -447,8 +447,8 @@ def test_ap_bss_add_out_of_memory(dev, apdev): 1, 'ieee802_11_build_ap_params') hostapd.add_bss('phy3', ifname2, 'bss-2.conf') - hostapd.remove_bss(ifname2) - hostapd.remove_bss(ifname1) + hostapd.remove_bss(apdev[0], ifname2) + hostapd.remove_bss(apdev[0], ifname1) def test_ap_multi_bss(dev, apdev): """Multiple BSSes with hostapd"""