From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0089.outbound.protection.outlook.com [104.47.2.89]) by dpdk.org (Postfix) with ESMTP id 3E3721BBAA for ; Thu, 12 Apr 2018 09:38:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector1-arm-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=S39XZcAXPZdOZX7YMVgCo5iQOx64cyk7WJvZWgsZg/Q=; b=WPSceGkrdOG8Jc7uG3ijiwxGLfgPA4W8ozgQC0nxlPMwXQra4bRDk5JeOTrmwe/nW6/9Zzjr1d7dPNUtnU2mDfWFnjGPk7z9LXlCrq3jhHdnWxCF4TVLUeYFlH6L7IJRMjjwUb94s0b5xYC9GOzdQqgX/+ECma4UKl149oysBEM= Received: from AM4PR08MB0913.eurprd08.prod.outlook.com (10.166.133.135) by AM4PR08MB0932.eurprd08.prod.outlook.com (10.166.133.142) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.675.10; Thu, 12 Apr 2018 07:38:32 +0000 Received: from AM4PR08MB0913.eurprd08.prod.outlook.com ([fe80::5c6b:4c21:c94d:930]) by AM4PR08MB0913.eurprd08.prod.outlook.com ([fe80::5c6b:4c21:c94d:930%3]) with mapi id 15.20.0675.009; Thu, 12 Apr 2018 07:38:31 +0000 From: Phil Yang To: "Liu, Yong" , "dts@dpdk.org" CC: nd Thread-Topic: [PATCH v3 01/17] framwork/packet: sniff_packet specify running target support Thread-Index: AQHTyjU1/OS+Q60M60Sohrb6BfABsKPv9YUAgAA0hoCABkk9AIAGWLkA Date: Thu, 12 Apr 2018 07:38:31 +0000 Message-ID: References: <1522406469-9251-1-git-send-email-phil.yang@arm.com> <1522640786-26646-1-git-send-email-phil.yang@arm.com> <86228AFD5BCD8E4EBFD2B90117B5E81E62FE1D1E@SHSMSX103.ccr.corp.intel.com> <86228AFD5BCD8E4EBFD2B90117B5E81E62FF6B96@SHSMSX103.ccr.corp.intel.com> In-Reply-To: <86228AFD5BCD8E4EBFD2B90117B5E81E62FF6B96@SHSMSX103.ccr.corp.intel.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Phil.Yang@arm.com; x-originating-ip: [113.29.88.7] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM4PR08MB0932; 7:9wNphbioyZ0WKepCrtBq5rzsXTruNfL01Y/iFj8oRTv4xflpgoWaoOfvpVUizWsbKSB9NRO1p/anpdZUnLH7EiHLGfF8WF+fmu7+OJnzW1mpiZzBqjGPNdg9KQ2XRBne1Wajeiqa1ptmGVd6AUl8EOXwcoRj1X2r+MCIzRaCBsmdZGyOL7XdV7eReu4Si97cSiv7WrCN0fLrAmOp7Xs9aUz38gWEuTH8ODJCItvC4qvCEyNewydZkjbraHUWnYuY x-ms-exchange-antispam-srfa-diagnostics: SOS; x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(48565401081)(2017052603328)(7153060)(7193020); SRVR:AM4PR08MB0932; x-ms-traffictypediagnostic: AM4PR08MB0932: nodisclaimer: True x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(180628864354917)(228905959029699); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(3231221)(944501327)(52105095)(3002001)(10201501046)(6055026)(6041310)(20161123562045)(20161123558120)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:AM4PR08MB0932; BCL:0; PCL:0; RULEID:; SRVR:AM4PR08MB0932; x-forefront-prvs: 06400060E1 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(979002)(39380400002)(366004)(396003)(346002)(39860400002)(376002)(199004)(13464003)(189003)(55236004)(102836004)(186003)(6246003)(7696005)(86362001)(11346002)(446003)(476003)(2501003)(486006)(6116002)(26005)(3846002)(53546011)(551544002)(316002)(4326008)(66066001)(5250100002)(53936002)(14454004)(25786009)(99286004)(76176011)(110136005)(93886005)(478600001)(229853002)(2906002)(74316002)(97736004)(5660300001)(8936002)(68736007)(9686003)(106356001)(105586002)(33656002)(305945005)(3280700002)(8676002)(81166006)(59450400001)(81156014)(55016002)(6436002)(2900100001)(6506007)(3660700001)(7736002)(72206003)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM4PR08MB0932; H:AM4PR08MB0913.eurprd08.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: arm.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: Kjk7LkemEqkafVIfvNcuD1cCld2y/NfetzxE3hDUlIs+zQoYgessiE3WcIHCzUyaE3dqzDy4yR3Fp7wKwmPFCoAES9k9OBlV08hliZ/M5sjCP4W7K13zKdH+H7/aOcM3YR+zv9YvU43M5UyS9Qi+g7J3pTOEeM2D+7mut7Xs70bqNq2uUO8eCtCTyZ7GZ6RF spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 46405090-6156-4ae3-84ae-08d5a04863d6 X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-Network-Message-Id: 46405090-6156-4ae3-84ae-08d5a04863d6 X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Apr 2018 07:38:31.4948 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR08MB0932 Subject: Re: [dts] [PATCH v3 01/17] framwork/packet: sniff_packet specify running target support 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: , X-List-Received-Date: Thu, 12 Apr 2018 07:38:34 -0000 Hi Marvin, Great idea! I'll Update it. After test, I'll upstream the patch ASAP. BTW, Can I just upstream this single patch as V4? Because other files are k= eep unchanged.=20 Thanks, Phil Yang > -----Original Message----- > From: Liu, Yong > Sent: Sunday, April 8, 2018 2:36 PM > To: Phil Yang ; dts@dpdk.org > Cc: nd > Subject: RE: [PATCH v3 01/17] framwork/packet: sniff_packet specify runni= ng > target support >=20 > Hi Phil, > I think it will be too complicated for each suite handle the temporary pc= ap file. > Packet module is just designed for this kind of purpose. > There's only need few changes on your v3 patch for fulfilling the need. >=20 > Logic for load_tcpdump_sniff_pcap will be pretty clear: >=20 > pcap =3D load_pcap_f(index) # just stop sniff process > self.session.copy_file_from(pcap) # copy from tester to self CRB > return pcap.split(os.sep)[-1] # return filename >=20 > As to load_tcpdump_sniff_packets, I think this function should be revised= since > pcap file only available after ssh copy. >=20 > file=3Dself.load_tcpdump_sniff_pcap(index) > return packet.load_pcapfile(file) >=20 > You may also need to remove load_sniff_packets function in packet module = as it > will be useless. >=20 > Thanks, > Marvin >=20 > > -----Original Message----- > > From: Phil Yang [mailto:Phil.Yang@arm.com] > > Sent: Wednesday, April 04, 2018 3:27 PM > > To: Liu, Yong ; dts@dpdk.org > > Cc: nd > > Subject: RE: [PATCH v3 01/17] framwork/packet: sniff_packet specify > > running target support > > > > Hi Marvin, > > > > > Filename will be return after running load_pcap_f function, please > > > use > > that > > > name. > > > It can be multiple sniffer functions work in the same time. > > > > If so, I think it is better to copy sniffer pcap file outside > > load_tcpdump_sniff_pcap and load_tcpdump_sniff_packets function of > > tester module. > > I was planning to do it that way in patch V2, but it is need to add > > tester.session.copy_file_from() operation in each test case. > > > > Can I roll back to patch V2? > > > > Thanks, > > Phil Yang > > > > > -----Original Message----- > > > From: Liu, Yong > > > Sent: Wednesday, April 4, 2018 11:28 AM > > > To: Phil Yang ; dts@dpdk.org > > > Cc: nd > > > Subject: RE: [PATCH v3 01/17] framwork/packet: sniff_packet specify > > running > > > target support > > > > > > Phil, > > > Some comments are inline. > > > > > > Thanks, > > > Marvin > > > > > > > -----Original Message----- > > > > From: Phil Yang [mailto:phil.yang@arm.com] > > > > Sent: Monday, April 02, 2018 11:46 AM > > > > To: dts@dpdk.org > > > > Cc: nd@arm.com; Liu, Yong ; phil.yang@arm.com > > > > Subject: [PATCH v3 01/17] framwork/packet: sniff_packet specify > > > > running target support > > > > > > > > If tester in crb file was not the machine which running dts, the > > > > sniff_packet process will not running on tester. > > > > > > > > Create a ssh connection to the tester and run tcpdump to make sure > > > > sniff_packet process running on the machine we expected. > > > > > > > > Signed-off-by: Phil Yang > > > > --- > > > > framework/packet.py | 34 ++++++++++++++++++++++++++++------ > > > > framework/tester.py | 38 ++++++++++++++++++++++++++++++++++++++ > > > > 2 files changed, 66 insertions(+), 6 deletions(-) > > > > > > > > diff --git a/framework/packet.py b/framework/packet.py index > > > > 976b82b..484e511 100755 > > > > --- a/framework/packet.py > > > > +++ b/framework/packet.py > > > > @@ -812,15 +812,30 @@ def get_filter_cmd(filters=3D[]): > > > > return "" > > > > > > > > > > > > -def sniff_packets(intf, count=3D0, timeout=3D5, filters=3D[]): > > > > +def sniff_packets(intf, count=3D0, timeout=3D5, filters=3D[], targ= et=3D[]): > > > > """ > > > > sniff all packets for certain port in certain seconds > > > > """ > > > > param =3D "" > > > > direct_param =3D r"(\s+)\[ (\S+) in\|out\|inout \]" > > > > - tcpdump_help =3D subprocess.check_output("tcpdump -h; echo 0", > > > > - stderr=3Dsubprocess.STD= OUT, > > > > - shell=3DTrue) > > > > + > > > > + # target[] contain the remote machine info for ssh connection > > > > + # target[0]: username > > > > + # target[1]: ip address > > > > + # target[2]: pass word > > > > + if target: > > > > + tcpdump_help_pipe =3D subprocess.Popen(["ssh", > > > > + "%s@%s" % (target[0], target[1]), > > > > + "tcpdump -h"], > > > > + stderr=3Dsubprocess.PIPE, > > > > + stdout=3Dsubprocess.PIPE, > > > > + shell=3DFalse) > > > > + tcpdump_help =3D "".join(tuple(tcpdump_help_pipe.communica= te())) > > > > + tcpdump_help_pipe.wait() > > > > + else: > > > > + tcpdump_help =3D subprocess.check_output("tcpdump -h; echo= 0", > > > > + stderr=3Dsubprocess.STDOUT, > > > > + shell=3DTrue) > > > > + > > > > for line in tcpdump_help.split('\n'): > > > > m =3D re.match(direct_param, line) > > > > if m: > > > > @@ -850,9 +865,16 @@ def sniff_packets(intf, count=3D0, timeout=3D5= , > > > > filters=3D[]): > > > > else: > > > > cmd =3D sniff_cmd % options > > > > > > > > - args =3D shlex.split(cmd) > > > > + if target: > > > > + pipe =3D subprocess.Popen(["ssh", > > > > + "%s@%s" % (target[0], target[1]), > > > > + cmd], > > > > + stdin=3Dsubprocess.PIPE, > > > > + shell=3DFalse) > > > > + else: > > > > + args =3D shlex.split(cmd) > > > > + pipe =3D subprocess.Popen(args) > > > > > > > > - pipe =3D subprocess.Popen(args) > > > > index =3D str(time.time()) > > > > SNIFF_PIDS[index] =3D (pipe, intf, timeout) > > > > time.sleep(1) > > > > diff --git a/framework/tester.py b/framework/tester.py index > > > > a775f68..10761a8 100755 > > > > --- a/framework/tester.py > > > > +++ b/framework/tester.py > > > > @@ -70,6 +70,7 @@ class Tester(Crb): > > > > self.bgCmds =3D [] > > > > self.bgItf =3D '' > > > > self.re_run_time =3D 0 > > > > + self.sniff_intf =3D '' > > > > > > > > def init_ext_gen(self): > > > > """ > > > > @@ -704,6 +705,43 @@ class Tester(Crb): > > > > self.proc.kill() > > > > self.proc =3D None > > > > > > > > + def tcpdump_sniff_packets(self, intf, count=3D0, timeout=3D5, > > filters=3D[]): > > > > + """ > > > > + Wrapper for packet module sniff_packets > > > > + """ > > > > + # load functions in packet module > > > > + module =3D __import__("packet") > > > > + sniff_f =3D getattr(module, "sniff_packets") > > > > + > > > > + target=3D[] > > > > + target.append(self.get_username()) > > > > + target.append(self.get_ip_address()) > > > > + target.append(self.get_password()) > > > > + self.sniff_intf =3D intf > > > > > > Indent not align here, and I think there's no need to save sniffer > > interface in this > > > module. > > > > > > > + return sniff_f(intf, count, timeout, filters, target) > > > > + > > > > + def load_tcpdump_sniff_pcap(self, index=3D''): > > > > + """ > > > > + Wrapper for packet module load_sniff_pcap > > > > + """ > > > > + # load functions in packet module > > > > + module =3D __import__("packet") > > > > + load_pcap_f =3D getattr(module, "load_sniff_pcap") > > > > + self.session.copy_file_from("/tmp/sniff_%s.pcap" % > > > > +self.sniff_intf, > > > > "/tmp/") > > > > + > > > > > > Filename will be return after running load_pcap_f function, please > > > use > > that > > > name. > > > It can be multiple sniffer functions work in the same time. > > > > > > > + return load_pcap_f(index) > > > > + > > > > + def load_tcpdump_sniff_packets(self, index=3D''): > > > > + """ > > > > + Wrapper for packet module load_sniff_packets > > > > + """ > > > > + # load functions in packet module > > > > + module =3D __import__("packet") > > > > + load_f =3D getattr(module, "load_sniff_packets") > > > > + self.session.copy_file_from("/tmp/sniff_%s.pcap" % > > > > +self.sniff_intf, > > > > "/tmp/") > > > > + > > > > + return load_f(index) > > > > + > > > > def kill_all(self, killall=3DFalse): > > > > """ > > > > Kill all scapy process or DPDK application on tester. > > > > -- > > > > 2.7.4