From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 238E7A00E6 for ; Tue, 11 Jun 2019 08:34:13 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D0CA51C26D; Tue, 11 Jun 2019 08:34:12 +0200 (CEST) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by dpdk.org (Postfix) with ESMTP id 8E3211C260 for ; Tue, 11 Jun 2019 08:34:11 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Jun 2019 23:34:10 -0700 X-ExtLoop1: 1 Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by fmsmga006.fm.intel.com with ESMTP; 10 Jun 2019 23:34:10 -0700 Received: from fmsmsx154.amr.corp.intel.com (10.18.116.70) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.408.0; Mon, 10 Jun 2019 23:34:10 -0700 Received: from shsmsx107.ccr.corp.intel.com (10.239.4.96) by FMSMSX154.amr.corp.intel.com (10.18.116.70) with Microsoft SMTP Server (TLS) id 14.3.408.0; Mon, 10 Jun 2019 23:34:10 -0700 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.134]) by SHSMSX107.ccr.corp.intel.com ([169.254.9.98]) with mapi id 14.03.0415.000; Tue, 11 Jun 2019 14:34:08 +0800 From: "Yao, BingX Y" To: "Ma, LihongX" , "dts@dpdk.org" CC: "Ma, LihongX" Thread-Topic: [dts] [PATCH V1] tests: judge tcpdump version when use flow direction params Thread-Index: AQHVIB8R3Gv5FMoXPUmMRdc7VBDRl6aV/wKA Date: Tue, 11 Jun 2019 06:34:08 +0000 Message-ID: <95BCD24840F32441BEA74E0F8A31839E04F3DB50@shsmsx102.ccr.corp.intel.com> References: <1560208062-10120-1-git-send-email-lihongx.ma@intel.com> In-Reply-To: <1560208062-10120-1-git-send-email-lihongx.ma@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dts] [PATCH V1] tests: judge tcpdump version when use flow direction params X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "dts" Tested-by: Yao, BingX Y -----Original Message----- From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of lihong Sent: Tuesday, June 11, 2019 7:08 AM To: dts@dpdk.org Cc: Ma, LihongX Subject: [dts] [PATCH V1] tests: judge tcpdump version when use flow direct= ion params The params of flow direction in tcpdump is varied by tcpdump version. So add function to get the param base on the version. Signed-off-by: lihong --- tests/TestSuite_flow_classify_softnic.py | 27 +++++++++++++++++++++++++-- tests/TestSuite_ip_pipeline.py | 27 +++++++++++++++++++++++++-- 2 files changed, 50 insertions(+), 4 deletions(-) diff --git a/tests/TestSuite_flow_classify_softnic.py b/tests/TestSuite_flo= w_classify_softnic.py index 9b339ca..88dcc7e 100644 --- a/tests/TestSuite_flow_classify_softnic.py +++ b/tests/TestSuite_flow_classify_softnic.py @@ -120,14 +120,35 @@ class TestFlowClassifySoftnic(TestCase): command =3D "sed -i \'/^table action/a" + cmd + "\' ./drivers/net/= softnic/flow_classify_softnic/%s" % filename self.dut.send_expect(command, "# ", 20) =20 + def get_flow_direction_param_of_tcpdump(self): + """ + get flow dirction param depend on tcpdump version + """ + param =3D "" + direct_param =3D r"(\s+)\[ (\S+) in\|out\|inout \]" + out =3D self.tester.send_expect('tcpdump -h', '# ') + for line in out.split('\n'): + m =3D re.match(direct_param, line) + if m: + opt =3D re.search("-Q", m.group(2)); + if opt: + param =3D "-Q" + " in" + else: + opt =3D re.search("-P", m.group(2)); + if opt: + param =3D "-P" + " in" + if len(param) =3D=3D 0: + self.logger.info("tcpdump not support direction choice!!!") + return param + def tcpdump_start_sniff(self, interface, filters=3D""): """ Starts tcpdump in the background to sniff packets that received by= interface. """ command =3D 'rm -f /tmp/tcpdump_{0}.pcap'.format(interface) self.tester.send_expect(command, '#') - command =3D 'tcpdump -n -e -Q in -w /tmp/tcpdump_{0}.pcap -i {0} {= 1} 2>/tmp/tcpdump_{0}.out &'\ - .format(interface, filters) + command =3D '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, '# ') =20 def tcpdump_stop_sniff(self): @@ -373,6 +394,8 @@ class TestFlowClassifySoftnic(TestCase): self.tester_itf =3D self.tester.get_interface(localPort) self.copy_config_files_to_dut() =20 + self.param_flow_dir =3D=20 + self.get_flow_direction_param_of_tcpdump() + def set_up(self): """ Run before each test case. diff --git a/tests/TestSuite_ip_pipeline.py b/tests/TestSuite_ip_pipeline.p= y index 390c69d..f05b5cd 100644 --- a/tests/TestSuite_ip_pipeline.py +++ b/tests/TestSuite_ip_pipeline.py @@ -64,14 +64,35 @@ from scapy.sendrecv import sendp =20 class TestIPPipeline(TestCase): =20 + def get_flow_direction_param_of_tcpdump(self): + """ + get flow dirction param depend on tcpdump version + """ + param =3D "" + direct_param =3D r"(\s+)\[ (\S+) in\|out\|inout \]" + out =3D self.tester.send_expect('tcpdump -h', '# ') + for line in out.split('\n'): + m =3D re.match(direct_param, line) + if m: + opt =3D re.search("-Q", m.group(2)); + if opt: + param =3D "-Q" + " in" + else: + opt =3D re.search("-P", m.group(2)); + if opt: + param =3D "-P" + " in" + if len(param) =3D=3D 0: + self.logger.info("tcpdump not support direction choice!!!") + return param + def tcpdump_start_sniff(self, interface, filters=3D""): """ Starts tcpdump in the background to sniff packets that received by= interface. """ command =3D 'rm -f /tmp/tcpdump_{0}.pcap'.format(interface) self.tester.send_expect(command, '#') - command =3D 'tcpdump -n -e -Q in -w /tmp/tcpdump_{0}.pcap -i {0} {= 1} 2>/tmp/tcpdump_{0}.out &'\ - .format(interface, filters) + command =3D '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, '# ') =20 def tcpdump_stop_sniff(self): @@ -202,6 +223,8 @@ class TestIPPipeline(TestCase): out =3D self.dut.build_dpdk_apps("./examples/ip_pipeline") self.verify("Error" not in out, "Compilation error") =20 + self.param_flow_dir =3D=20 + self.get_flow_direction_param_of_tcpdump() + def set_up(self): """ Run before each test case. -- 2.7.4