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 4D85529D2 for ; Wed, 23 Jan 2019 09:39:29 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 Jan 2019 00:39:29 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,510,1539673200"; d="scan'208";a="111962634" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by orsmga008.jf.intel.com with ESMTP; 23 Jan 2019 00:39:28 -0800 Received: from shsmsx104.ccr.corp.intel.com (10.239.4.70) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.408.0; Wed, 23 Jan 2019 00:39:27 -0800 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.63]) by SHSMSX104.ccr.corp.intel.com ([169.254.5.159]) with mapi id 14.03.0415.000; Wed, 23 Jan 2019 16:39:25 +0800 From: "Zhu, WenhuiX" 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: AQHUstQm8MrcqHcS6UC8Hd4MYnLQHKW8iFvA Date: Wed, 23 Jan 2019 08:39:24 +0000 Message-ID: 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: 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/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, 23 Jan 2019 08:39:30 -0000 Tested-by: Zhu, WenhuiX -----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 dpdk = file due to dpdk move macswap workload, so we need to add fack mac in different = dpdk file, you refer to dpdk commit a825afdbb Signed-off-by: zhao,meijuan --- tests/TestSuite_vf_daemon.py | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/tests/TestSuite_vf_daemon.py b/tests/TestSuite_vf_daemon.py in= dex 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, 0x11,= 0x22, 0x33, 0x44, 0x55},};'" +\ - " app/test-pmd/macswap.c", "# ", 30) - self.vm0_dut.send_expect("sed -i -e '/ether_addr_copy(&addr, ð_= 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 {0x0= 0, 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_mac= , ð_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/macsw= ap.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_add= r, ð_hdr->d_addr);/a " +\ - "\ether_addr_copy(&addr, ð_hdr->s_addr);' app/test-pmd/macs= wap.c", "# ", 30) + "{0x00, 0x11, 0x22, 0x33, 0x44, 0x55},};/d' app/test-pmd/macsw= ap_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