From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by dpdk.org (Postfix) with ESMTP id A547A1B136 for ; Wed, 30 Jan 2019 04:33:07 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Jan 2019 19:33:05 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,539,1539673200"; d="scan'208";a="139959573" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by fmsmga004.fm.intel.com with ESMTP; 29 Jan 2019 19:33:05 -0800 Received: from fmsmsx118.amr.corp.intel.com (10.18.116.18) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.408.0; Tue, 29 Jan 2019 19:33:05 -0800 Received: from shsmsx108.ccr.corp.intel.com (10.239.4.97) by fmsmsx118.amr.corp.intel.com (10.18.116.18) with Microsoft SMTP Server (TLS) id 14.3.408.0; Tue, 29 Jan 2019 19:33:04 -0800 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.110]) by SHSMSX108.ccr.corp.intel.com ([169.254.8.36]) with mapi id 14.03.0415.000; Wed, 30 Jan 2019 11:33:02 +0800 From: "Tu, Lijuan" To: "Zhao, MeijuanX" , "dts@dpdk.org" CC: "Zhao, MeijuanX" Thread-Topic: [dts] [PATCH V1] tests/vf daemon : add fake mac in different dpdk file Thread-Index: AQHUstQmaI3BI99QhkSp5aP34Kr/naXHMzZA Date: Wed, 30 Jan 2019 03:33:02 +0000 Message-ID: <8CE3E05A3F976642AAB0F4675D0AD20E0BA1ECBE@SHSMSX101.ccr.corp.intel.com> References: <1548217937-22095-1-git-send-email-meijuanx.zhao@intel.com> In-Reply-To: <1548217937-22095-1-git-send-email-meijuanx.zhao@intel.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.0.400.15 dlp-reaction: no-action x-ctpclassification: CTP_NT x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiOGQxNWE3YTMtNjVlZC00NjYyLTk3ZTItYjc1YThhMmRjMGQwIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoidU9TN1VzejduU21OamNjaWRVU1dDcTBxc29qTmxYdE94RG1xclNwNkt5ZmZibk93cUdRcGNOQ1d0bnVxS0hPeiJ9 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/vf daemon : add fake mac in different dpdk file 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: Wed, 30 Jan 2019 03:33:08 -0000 Applied, but prefer to not change any dpdk code. > -----Original Message----- > From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of zhao,meijuan > Sent: Wednesday, January 23, 2019 12:32 PM > To: dts@dpdk.org > Cc: Zhao, MeijuanX > Subject: [dts] [PATCH V1] tests/vf daemon : add fake mac in different dpd= k file >=20 > due to dpdk move macswap workload, so we need to add fack mac in differen= t > dpdk file, you refer to dpdk commit a825afdbb >=20 > Signed-off-by: zhao,meijuan > --- > tests/TestSuite_vf_daemon.py | 21 +++++++++------------ > 1 file changed, 9 insertions(+), 12 deletions(-) >=20 > diff --git a/tests/TestSuite_vf_daemon.py b/tests/TestSuite_vf_daemon.py > index 42a14e5..2a8baf8 100644 > --- a/tests/TestSuite_vf_daemon.py > +++ b/tests/TestSuite_vf_daemon.py > @@ -486,13 +486,12 @@ class Testvf_daemon(TestCase): > """ > fake_mac =3D '00:11:22:33:44:55' > time.sleep(5) > - self.vm0_dut.send_expect("sed -i -e '/uint64_t ol_flags =3D 0;/a= " +\ > - "\struct ether_addr fake_mac =3D {.addr_bytes =3D {0x00, 0x1= 1, 0x22, 0x33, > 0x44, 0x55},};'" +\ > - " app/test-pmd/macswap.c", "# ", 30) > - self.vm0_dut.send_expect("sed -i -e '/ether_addr_copy(&addr, &et= h_hdr- > >s_addr);/d' " +\ > - " app/test-pmd/macswap.c", "# ", 30) > - self.vm0_dut.send_expect("sed -i -e '/ether_addr_copy(ð_hdr->= s_addr, > ð_hdr->d_addr);/a " +\ > - "\ether_addr_copy(&fake_mac, ð_hdr->s_addr);' app/test- > pmd/macswap.c", "# ", 30) > + self.vm0_dut.send_expect("sed -i -e '/int r;/a " +\ > + "\ struct ether_addr fake_mac =3D {.addr_bytes =3D {0= x00, 0x11, 0x22, > 0x33, 0x44, 0x55},};'" +\ > + " app/test-pmd/macswap_sse.h", "# ", 30) > + line_num =3D self.vm0_dut.send_expect("sed -n '/_mm_storeu_si128= /=3D' > app/test-pmd/macswap_sse.h |sed -n 5p", "# ",30) > + self.vm0_dut.send_expect("sed -i -e '%sa\ether_addr_copy(&fake_m= ac, > ð_hdr[0]->s_addr);'" % str(line_num)+\ > + " app/test-pmd/macswap_sse.h", "# ", 30) > time.sleep(3) >=20 > self.vm0_dut.build_install_dpdk(self.target) > @@ -527,11 +526,9 @@ class Testvf_daemon(TestCase): > self.vm0_testpmd.quit() > self.dut_testpmd.quit() > self.vm0_dut.send_expect("sed -i '/struct ether_addr fake_mac = =3D > {.addr_bytes =3D " +\ > - "{0x00, 0x11, 0x22, 0x33, 0x44, 0x55},};/d' app/test-pmd/mac= swap.c", > "# ", 30) > - self.vm0_dut.send_expect("sed -i '/ether_addr_copy(&fake_mac, > ð_hdr->s_addr);/d' " +\ > - "app/test-pmd/macswap.c", "# ", 30) > - self.vm0_dut.send_expect("sed -i '/ether_addr_copy(ð_hdr->s_a= ddr, > ð_hdr->d_addr);/a " +\ > - "\ether_addr_copy(&addr, ð_hdr->s_addr);' app/test- > pmd/macswap.c", "# ", 30) > + "{0x00, 0x11, 0x22, 0x33, 0x44, 0x55},};/d' app/test- > pmd/macswap_sse.h", "# ", 30) > + self.vm0_dut.send_expect("sed -i '%sd'" % line_num +\ > + " app/test-pmd/macswap_sse.h", "# ", 30) > self.vm0_dut.build_install_dpdk(self.target) >=20 >=20 > -- > 2.17.2