From patchwork Thu Apr 7 05:38:03 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: 607244 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 3qgWcP3P1Yz9t5q 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=hdVDCmer; 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 1ao2eo-00055O-Fg; Thu, 07 Apr 2016 05:39:06 +0000 Received: from mail-lf0-x22e.google.com ([2a00:1450:4010:c07::22e]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ao2ef-0004ws-M5 for hostap@lists.infradead.org; Thu, 07 Apr 2016 05:39:01 +0000 Received: by mail-lf0-x22e.google.com with SMTP id c126so49055658lfb.2 for ; Wed, 06 Apr 2016 22:38:36 -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:in-reply-to:references; bh=M0Z+841reL31PmYcKF48csZokHjA9MXWtoYzA/9M41w=; b=hdVDCmerWickjxin8mqvPPwnvaallykiujd2RGFlLt4slWJBLeAv8xwsGk7rmiIpi7 Dyhc019ZZML9KhFu7EPgrAn9oeL0V1reiJsow9xwSYXLWoawsrA71tSrZKcHHizcCo4z N7hDDzvlyet4QrwFVfxJNhLwhzgLwlZPyHXGc= 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:in-reply-to :references; bh=M0Z+841reL31PmYcKF48csZokHjA9MXWtoYzA/9M41w=; b=XV8ZZAScCw7yJMRK9tjPJIQzQh8ifcSu70QUNnTy940QMpoDXymdUVmTW2KMWUJRLP dmpI//bi7nZfY6WdczdhMJNbTHxbDKccsIj/W+LX2C3JsgSrk/ZXRMvG3487FqunV2WF 8KdDJ97pD2zAB531Fffcwbj5ImQ5IkMmp8HubhQ54wUAVOuRtRNajhlC428RjwjMO1Y5 Jkm9YD477qdBG3Q13ZRTfhhshgh/xTBasoT5fPnWgLAvs9WTN79pAGO4828hdj8ENFbZ 8+jfAeJXeAdoj90Df12cu+LMW0+qHf3ZOrdU2VYHJOECoL3FFoRHWCx/rqM9wWkHnK0L Oy+A== X-Gm-Message-State: AD7BkJLHfoKOHryM85X9+ZJGktq7h/gf5zCeJ0C2K0/CJfqkR/T/dCDB0/PaZYKuVTxcGDk3xPtKv+h1MCbvE7Hbk3R59LQwvP30BHCrTLpTSI1FsLI2GQ73gfKQXQR7DNmmhsxp1phZptzgBUgUikUf8uuH6Ve/Oj1Gh0R1XfaaBSNjT+E9BMsOje1nzlIw84Wy X-Received: by 10.25.85.145 with SMTP id j139mr514042lfb.131.1460007514896; Wed, 06 Apr 2016 22:38:34 -0700 (PDT) Received: from localhost.localdomain ([213.192.73.50]) by smtp.gmail.com with ESMTPSA id f134sm938018lff.34.2016.04.06.22.38.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 06 Apr 2016 22:38:34 -0700 (PDT) From: Janusz Dziedzic To: hostap@lists.infradead.org Subject: [PATCH v2 05/17] tests: pass apdev param to HostapdGlobal() Date: Thu, 7 Apr 2016 07:38:03 +0200 Message-Id: <1460007495-17921-5-git-send-email-janusz.dziedzic@tieto.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1460007495-17921-1-git-send-email-janusz.dziedzic@tieto.com> References: <1460007495-17921-1-git-send-email-janusz.dziedzic@tieto.com> X-DomainID: tieto.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160406_223858_069261_F0510F0D X-CRM114-Status: UNSURE ( 8.78 ) 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:22e 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 Pass apdev param to HostapdGlobal(). Signed-off-by: Janusz Dziedzic --- tests/hwsim/hostapd.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/hwsim/hostapd.py b/tests/hwsim/hostapd.py index 01b336e..44035b3 100644 --- a/tests/hwsim/hostapd.py +++ b/tests/hwsim/hostapd.py @@ -21,7 +21,13 @@ def mac2tuple(mac): return struct.unpack('6B', binascii.unhexlify(mac.replace(':',''))) class HostapdGlobal: - def __init__(self, hostname=None, port=8878): + def __init__(self, apdev=None): + try: + hostname = apdev['hostname'] + port = apdev['port'] + except: + hostname = None + port = 8878 self.host = remotehost.Host(hostname) self.hostname = hostname self.port = port @@ -356,7 +362,7 @@ def add_ap(apdev, params, wait_enabled=True, no_enable=False, timeout=30): logger.info("Starting AP " + ifname + " (old add_ap argument type)") hostname = None port = 8878 - hapd_global = HostapdGlobal(hostname=hostname, port=port) + hapd_global = HostapdGlobal(apdev) hapd_global.remove(ifname) hapd_global.add(ifname) port = hapd_global.get_ctrl_iface_port(ifname) @@ -401,7 +407,7 @@ def add_bss(apdev, ifname, confname, phy=None, ignore_error=False): logger.info("Starting BSS phy=" + phy + " ifname=" + ifname) hostname = None port = 8878 - hapd_global = HostapdGlobal(hostname=hostname, port=port) + hapd_global = HostapdGlobal(apdev) hapd_global.add_bss(phy, confname, ignore_error) port = hapd_global.get_ctrl_iface_port(ifname) hapd = Hostapd(ifname, hostname=hostname, port=port) @@ -419,7 +425,7 @@ def add_iface(apdev, confname, ifname=None): logger.info("Starting interface " + ifname) hostname = None port = 8878 - hapd_global = HostapdGlobal(hostname=hostname, port=port) + hapd_global = HostapdGlobal(apdev) hapd_global.add_iface(ifname, confname) port = hapd_global.get_ctrl_iface_port(ifname) hapd = Hostapd(ifname, hostname=hostname, port=port) @@ -431,25 +437,19 @@ def remove_bss(apdev, 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 = HostapdGlobal(apdev) hapd_global.remove(ifname) def terminate(apdev): try: hostname = apdev['hostname'] - port = apdev['port'] logger.info("Terminating hostapd " + apdev['hostname'] + "/" + apdev['port']) except: - hostname = None - port = 8878 logger.info("Terminating hostapd") - hapd_global = HostapdGlobal(hostname=hostname, port=port) + hapd_global = HostapdGlobal(apdev) hapd_global.terminate() def wpa2_params(ssid=None, passphrase=None):