[dts] [PATCH V2] tests/vf_daemon: add rte prefix to ether structures

[dts] [PATCH V2] tests/vf_daemon: add rte prefix to ether structures

[lihong]

As dpdk commit: 6d13ea8e8e49ab9, add 'rte_' prefix to structures ether_addr;
so change our code related it.

Signed-off-by: lihong <lihongx.ma@intel.com>
---
 tests/TestSuite_vf_daemon.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/TestSuite_vf_daemon.py b/tests/TestSuite_vf_daemon.py
index 2d5c59f..cc55f65 100644
--- a/tests/TestSuite_vf_daemon.py
+++ b/tests/TestSuite_vf_daemon.py
@@ -487,10 +487,10 @@ class TestVfDaemon(TestCase):
         fake_mac = '00:11:22:33:44:55'
         time.sleep(5)
         self.vm0_dut.send_expect("sed -i -e '/int r;/a " +\
-            "\        struct ether_addr fake_mac = {.addr_bytes = {0x00, 0x11, 0x22, 0x33, 0x44, 0x55},};'" +\
+            "\        struct rte_ether_addr fake_mac = {.addr_bytes = {0x00, 0x11, 0x22, 0x33, 0x44, 0x55},};'" +\
             " app/test-pmd/macswap_sse.h", "# ", 30)
         line_num = self.vm0_dut.send_expect("sed -n '/_mm_storeu_si128/=' app/test-pmd/macswap_sse.h |sed -n 5p", "# ",30)
-        self.vm0_dut.send_expect("sed -i -e '%sa\ether_addr_copy(&fake_mac, &eth_hdr[0]->s_addr);'" % str(line_num)+\
+        self.vm0_dut.send_expect("sed -i -e '%sa\\rte_ether_addr_copy(&fake_mac, &eth_hdr[0]->s_addr);'" % str(line_num)+\
                     " app/test-pmd/macswap_sse.h", "# ", 30)
         time.sleep(3)
 
@@ -525,7 +525,7 @@ class TestVfDaemon(TestCase):
 
         self.vm0_testpmd.quit()
         self.dut_testpmd.quit()
-        self.vm0_dut.send_expect("sed -i '/struct ether_addr fake_mac = {.addr_bytes = " +\
+        self.vm0_dut.send_expect("sed -i '/struct rte_ether_addr fake_mac = {.addr_bytes = " +\
             "{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)
-- 
2.7.4

Re: [dts] [PATCH V2] tests/vf_daemon: add rte prefix to ether structures

[Tu, Lijuan]

Applied, thanks

> -----Original Message-----
> From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of lihong
> Sent: Friday, May 31, 2019 10:11 AM
> To: dts@dpdk.org
> Cc: Zhang, YanX A <yanx.a.zhang@intel.com>; Ma, LihongX
> <lihongx.ma@intel.com>
> Subject: [dts] [PATCH V2] tests/vf_daemon: add rte prefix to ether structures
> 
> As dpdk commit: 6d13ea8e8e49ab9, add 'rte_' prefix to structures
> ether_addr; so change our code related it.
> 
> Signed-off-by: lihong <lihongx.ma@intel.com>
> ---
>  tests/TestSuite_vf_daemon.py | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/tests/TestSuite_vf_daemon.py b/tests/TestSuite_vf_daemon.py
> index 2d5c59f..cc55f65 100644
> --- a/tests/TestSuite_vf_daemon.py
> +++ b/tests/TestSuite_vf_daemon.py
> @@ -487,10 +487,10 @@ class TestVfDaemon(TestCase):
>          fake_mac = '00:11:22:33:44:55'
>          time.sleep(5)
>          self.vm0_dut.send_expect("sed -i -e '/int r;/a " +\
> -            "\        struct ether_addr fake_mac = {.addr_bytes = {0x00, 0x11, 0x22,
> 0x33, 0x44, 0x55},};'" +\
> +            "\        struct rte_ether_addr fake_mac = {.addr_bytes = {0x00, 0x11,
> 0x22, 0x33, 0x44, 0x55},};'" +\
>              " app/test-pmd/macswap_sse.h", "# ", 30)
>          line_num = self.vm0_dut.send_expect("sed -n '/_mm_storeu_si128/='
> app/test-pmd/macswap_sse.h |sed -n 5p", "# ",30)
> -        self.vm0_dut.send_expect("sed -i -e '%sa\ether_addr_copy(&fake_mac,
> &eth_hdr[0]->s_addr);'" % str(line_num)+\
> +        self.vm0_dut.send_expect("sed -i -e
> + '%sa\\rte_ether_addr_copy(&fake_mac, &eth_hdr[0]->s_addr);'" %
> + str(line_num)+\
>                      " app/test-pmd/macswap_sse.h", "# ", 30)
>          time.sleep(3)
> 
> @@ -525,7 +525,7 @@ class TestVfDaemon(TestCase):
> 
>          self.vm0_testpmd.quit()
>          self.dut_testpmd.quit()
> -        self.vm0_dut.send_expect("sed -i '/struct ether_addr fake_mac =
> {.addr_bytes = " +\
> +        self.vm0_dut.send_expect("sed -i '/struct rte_ether_addr
> + fake_mac = {.addr_bytes = " +\
>              "{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)
> --
> 2.7.4