From patchwork Fri Apr 14 12:52:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Akihiko Odaki X-Patchwork-Id: 126091 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id C0AF142941; Fri, 14 Apr 2023 14:53:12 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BBFC841144; Fri, 14 Apr 2023 14:53:12 +0200 (CEST) Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by mails.dpdk.org (Postfix) with ESMTP id 182DA400D5 for ; Fri, 14 Apr 2023 14:53:12 +0200 (CEST) Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-63b68f53fabso131033b3a.0 for ; Fri, 14 Apr 2023 05:53:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20221208.gappssmtp.com; s=20221208; t=1681476791; x=1684068791; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zV4BMuZJ8W3iDBf4v+bmZMKvzTHc6njk4F7Sbpv/FVU=; b=gG3gMwxeRjm45ekOSLouiEc+X8/MKRGShc/oRfizrzZmmy1I+PMbeE60tKL0ifY206 JCtqzMWzw6dpZ+pb3E+BOtVikqkgW2g9EtKHK95zrBmsmkQTX8qaQmWn+rk8aqLP5nLH emidQRzjUOWJhHvQ5y4nBoPomi0bdZfssY14uJbsts2cJ2RDvJsPE8bnwLHprsNLjgKS 2J5KjMQyRv3NnxEGWyHGaMXGHcs+p97lLNH/XTKwoY2214ciIkFM37bOWZirzsBUyBW1 pIStuKH2z/j5IDIwDKnWFYkg80+yDHcoseHjf0tTRzVrfSGEXDAbXSguPoU3ifHhiQuJ CbyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681476791; x=1684068791; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zV4BMuZJ8W3iDBf4v+bmZMKvzTHc6njk4F7Sbpv/FVU=; b=guL7xeQKsho2cpATHaYZ52ZPdlxFUNcIbHn9MN8z6Km1BVU8tRBGCZSSLrPtZBuzQD sx9MSx8juXNAyXgz1Kx3L0zgnHobgBazj0zeMbXj8TPLk8PmnDRYhhnaV4er+YxP2pJv U8jWKVOyhcMlxzX43L9K3YvjZ2KkLw5Bu7founeEUfGsozwH604IoimXwNCFEndYPzck aokYFgkdQNhGJC+pBb+5qvNWLwrHVajrn14JQPdAxm3gDSHJHMeMbolZtDXDE46cwKen td18X2pvzC5MIyvIyqLFZWv/rbzYKeE+YXi47lZW+HRYSW5zk7LYaKJd04F669ihbZSZ XNfA== X-Gm-Message-State: AAQBX9fAvh+Czqu6TTYVDadLlyQ1xJHe/9kGKfySFc4Up2Ziq80RQ/HM VtQfyXqDlH0xQrw+1zgyVXqzDPsAmmBRMH7Kw84= X-Google-Smtp-Source: AKy350ZwyH2La3cik9NaENnZE4YLd4q/ECnvoHPVoOXeFasbaQnA4wHdjVvnaMMXSA0xMS1HNJHKLA== X-Received: by 2002:a05:6a00:1695:b0:63b:1e3b:aa02 with SMTP id k21-20020a056a00169500b0063b1e3baa02mr8462206pfc.16.1681476791050; Fri, 14 Apr 2023 05:53:11 -0700 (PDT) Received: from alarm.flets-east.jp ([2400:4050:a840:1e00:4457:c267:5e09:481b]) by smtp.gmail.com with ESMTPSA id u21-20020a62ed15000000b00627df85cd72sm2961787pfh.199.2023.04.14.05.53.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Apr 2023 05:53:10 -0700 (PDT) From: Akihiko Odaki To: Cc: dts@dpdk.org, Akihiko Odaki Subject: [PATCH 1/7] Replace Pcapy with Pcapyplus Date: Fri, 14 Apr 2023 21:52:49 +0900 Message-Id: <20230414125255.67812-2-akihiko.odaki@daynix.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230414125255.67812-1-akihiko.odaki@daynix.com> References: <20230414125255.67812-1-akihiko.odaki@daynix.com> MIME-Version: 1.0 X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org Pcapy is no longer maintained and incompatible with the latest distutils as described at: https://github.com/helpsystems/pcapy/issues/73 Replace it with Pcapyplus, a maintained fork. Signed-off-by: Akihiko Odaki --- ci/dts_requirements.txt | 2 +- doc/dts_gsg/usr_guide/sys_reqs.rst | 4 ++-- requirements.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/dts_requirements.txt b/ci/dts_requirements.txt index 4fcbcc60..0ffeb152 100644 --- a/ci/dts_requirements.txt +++ b/ci/dts_requirements.txt @@ -6,7 +6,7 @@ xlwt==1.3.0 pexpect==4.7.0 numpy==1.18.5 docutils -pcapy +pcapyplus xlrd scapy==2.4.4 threadpool diff --git a/doc/dts_gsg/usr_guide/sys_reqs.rst b/doc/dts_gsg/usr_guide/sys_reqs.rst index b91eef9d..e4682894 100644 --- a/doc/dts_gsg/usr_guide/sys_reqs.rst +++ b/doc/dts_gsg/usr_guide/sys_reqs.rst @@ -42,7 +42,7 @@ To run DTS, `Python3` must be installed, and it uses the following packages: * numpy: it provides method to deal with array-processing test results. * pexpect: it provides API to automate interactive SSH sessions. * docutils：it is a modular system for processing documentation into useful formats, such as HTML, XML, and LaTeX -* pcapy: it is a Python extension module that interfaces with the libpcap packet capture library. Pcapy enables python scripts to capture packets on the network. +* pcapyplus: it is a Python extension module that interfaces with the libpcap packet capture library. Pcapyplus enables python scripts to capture packets on the network. * xlrd: it is a Python module that extracts data from Excel spreadsheets. * threadpool: it is a Python module that maintains a pool of worker threads to perform time consuming operations in parallel. * scapy: it is a Python program that enables the user to send, sniff and dissect and forge network packets. @@ -57,7 +57,7 @@ They are recorded in `requirements.txt`. pexpect==4.7.0 numpy==1.18.5 docutils - pcapy + pcapyplus xlrd scapy==2.4.4 threadpool diff --git a/requirements.txt b/requirements.txt index 7f1a2f6c..9668a385 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ xlwt==1.3.0 pexpect==4.7.0 numpy==1.18.5 docutils -pcapy +pcapyplus xlrd scapy==2.4.4 threadpool From patchwork Fri Apr 14 12:52:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akihiko Odaki X-Patchwork-Id: 126092 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E291642941; Fri, 14 Apr 2023 14:53:14 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DF156410FA; Fri, 14 Apr 2023 14:53:14 +0200 (CEST) Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by mails.dpdk.org (Postfix) with ESMTP id 55E4A400D5 for ; Fri, 14 Apr 2023 14:53:13 +0200 (CEST) Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-1a2b01f5ac0so14106215ad.3 for ; Fri, 14 Apr 2023 05:53:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20221208.gappssmtp.com; s=20221208; t=1681476792; x=1684068792; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=TjZqcDp2W2ONYUddrbhvjj18wHX4NVykOEYtKRDB1ic=; b=1iXhiAmscs03qItJi37cIUwugmYjQnq92iyvJnuL1tX/Zcb+M5EkQFfW4typRZ2H5e NMkBdw5OsxqB8hh+xO4hVDJvBIEQZJ0AwceeDkiPcqgulxi3fur9NNMA0z+C6QXh9REW 8Aa+Ub+ffwL5y0R/8jfGCMKUc5kvvJE3gtp5acXfmEYm6V98/8sEz6fvtCChrYMQVmPx GZtesXikd9HRmhfdWFAGYNYi7kHfiyVUFtzAOQ3Y7v8isVhEOImFDyO25gcxiLlwtPGB k8NtDp3RerZ/OPPTcXnMGhVO/yBqn5jHNh1eLWuNAUAm6/UKp0w+4oE31JCD+1RhO1u0 cSXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681476792; x=1684068792; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TjZqcDp2W2ONYUddrbhvjj18wHX4NVykOEYtKRDB1ic=; b=GgSwBys2ZWi1sZd2B/TUmOpNzZ4VQjBPUbwICiqTtaQLNyep8CJn8kxchtnOZe21m+ msro2L951YAT6xlrEMvwQHhcJ2kvGUSMRBUhjLWdGflVxVr/G16XVJaBBimexAheSWMj jVuxuvGmK9PDYHWAQo1TCRgD7zF8FGkjcOqJpwq1EHkpKU7ljgy/BF3tlvwe7+q+YPpM NCeTyZKh04/4ZkBEIFz+qqjHqttAiuoifni3pJ3heTJPnP9OnfFAYfVEBnj2zKRIqRfn mqMdlpd08oHMpwI7nHbM8uRCcGBIucByhZNP/VJQEjYZQ7/csGRZV7bP0xfJwlExHyUH qO3g== X-Gm-Message-State: AAQBX9cU1Ta7S/CPt20X9LbbBxXTboQPrwybQYx1L/5Djd31J7z9Evfq Dg52MtP5diFayTJ56JroVX28Ikrc1Avke/nVOO8= X-Google-Smtp-Source: AKy350bHBFdvUh0o7FzexzJSi0YzEYQ2H2kkK63Sjx1Do4k3mhXAC+IpNwB64vm32oW5j4npWKVT0A== X-Received: by 2002:a05:6a00:15d1:b0:63b:59ad:dbd5 with SMTP id o17-20020a056a0015d100b0063b59addbd5mr5877871pfu.34.1681476792377; Fri, 14 Apr 2023 05:53:12 -0700 (PDT) Received: from alarm.flets-east.jp ([2400:4050:a840:1e00:4457:c267:5e09:481b]) by smtp.gmail.com with ESMTPSA id u21-20020a62ed15000000b00627df85cd72sm2961787pfh.199.2023.04.14.05.53.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Apr 2023 05:53:12 -0700 (PDT) From: Akihiko Odaki To: Cc: dts@dpdk.org, Akihiko Odaki Subject: [PATCH 2/7] Update numpy from 1.18.5 to 1.24.2 Date: Fri, 14 Apr 2023 21:52:50 +0900 Message-Id: <20230414125255.67812-3-akihiko.odaki@daynix.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230414125255.67812-1-akihiko.odaki@daynix.com> References: <20230414125255.67812-1-akihiko.odaki@daynix.com> MIME-Version: 1.0 X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org This includes a fix for Python 3.10: https://github.com/numpy/numpy/pull/16417 Signed-off-by: Akihiko Odaki --- ci/dts_requirements.txt | 2 +- doc/dts_gsg/usr_guide/sys_reqs.rst | 2 +- requirements.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/dts_requirements.txt b/ci/dts_requirements.txt index 0ffeb152..0f665e03 100644 --- a/ci/dts_requirements.txt +++ b/ci/dts_requirements.txt @@ -4,7 +4,7 @@ xlwt==1.3.0 pexpect==4.7.0 -numpy==1.18.5 +numpy==1.24.2 docutils pcapyplus xlrd diff --git a/doc/dts_gsg/usr_guide/sys_reqs.rst b/doc/dts_gsg/usr_guide/sys_reqs.rst index e4682894..876c3476 100644 --- a/doc/dts_gsg/usr_guide/sys_reqs.rst +++ b/doc/dts_gsg/usr_guide/sys_reqs.rst @@ -55,7 +55,7 @@ They are recorded in `requirements.txt`. ... xlwt==1.3.0 pexpect==4.7.0 - numpy==1.18.5 + numpy==1.24.2 docutils pcapyplus xlrd diff --git a/requirements.txt b/requirements.txt index 9668a385..034b717b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ xlwt==1.3.0 pexpect==4.7.0 -numpy==1.18.5 +numpy==1.24.2 docutils pcapyplus xlrd From patchwork Fri Apr 14 12:52:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akihiko Odaki X-Patchwork-Id: 126093 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1328042942; Fri, 14 Apr 2023 14:53:16 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0F60342BB1; Fri, 14 Apr 2023 14:53:16 +0200 (CEST) Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by mails.dpdk.org (Postfix) with ESMTP id 8A3F0400D5 for ; Fri, 14 Apr 2023 14:53:14 +0200 (CEST) Received: by mail-pj1-f49.google.com with SMTP id 98e67ed59e1d1-246fa478d45so575618a91.3 for ; Fri, 14 Apr 2023 05:53:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20221208.gappssmtp.com; s=20221208; t=1681476793; x=1684068793; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nsb/q294Mamfqv+eUA0p1PMxc7C8mQsu5c85G0MyIJA=; b=fCvBNfoPVuJ2cEqcJWFV98GG96seNATPLW1pP/Ds2dluxqQPBP/LuuGHY3itg6itYO 2b7eAB3XhL7T+VXJdM+vDRhNZx0oMTR4gRhHvH/lRvqo07bEce5ll0tiGjs8l2IhZLeq 3h/3PEdOCOf8TlgGjdfTRK6KC7mI4NTEWlNZ48Hy4qONe0wcwxoHCt46iSeXZABrCYh8 Bffzzgz2kBZPFcK4tDLMhdX+/6CLhjO+ATY3csi2qWgu8AbO76Iix4FUqxri670lcedy ELaXvh5w3m0onfz1ecfor/6EjVyuL3QS0/8KKRaAMxfMVJctPiQO7kogrrlhb27X65H4 gvwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681476793; x=1684068793; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nsb/q294Mamfqv+eUA0p1PMxc7C8mQsu5c85G0MyIJA=; b=FnjDBP+UoefTs0iZ6DZ8ADJuaaAu7uoPgTIjuXcXlzBp8+MzAZ7LnC/05p5NY0iIlN 7utOZS2/R9JnhTOb0aCMz0eY20HoIEaMA4iNItOv8X3k5tM7VVlWp7imE7hn7obVE1XJ QCNaxsWa1mTQ/GM32mlDHjn5yIjjsDqQyS3tH6Q6lJLRim7Q4lLyz93UXy3Ipc8Ji5Fj DZ43MLNPLoDsP6zu446NT04VyfzCibk8t0lDl8tFcWMF+QEOE82+QmxnETahnA3TSDW/ 9LbOWMFrnNG55Ue6oZBPuBZU7LSEZ0Ou0O3teZX4IBGcJlGYNkr7jbpSUOYWBhEcQEZU oPiQ== X-Gm-Message-State: AAQBX9d2+bkoiutdvX8BtPNVshX0bDyUyKTm8xroEfBzVUe/yTk+YGGI FKvE3qqp0i7iY0o7MRSEg4rKSw/TtyLWAmG3VIc= X-Google-Smtp-Source: AKy350Yjbz5U304lQ2wQdmgeKiDMK5jGD0AQ0w7FtD4KuE9A2bCdZqWPV/58Ufzb2suLmrgrnOqLKg== X-Received: by 2002:a05:6a00:2449:b0:628:1b3:d499 with SMTP id d9-20020a056a00244900b0062801b3d499mr7931321pfj.21.1681476793692; Fri, 14 Apr 2023 05:53:13 -0700 (PDT) Received: from alarm.flets-east.jp ([2400:4050:a840:1e00:4457:c267:5e09:481b]) by smtp.gmail.com with ESMTPSA id u21-20020a62ed15000000b00627df85cd72sm2961787pfh.199.2023.04.14.05.53.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Apr 2023 05:53:13 -0700 (PDT) From: Akihiko Odaki To: Cc: dts@dpdk.org, Akihiko Odaki Subject: [PATCH 3/7] framework/ssh_pexpect: Remove duplicate regex flags Date: Fri, 14 Apr 2023 21:52:51 +0900 Message-Id: <20230414125255.67812-4-akihiko.odaki@daynix.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230414125255.67812-1-akihiko.odaki@daynix.com> References: <20230414125255.67812-1-akihiko.odaki@daynix.com> MIME-Version: 1.0 X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org The regex pattern "(?i)" sets global re.I flag. Not only the duplicate regex flags are redundant, but the flags not placed at the start of the regex makes it incompatible with Python 3.11, according to: https://docs.python.org/3.11/library/re.html#regular-expression-syntax Signed-off-by: Akihiko Odaki --- framework/ssh_pexpect.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/framework/ssh_pexpect.py b/framework/ssh_pexpect.py index 97406896..2132c066 100644 --- a/framework/ssh_pexpect.py +++ b/framework/ssh_pexpect.py @@ -50,7 +50,7 @@ class SSHPexpect: original_prompt="[$#>]", port=self.port, login_timeout=20, - password_regex=r"(?i)(?:password:)|(?:passphrase for key)|(?i)(password for .+:)", + password_regex=r"(?i)(?:password:)|(?:passphrase for key)|(password for .+:)", ) except Exception as e: print(e) @@ -68,7 +68,7 @@ class SSHPexpect: self.username, self.password, original_prompt="[$#>]", - password_regex=r"(?i)(?:password:)|(?:passphrase for key)|(?i)(password for .+:)", + password_regex=r"(?i)(?:password:)|(?:passphrase for key)|(password for .+:)", ) self.send_expect("stty -echo", "#") self.send_expect("stty columns 1000", "#") From patchwork Fri Apr 14 12:52:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akihiko Odaki X-Patchwork-Id: 126094 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3B89C42941; Fri, 14 Apr 2023 14:53:17 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 36B2542B8C; Fri, 14 Apr 2023 14:53:17 +0200 (CEST) Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by mails.dpdk.org (Postfix) with ESMTP id 09BF5400D5 for ; Fri, 14 Apr 2023 14:53:16 +0200 (CEST) Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-2472a5dbbdcso123153a91.0 for ; Fri, 14 Apr 2023 05:53:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20221208.gappssmtp.com; s=20221208; t=1681476795; x=1684068795; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=bTEK4TFOHsIGTTU0oNUWIQJA9lWS7Cfti5cugJSEuN4=; b=PwN3OSAM35wlVZawxhjZxARjCskgQnnYovO/o6RCaQ59poLUHoKIE62EcDSZY+BwMA 4xDzm+k7HxVJLdxrXjNanqnN13TShmIVRMEh4uLRI+Xwl6APDa7jhmzIDXQH8DrGCBKO MTmOmeAgt1FHk5VqC3E+dTPoUR08eRuU08OD8vZD8LZLxE7E4mea/3Gil/J9mkj8Bopa 4VX9WyRdR8jijTqckm5V1Cvvu4oQspBhKUpLrmemG5AgKE1ISLfy01qSYDEzO9YwuNnU 5fORxljlfjy1UDPoFsAuN7FLq5dzaXeJxBX/FnEwigOMY8AGQ0GI51cLasPgpaKmiNS3 EN/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681476795; x=1684068795; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bTEK4TFOHsIGTTU0oNUWIQJA9lWS7Cfti5cugJSEuN4=; b=beD235aWVYJ5XrVh46OGfRz50DQre/zoK2rGYkgbP05WaKvXqezPxsaD6oxUnuilNA bjPVG+LXLSeHTTifI7pWrPTT/tMVfB+aRzw8rrpmeLkubx9rb9tkOOKBcDzKeAW0X+jN 3NZX0cqpMmIQ+ee0eZACBqvlWK1R539+QSzWpQGR3CDYSLqMTSkXICdo5SO6wbQSZiEZ oPk61x9H3ZADbVzPgBtJU1DPzn9SL8hLHFMfiFcZxQr8vfgFvCXH5r9TJEWb7K1k5tM5 9Yntc3dUTMnFY/KHzbaNEn9Zn/tajhKGVQH8tx63n0ZZRVNr+pbeIwH7oDmwWUQsZvwg I5kA== X-Gm-Message-State: AAQBX9fFj4Nq+W1Pm/YTUSDgbAnFZzrJB55QEn10aBgKMr4uijxq27vp TCi0AI1f6jnDe4tQofE34YrVsYr42RzeOPSvkzk= X-Google-Smtp-Source: AKy350brEkN6zmSEv7R7Mnc1oG2EdoTQutTsIJ5IUZDPYiBGu5QldBC0xEyObzPRKq9ThgEjcIev3Q== X-Received: by 2002:a05:6a00:189f:b0:628:1852:8431 with SMTP id x31-20020a056a00189f00b0062818528431mr8573886pfh.30.1681476795159; Fri, 14 Apr 2023 05:53:15 -0700 (PDT) Received: from alarm.flets-east.jp ([2400:4050:a840:1e00:4457:c267:5e09:481b]) by smtp.gmail.com with ESMTPSA id u21-20020a62ed15000000b00627df85cd72sm2961787pfh.199.2023.04.14.05.53.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Apr 2023 05:53:14 -0700 (PDT) From: Akihiko Odaki To: Cc: dts@dpdk.org, Akihiko Odaki Subject: [PATCH 4/7] framework: Remove unused variable Date: Fri, 14 Apr 2023 21:52:52 +0900 Message-Id: <20230414125255.67812-5-akihiko.odaki@daynix.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230414125255.67812-1-akihiko.odaki@daynix.com> References: <20230414125255.67812-1-akihiko.odaki@daynix.com> MIME-Version: 1.0 X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org Signed-off-by: Akihiko Odaki --- framework/dut.py | 1 - 1 file changed, 1 deletion(-) diff --git a/framework/dut.py b/framework/dut.py index 481c0cb6..87dda906 100644 --- a/framework/dut.py +++ b/framework/dut.py @@ -825,7 +825,6 @@ class Dut(Crb): """ Check that whether auto scanned ports ready to use """ - pci_addr = "%s:%s" % (pci_bus, pci_id) if self.nic_type == "any": return True elif self.nic_type == "cfg": From patchwork Fri Apr 14 12:52:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akihiko Odaki X-Patchwork-Id: 126095 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 69DEF42941; Fri, 14 Apr 2023 14:53:19 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 65B9842C54; Fri, 14 Apr 2023 14:53:19 +0200 (CEST) Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by mails.dpdk.org (Postfix) with ESMTP id 51BD042C54 for ; Fri, 14 Apr 2023 14:53:17 +0200 (CEST) Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-1a67d2601b3so4419515ad.0 for ; Fri, 14 Apr 2023 05:53:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20221208.gappssmtp.com; s=20221208; t=1681476796; x=1684068796; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wzInD470+r5hSOxmm44I1QzAlVJnCocu8eZvnBHJQEk=; b=26COP3CjtZq4jMhkbHLZS6+52rlLTmNc8jFyo2BdbgmlagQMGzkExRgEGM2Y01NriA NyuScOmePzi1Qs+OgDEkhantEof2O4g7TBNOhBCxZwbDbM7NboTxRGfkJbyNJ75OEFcZ Mll/JFa2c/0T2JMTirFsJXHmjI2GlIdgFpX71ot600jD/y3Nf8oi13cYMKFRapSDHBaI 9MEr3HjpgwDe9SgcxOFGl9dEjgzgXeHcQXWy0knKH025vOfNbTCJfWA+T48XgTTnhokz ilNJQzmP674okIN28sKgIMz4S+RI+jnd/6bJ6BHX7RPrudeHQm8L3NGZtLHtEuPg+3ms Iu3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681476796; x=1684068796; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wzInD470+r5hSOxmm44I1QzAlVJnCocu8eZvnBHJQEk=; b=antu8TB3iEFO6Tjpgibns+RiIKPCYRS3HuUS7ITRK5r4LqjkrKnhstqBVqbNeZcHYw xZHFyK9d1Q1L/mYM2D9V3wBVZ2iXzqErDTfomcrlnyCoAy72x2QIDFGbSMJV+fzy8IAo 6+JhxlJImfY33uQutCaCuqbuz1G1V6H8LO7nZQqZnjLIsV7T6Xr97/yx4fqQDLKjbyvS +1gQtD1l5vJYPQPvFYxshg1qjX6d57mY99m0WWKN07qaFvHFm/ruOWSZR9LlySyBRaGM rW9LPcOqwouX9R3aVT+i1P4MeP3K/4Akc7Y6l+OOb7vo3w0CumZtzZwSOG01/VWhISFU AytA== X-Gm-Message-State: AAQBX9fJ68GD8SZ7NFzca/1CFFFkfOIo92sgjxGTzU3I5XqZjJd0JSUl JxmiMCieL/MLfAxrY2CSQsjeBTg5EaC4ScW5/2A= X-Google-Smtp-Source: AKy350YiEClo2odsA0zDkRvvY4NxZbRlF/RBPwHf54eAXOK3itVZzhsBtGfiI7VcyGtmjr2m9fUk8Q== X-Received: by 2002:a05:6a00:1307:b0:62d:cfd4:e440 with SMTP id j7-20020a056a00130700b0062dcfd4e440mr8177639pfu.8.1681476796413; Fri, 14 Apr 2023 05:53:16 -0700 (PDT) Received: from alarm.flets-east.jp ([2400:4050:a840:1e00:4457:c267:5e09:481b]) by smtp.gmail.com with ESMTPSA id u21-20020a62ed15000000b00627df85cd72sm2961787pfh.199.2023.04.14.05.53.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Apr 2023 05:53:16 -0700 (PDT) From: Akihiko Odaki To: Cc: dts@dpdk.org, Akihiko Odaki Subject: [PATCH 5/7] nics/system_info: Accept memory with unknown speed Date: Fri, 14 Apr 2023 21:52:53 +0900 Message-Id: <20230414125255.67812-6-akihiko.odaki@daynix.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230414125255.67812-1-akihiko.odaki@daynix.com> References: <20230414125255.67812-1-akihiko.odaki@daynix.com> MIME-Version: 1.0 X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org A virtual machine may only have memories with unknown speed. Rejecting memories with unknown speed cause an exception in such a case because _strip_memory() expects there is one valid memory at least. Signed-off-by: Akihiko Odaki --- nics/system_info.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nics/system_info.py b/nics/system_info.py index 3e80d4bd..c841a505 100644 --- a/nics/system_info.py +++ b/nics/system_info.py @@ -57,7 +57,7 @@ class SystemInfo(object): speed_regex = r"(\s+)Speed: (.*)" size = "" locate = "" - speed = "Unknown" + speed = None memory_infos = [] memory_channel = set() lines = memories.split("\r\n") @@ -75,10 +75,10 @@ class SystemInfo(object): s_m = re.match(speed_regex, line) if s_m: speed = s_m.group(2) - if speed != "Unknown": + if speed is not None: memory = {"Size": size, "Locate": locate, "Speed": speed} memory_infos.append(memory) - speed = "Unknown" + speed = None total_size += int(size) memory_channel.add(locate[0]) From patchwork Fri Apr 14 12:52:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akihiko Odaki X-Patchwork-Id: 126096 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 94EDF42942; Fri, 14 Apr 2023 14:53:19 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8BD2A42D0E; Fri, 14 Apr 2023 14:53:19 +0200 (CEST) Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by mails.dpdk.org (Postfix) with ESMTP id 85822400D5 for ; Fri, 14 Apr 2023 14:53:18 +0200 (CEST) Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-1a6715ee82fso7839785ad.1 for ; Fri, 14 Apr 2023 05:53:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20221208.gappssmtp.com; s=20221208; t=1681476797; x=1684068797; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+j4P1t+7N9L4AIMo5zHmk3kiR1LDBvTtHmcbp0NDQLw=; b=SIDt3rKLnPIdm+oXa+5hVBUP8eGu1sS1R4asj6jkcRLcI4vnMOZV7TutRj8L9Z+ltW 7m+HbipNfU7cSS9koljjWWKWk/XfkdrlPRW2oknGfu1+sKB7favl1sipXXvjiLGl7udo pyktmT7pb8jl/Ly92vryHWIhs1ejWCPbskYlMZcwqIuXznJfURHTtAA/c1thSkXV0Dp4 +cXDCGTFGeVNdvHzBbqCDkYwChLXQCpas1DAXfxgial3ZTkLS97Jt0cQ90bUgs5rZtfi /hLAJN+MUsV/hJP3DKJkrCgRVRw8U75ZMeaungfmjhIM6czMEH0u7XPlLG4QhKN5RcAf wIww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681476797; x=1684068797; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+j4P1t+7N9L4AIMo5zHmk3kiR1LDBvTtHmcbp0NDQLw=; b=ValZ8+NtbWKyVYsBWutMMu9J9InaIgwF7567/GZ/8954v5AE0sYGahd33ftNCZQxXH bFTCoDWnaLeY/KNMLwUrCiwABs7wk5h2EIBp9ShZ66Jkelu4mCIUuqi/zIBu0L+7HXyF sV4IfkQxAbCF9C6MT57xw6P1q7QRrTweq5i9E/lwhh9MhnkGk7RJHbErAd1nlfhSrqpZ MHwBt9MTQ+QDOZybvSQ4GnzCcffWQAAnjU++NST482VAr9iaVOKIaP+uXhjvLwKANtbY 9715Pvq3SNheymSiKScvtTDbnVw2RucxCi2vx+PJusyse12SzQNFb8WzbsWOgHbNpIDL AIoQ== X-Gm-Message-State: AAQBX9ewZ3wfhtrB3NndXTlaROZAxzw1NlgtQ/tSPhvVU6jp+dhmEFPI g87HvE3aegAThcnBcBCjF14Huc/9G+vyzw1oy60= X-Google-Smtp-Source: AKy350b5Yhb9CTAsCK7UgmrQVz0g8/k6pSytiBuTHETpsY6L8eJVqDrmBL6M+Fgv3NPevExj7mgyxw== X-Received: by 2002:a05:6a00:2e8d:b0:636:f5f4:5308 with SMTP id fd13-20020a056a002e8d00b00636f5f45308mr8821297pfb.7.1681476797698; Fri, 14 Apr 2023 05:53:17 -0700 (PDT) Received: from alarm.flets-east.jp ([2400:4050:a840:1e00:4457:c267:5e09:481b]) by smtp.gmail.com with ESMTPSA id u21-20020a62ed15000000b00627df85cd72sm2961787pfh.199.2023.04.14.05.53.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Apr 2023 05:53:17 -0700 (PDT) From: Akihiko Odaki To: Cc: dts@dpdk.org, Akihiko Odaki Subject: [PATCH 6/7] framework/packet: Fix tcpdump help parse Date: Fri, 14 Apr 2023 21:52:54 +0900 Message-Id: <20230414125255.67812-7-akihiko.odaki@daynix.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230414125255.67812-1-akihiko.odaki@daynix.com> References: <20230414125255.67812-1-akihiko.odaki@daynix.com> MIME-Version: 1.0 X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org tcpdump version 4.99.3 puts several options in one line as follows: > $ tcpdump --help > tcpdump version 4.99.3 > libpcap version 1.10.3 (with TPACKET_V3) > OpenSSL 3.0.5 5 Jul 2022 > Usage: tcpdump [-AbdDefhHIJKlLnNOpqStuUvxX#] [ -B size ] [ -c count ] [--count] > [ -C file_size ] [ -E algo:secret ] [ -F file ] [ -G seconds ] > [ -i interface ] [ --immediate-mode ] [ -j tstamptype ] > [ -M secret ] [ --number ] [ --print ] [ -Q in|out|inout ] > [ -r file ] [ -s snaplen ] [ -T type ] [ --version ] > [ -V file ] [ -w file ] [ -W filecount ] [ -y datalinktype ] > [ --time-stamp-precision precision ] [ --micro ] [ --nano ] > [ -z postrotate-command ] [ -Z user ] [ expression ] This change allows to match a substring representing an option. Signed-off-by: Akihiko Odaki --- framework/packet.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/packet.py b/framework/packet.py index f56bf178..9603ec7b 100644 --- a/framework/packet.py +++ b/framework/packet.py @@ -1099,7 +1099,7 @@ def start_tcpdump(crb, intf, count=0, filters=None, lldp_forbid=True): tcpdump_help = tcpdump_session.send_command("tcpdump -h") for line in tcpdump_help.split("\n"): - m = re.match(direct_param, line) + m = re.search(direct_param, line) if m: opt = re.search("-Q", m.group(2)) if opt: From patchwork Fri Apr 14 12:52:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akihiko Odaki X-Patchwork-Id: 126097 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id BB5DD42941; Fri, 14 Apr 2023 14:53:20 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B5FDB42D0D; Fri, 14 Apr 2023 14:53:20 +0200 (CEST) Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by mails.dpdk.org (Postfix) with ESMTP id 0B1FC400D5 for ; Fri, 14 Apr 2023 14:53:20 +0200 (CEST) Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-2465836870fso1161414a91.2 for ; Fri, 14 Apr 2023 05:53:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20221208.gappssmtp.com; s=20221208; t=1681476799; x=1684068799; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lwpY87yLmwKundUPrfY8XU5xxvrpDaLGTe1UFFQfLHs=; b=WMwRwhaOv4SO3cUGIEjPU69t4Y8nplSEnuxWdexNPDSTXiIeTUcIk3G6v35VP4yuGO xBx5XFqD/bogbYJECi59UGrwubryc7BBoOfveU5yAoJzADRkOEGTkbgEylidS5BBitTq vxG5e18h89FEr3W4QQQ07RbJE6zcdQY64kQx2P0aV5AgwGvg8/FZFtoKRnB68G5SqrAm 03r3JmdJX7BSdT5cze9+ZvPf5I5Ge58nXA4mcnjGRgduhq5hhWbfE/bQlBcs33sgwK7K 6uaGDHfbNVhXorj08XzooeDr9EVgVhARh47syqoE1XZ/peA+gnxCMAw4bSLglHZI3lfK CqKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681476799; x=1684068799; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lwpY87yLmwKundUPrfY8XU5xxvrpDaLGTe1UFFQfLHs=; b=gsvk79xRmqRjomC3TBa3+JrYgqxq7gsGvwofec1ytUITOG3tPRjZbMsv75IzE0uYqP ACiWRzGQdAUngUYwAijnYGITCPFkxKJDM7jjkHIwzeJo/txTVNBK2oorvcPiHzTYiDa1 tXToMagrz6fQsnKmRrYbR3vi0xitT1/h7q3ZOkhsIJi51pxdovcyP9qdaEd1297Vk2RV 6Iskb26NXfKHAtynpgwrXSLVIzAYJc7Q00Q4C8tfAj/J2B+iXWMC8t2w79rRP57ht0TC KaukZJUyZP6KNaNLhuVMxZvB+UNmpjszbFq7B4hEx9eQhR08Il82YmLopoAbhXgp64bh Eg4A== X-Gm-Message-State: AAQBX9fAZsSaeoWTHmoizq40pPgJbOdvinXmP4eTCcsXx2hlv7dvRZMT YYgrwzj3bk9s5Syl7O1Y8qoBSnvyQEQI3dR6HiI= X-Google-Smtp-Source: AKy350b664z0fdGZRKo5HWCCMLcaxxaYBAX3v/+ro99xybpEvQl0CETeY4c7IEA3H8AsukPbMC8rSQ== X-Received: by 2002:a05:6a00:1147:b0:635:c8e4:ed0f with SMTP id b7-20020a056a00114700b00635c8e4ed0fmr7478137pfm.11.1681476799007; Fri, 14 Apr 2023 05:53:19 -0700 (PDT) Received: from alarm.flets-east.jp ([2400:4050:a840:1e00:4457:c267:5e09:481b]) by smtp.gmail.com with ESMTPSA id u21-20020a62ed15000000b00627df85cd72sm2961787pfh.199.2023.04.14.05.53.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Apr 2023 05:53:18 -0700 (PDT) From: Akihiko Odaki To: Cc: dts@dpdk.org, Akihiko Odaki Subject: [PATCH 7/7] tests/ip_pipeline: Use common tcpdump methods Date: Fri, 14 Apr 2023 21:52:55 +0900 Message-Id: <20230414125255.67812-8-akihiko.odaki@daynix.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230414125255.67812-1-akihiko.odaki@daynix.com> References: <20230414125255.67812-1-akihiko.odaki@daynix.com> MIME-Version: 1.0 X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org Signed-off-by: Akihiko Odaki Acked-by: Lijuan Tu --- framework/packet.py | 3 + tests/TestSuite_ip_pipeline.py | 106 +++++++++------------------------ 2 files changed, 32 insertions(+), 77 deletions(-) diff --git a/framework/packet.py b/framework/packet.py index 9603ec7b..a53cef34 100644 --- a/framework/packet.py +++ b/framework/packet.py @@ -1063,6 +1063,9 @@ def get_filter_cmd(filters=[]): elif list(pktfilter["config"].keys())[0] == "dstport": dport = pktfilter["config"]["dstport"] filter_cmd = "dst port %s" % dport + elif list(pktfilter["config"].keys())[0] == "dsthost": + dport = pktfilter["config"]["dsthost"] + filter_cmd = "dst host %s" % dport elif pktfilter["layer"] == "userdefined": if list(pktfilter["config"].keys())[0] == "pcap-filter": filter_cmd = pktfilter["config"]["pcap-filter"] diff --git a/tests/TestSuite_ip_pipeline.py b/tests/TestSuite_ip_pipeline.py index 043516dd..c28622cd 100644 --- a/tests/TestSuite_ip_pipeline.py +++ b/tests/TestSuite_ip_pipeline.py @@ -2,7 +2,6 @@ # Copyright(c) 2010-2018 Intel Corporation # -import re import time from time import sleep @@ -17,48 +16,6 @@ from framework.test_case import TestCase, skip_unsupported_host_driver class TestIPPipeline(TestCase): - def get_flow_direction_param_of_tcpdump(self): - """ - get flow dirction param depend on tcpdump version - """ - param = "" - direct_param = r"(\s+)\[ (\S+) in\|out\|inout \]" - out = self.tester.send_expect("tcpdump -h", "# ") - for line in out.split("\n"): - m = re.match(direct_param, line) - if m: - opt = re.search("-Q", m.group(2)) - if opt: - param = "-Q" + " in" - else: - opt = re.search("-P", m.group(2)) - if opt: - param = "-P" + " in" - if len(param) == 0: - self.logger.info("tcpdump not support direction choice!!!") - return param - - def tcpdump_start_sniff(self, interface, filters=""): - """ - Starts tcpdump in the background to sniff packets that received by interface. - """ - command = "rm -f /tmp/tcpdump_{0}.pcap".format(interface) - self.tester.send_expect(command, "#") - command = "tcpdump -n -e {0} -w /tmp/tcpdump_{1}.pcap -i {1} {2} 2>/tmp/tcpdump_{1}.out &".format( - self.param_flow_dir, interface, filters - ) - self.tester.send_expect(command, "# ") - - def tcpdump_stop_sniff(self): - """ - Stops the tcpdump process running in the background. - """ - self.tester.send_expect("killall tcpdump", "# ") - # For the [pid]+ Done tcpdump... message after killing the process - sleep(1) - self.tester.send_expect('echo "Cleaning buffer"', "# ") - sleep(1) - def write_pcap_file(self, pcap_file, pkts): try: wrpcap(pcap_file, pkts) @@ -74,7 +31,7 @@ class TestIPPipeline(TestCase): return pcap_pkts - def send_and_sniff_pkts(self, from_port, to_port, pcap_file, filters="", count=1): + def send_and_sniff_pkts(self, from_port, to_port, pcap_file, filters=[], count=1): """ Sent pkts that read from the pcap_file. Return the sniff pkts. @@ -85,7 +42,7 @@ class TestIPPipeline(TestCase): tx_interface = self.tester.get_interface(tx_port) rx_interface = self.tester.get_interface(rx_port) - self.tcpdump_start_sniff(rx_interface, filters) + inst = self.tester.tcpdump_sniff_packets(rx_interface, filters=filters) # check that the link status of the port sending the packet is up self.tester.is_interface_up(tx_interface) @@ -100,9 +57,7 @@ class TestIPPipeline(TestCase): ) self.tester.scapy_execute() - self.tcpdump_stop_sniff() - - return self.read_pcap_file("/tmp/tcpdump_%s.pcap" % rx_interface) + return self.tester.load_tcpdump_sniff_packets(inst).pktgen.pkts def setup_env(self, port_nums, driver): """ @@ -217,7 +172,6 @@ class TestIPPipeline(TestCase): self.verify("Error" not in out, "Compilation error") self.app_ip_pipline_path = self.dut.apps_name["ip_pipeline"] self.app_testpmd_path = self.dut.apps_name["test-pmd"] - self.param_flow_dir = self.get_flow_direction_param_of_tcpdump() def set_up(self): """ @@ -261,7 +215,7 @@ class TestIPPipeline(TestCase): pcap_file = "/tmp/route_0.pcap" pkt = [Ether(dst=self.dut_p0_mac) / IP(dst="100.0.0.1") / Raw(load="X" * 26)] self.write_pcap_file(pcap_file, pkt) - filters = "dst host 100.0.0.1" + filters = [{"layer": "network", "config": {"dsthost": "100.0.0.1"}}] sniff_pkts = self.send_and_sniff_pkts(0, 0, pcap_file, filters) dst_mac_list = [] for packet in sniff_pkts: @@ -272,7 +226,7 @@ class TestIPPipeline(TestCase): pcap_file = "/tmp/route_1.pcap" pkt = [Ether(dst=self.dut_p0_mac) / IP(dst="100.64.0.1") / Raw(load="X" * 26)] self.write_pcap_file(pcap_file, pkt) - filters = "dst host 100.64.0.1" + filters = [{"layer": "network", "config": {"dsthost": "100.64.0.1"}}] sniff_pkts = self.send_and_sniff_pkts(0, 1, pcap_file, filters) dst_mac_list = [] for packet in sniff_pkts: @@ -283,7 +237,7 @@ class TestIPPipeline(TestCase): pcap_file = "/tmp/route_2.pcap" pkt = [Ether(dst=self.dut_p0_mac) / IP(dst="100.128.0.1") / Raw(load="X" * 26)] self.write_pcap_file(pcap_file, pkt) - filters = "dst host 100.128.0.1" + filters = [{"layer": "network", "config": {"dsthost": "100.128.0.1"}}] sniff_pkts = self.send_and_sniff_pkts(0, 2, pcap_file, filters) dst_mac_list = [] for packet in sniff_pkts: @@ -294,7 +248,7 @@ class TestIPPipeline(TestCase): pcap_file = "/tmp/route_3.pcap" pkt = [Ether(dst=self.dut_p0_mac) / IP(dst="100.192.0.1") / Raw(load="X" * 26)] self.write_pcap_file(pcap_file, pkt) - filters = "dst host 100.192.0.1" + filters = [{"layer": "network", "config": {"dsthost": "100.192.0.1"}}] sniff_pkts = self.send_and_sniff_pkts(0, 3, pcap_file, filters) dst_mac_list = [] for packet in sniff_pkts: @@ -346,7 +300,7 @@ class TestIPPipeline(TestCase): / Raw(load="X" * 6) ] self.write_pcap_file(pcap_file, pkt) - filters = "dst host 100.0.0.1" + filters = [{"layer": "network", "config": {"dsthost": "100.0.0.1"}}] sniff_pkts = self.send_and_sniff_pkts(0, 0, pcap_file, filters) dst_ip_list = [] for packet in sniff_pkts: @@ -362,7 +316,7 @@ class TestIPPipeline(TestCase): / Raw(load="X" * 6) ] self.write_pcap_file(pcap_file, pkt) - filters = "dst host 100.64.0.1" + filters = [{"layer": "network", "config": {"dsthost": "100.64.0.1"}}] sniff_pkts = self.send_and_sniff_pkts(0, 1, pcap_file, filters) dst_ip_list = [] for packet in sniff_pkts: @@ -378,7 +332,7 @@ class TestIPPipeline(TestCase): / Raw(load="X" * 6) ] self.write_pcap_file(pcap_file, pkt) - filters = "dst host 100.128.0.1" + filters = [{"layer": "network", "config": {"dsthost": "100.128.0.1"}}] sniff_pkts = self.send_and_sniff_pkts(0, 2, pcap_file, filters) dst_ip_list = [] for packet in sniff_pkts: @@ -394,7 +348,7 @@ class TestIPPipeline(TestCase): / Raw(load="X" * 6) ] self.write_pcap_file(pcap_file, pkt) - filters = "dst host 100.192.0.1" + filters = [{"layer": "network", "config": {"dsthost": "100.192.0.1"}}] sniff_pkts = self.send_and_sniff_pkts(0, 3, pcap_file, filters) dst_ip_list = [] for packet in sniff_pkts: @@ -446,7 +400,7 @@ class TestIPPipeline(TestCase): / Raw(load="X" * 6) ] self.write_pcap_file(pcap_file, pkt) - filters = "tcp" + filters = [{"layer": "userdefined", "config": {"pcap-filter": "tcp"}}] sniff_pkts = self.send_and_sniff_pkts(0, 0, pcap_file, filters) dst_ip_list = [] for packet in sniff_pkts: @@ -462,7 +416,7 @@ class TestIPPipeline(TestCase): / Raw(load="X" * 6) ] self.write_pcap_file(pcap_file, pkt) - filters = "tcp" + filters = [{"layer": "userdefined", "config": {"pcap-filter": "tcp"}}] sniff_pkts = self.send_and_sniff_pkts(0, 1, pcap_file, filters) dst_ip_list = [] for packet in sniff_pkts: @@ -478,7 +432,7 @@ class TestIPPipeline(TestCase): / Raw(load="X" * 6) ] self.write_pcap_file(pcap_file, pkt) - filters = "tcp" + filters = [{"layer": "userdefined", "config": {"pcap-filter": "tcp"}}] sniff_pkts = self.send_and_sniff_pkts(0, 2, pcap_file, filters) dst_ip_list = [] for packet in sniff_pkts: @@ -494,7 +448,7 @@ class TestIPPipeline(TestCase): / Raw(load="X" * 6) ] self.write_pcap_file(pcap_file, pkt) - filters = "tcp" + filters = [{"layer": "userdefined", "config": {"pcap-filter": "tcp"}}] sniff_pkts = self.send_and_sniff_pkts(0, 3, pcap_file, filters) dst_ip_list = [] for packet in sniff_pkts: @@ -546,7 +500,7 @@ class TestIPPipeline(TestCase): / Raw(load="X" * 6) ] self.write_pcap_file(pcap_file, pkt) - filters = "tcp" + filters = [{"layer": "userdefined", "config": {"pcap-filter": "tcp"}}] sniff_pkts = self.send_and_sniff_pkts(0, 1, pcap_file, filters) dst_ip_list = [] for packet in sniff_pkts: @@ -562,7 +516,7 @@ class TestIPPipeline(TestCase): / Raw(load="X" * 6) ] self.write_pcap_file(pcap_file, pkt) - filters = "tcp" + filters = [{"layer": "userdefined", "config": {"pcap-filter": "tcp"}}] sniff_pkts = self.send_and_sniff_pkts(1, 0, pcap_file, filters) dst_ip_list = [] for packet in sniff_pkts: @@ -578,7 +532,7 @@ class TestIPPipeline(TestCase): / Raw(load="X" * 6) ] self.write_pcap_file(pcap_file, pkt) - filters = "tcp" + filters = [{"layer": "userdefined", "config": {"pcap-filter": "tcp"}}] sniff_pkts = self.send_and_sniff_pkts(2, 3, pcap_file, filters) dst_ip_list = [] for packet in sniff_pkts: @@ -594,7 +548,7 @@ class TestIPPipeline(TestCase): / Raw(load="X" * 6) ] self.write_pcap_file(pcap_file, pkt) - filters = "tcp" + filters = [{"layer": "userdefined", "config": {"pcap-filter": "tcp"}}] sniff_pkts = self.send_and_sniff_pkts(3, 2, pcap_file, filters) dst_ip_list = [] for packet in sniff_pkts: @@ -680,7 +634,7 @@ class TestIPPipeline(TestCase): / Raw(load="X" * 6) ] self.write_pcap_file(pcap_file, pkt) - filters = "tcp" + filters = [{"layer": "userdefined", "config": {"pcap-filter": "tcp"}}] sniff_pkts = self.send_and_sniff_pkts(0, 1, pcap_file, filters) dst_ip_list = [] for packet in sniff_pkts: @@ -696,7 +650,7 @@ class TestIPPipeline(TestCase): / Raw(load="X" * 6) ] self.write_pcap_file(pcap_file, pkt) - filters = "tcp" + filters = [{"layer": "userdefined", "config": {"pcap-filter": "tcp"}}] sniff_pkts = self.send_and_sniff_pkts(1, 0, pcap_file, filters) dst_ip_list = [] for packet in sniff_pkts: @@ -712,7 +666,7 @@ class TestIPPipeline(TestCase): / Raw(load="X" * 6) ] self.write_pcap_file(pcap_file, pkt) - filters = "tcp" + filters = [{"layer": "userdefined", "config": {"pcap-filter": "tcp"}}] sniff_pkts = self.send_and_sniff_pkts(2, 3, pcap_file, filters) dst_ip_list = [] for packet in sniff_pkts: @@ -728,7 +682,7 @@ class TestIPPipeline(TestCase): / Raw(load="X" * 6) ] self.write_pcap_file(pcap_file, pkt) - filters = "tcp" + filters = [{"layer": "userdefined", "config": {"pcap-filter": "tcp"}}] sniff_pkts = self.send_and_sniff_pkts(3, 2, pcap_file, filters) dst_ip_list = [] for packet in sniff_pkts: @@ -792,7 +746,7 @@ class TestIPPipeline(TestCase): / Raw(load="X" * 6) ] self.write_pcap_file(pcap_file, pkt) - filters = "tcp" + filters = [{"layer": "userdefined", "config": {"pcap-filter": "tcp"}}] sniff_pkts = self.send_and_sniff_pkts(0, 1, pcap_file, filters) dst_ip_list = [] for packet in sniff_pkts: @@ -808,7 +762,7 @@ class TestIPPipeline(TestCase): / Raw(load="X" * 6) ] self.write_pcap_file(pcap_file, pkt) - filters = "tcp" + filters = [{"layer": "userdefined", "config": {"pcap-filter": "tcp"}}] sniff_pkts = self.send_and_sniff_pkts(1, 0, pcap_file, filters) dst_ip_list = [] for packet in sniff_pkts: @@ -824,7 +778,7 @@ class TestIPPipeline(TestCase): / Raw(load="X" * 6) ] self.write_pcap_file(pcap_file, pkt) - filters = "tcp" + filters = [{"layer": "userdefined", "config": {"pcap-filter": "tcp"}}] sniff_pkts = self.send_and_sniff_pkts(2, 3, pcap_file, filters) dst_ip_list = [] for packet in sniff_pkts: @@ -840,7 +794,7 @@ class TestIPPipeline(TestCase): / Raw(load="X" * 6) ] self.write_pcap_file(pcap_file, pkt) - filters = "tcp" + filters = [{"layer": "userdefined", "config": {"pcap-filter": "tcp"}}] sniff_pkts = self.send_and_sniff_pkts(3, 2, pcap_file, filters) dst_ip_list = [] for packet in sniff_pkts: @@ -893,7 +847,7 @@ class TestIPPipeline(TestCase): / Raw(load="X" * 6) ] self.write_pcap_file(pcap_file, pkt) - filters = "tcp" + filters = [{"layer": "userdefined", "config": {"pcap-filter": "tcp"}}] sniff_pkts = self.send_and_sniff_pkts(0, 1, pcap_file, filters) dst_ip_list = [] for packet in sniff_pkts: @@ -909,7 +863,7 @@ class TestIPPipeline(TestCase): / Raw(load="X" * 6) ] self.write_pcap_file(pcap_file, pkt) - filters = "tcp" + filters = [{"layer": "userdefined", "config": {"pcap-filter": "tcp"}}] sniff_pkts = self.send_and_sniff_pkts(1, 0, pcap_file, filters) dst_ip_list = [] for packet in sniff_pkts: @@ -1041,8 +995,6 @@ class TestIPPipeline(TestCase): """ Run after each test case. """ - # kill all tcpdump - self.tcpdump_stop_sniff() # close app self.dut.send_expect("^C", "# ") self.dut.kill_all()