[V1] tests/vf_daemon: modify dts to adapt dpdk changes

Message ID 20211019102845.213815-1-yanx.xia@intel.com (mailing list archive)
State Changes Requested
Headers
Series [V1] tests/vf_daemon: modify dts to adapt dpdk changes |

Checks

Context Check Description
ci/Intel-dts-suite-test fail Testing issues

Commit Message

Yan Xia Oct. 19, 2021, 10:28 a.m. UTC
  dpdk commit-id: 04d43857
dpdk rename `s_addr` to `src_addr`

Signed-off-by: Yan Xia <yanx.xia@intel.com>
---
 tests/TestSuite_vf_daemon.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
  

Comments

Lingli Chen Oct. 19, 2021, 2:35 a.m. UTC | #1
> -----Original Message-----
> From: dts <dts-bounces@dpdk.org> On Behalf Of Yan Xia
> Sent: Tuesday, October 19, 2021 6:29 PM
> To: dts@dpdk.org
> Cc: Xia, YanX <yanx.xia@intel.com>
> Subject: [dts] [PATCH V1] tests/vf_daemon: modify dts to adapt dpdk changes
> 
> dpdk commit-id: 04d43857
> dpdk rename `s_addr` to `src_addr`
> 
> Signed-off-by: Yan Xia <yanx.xia@intel.com>
> ---

Tested-by: Yan Xia <yanx.xia@intel.com>
  
David Marchand Oct. 20, 2021, 3:30 p.m. UTC | #2
On Tue, Oct 19, 2021 at 4:29 AM Yan Xia <yanx.xia@intel.com> wrote:
>
> dpdk commit-id: 04d43857
> dpdk rename `s_addr` to `src_addr`
>
> Signed-off-by: Yan Xia <yanx.xia@intel.com>
> ---
>  tests/TestSuite_vf_daemon.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tests/TestSuite_vf_daemon.py b/tests/TestSuite_vf_daemon.py
> index a08ae7b5..2c23e760 100644
> --- a/tests/TestSuite_vf_daemon.py
> +++ b/tests/TestSuite_vf_daemon.py
> @@ -528,7 +528,7 @@ class TestVfDaemon(TestCase):
>              "\        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\\rte_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]->src_addr);'" % str(line_num)+\

Please drop those hacks where DTS changes DPDK source code.


>                      " app/test-pmd/macswap_sse.h", "# ", 30)
>          time.sleep(3)
>
> --
> 2.32.0
>
  
Honnappa Nagarahalli Oct. 20, 2021, 4:41 p.m. UTC | #3
<snip>

> 
> On Tue, Oct 19, 2021 at 4:29 AM Yan Xia <yanx.xia@intel.com> wrote:
> >
> > dpdk commit-id: 04d43857
> > dpdk rename `s_addr` to `src_addr`
> >
> > Signed-off-by: Yan Xia <yanx.xia@intel.com>
> > ---
> >  tests/TestSuite_vf_daemon.py | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/tests/TestSuite_vf_daemon.py
> > b/tests/TestSuite_vf_daemon.py index a08ae7b5..2c23e760 100644
> > --- a/tests/TestSuite_vf_daemon.py
> > +++ b/tests/TestSuite_vf_daemon.py
> > @@ -528,7 +528,7 @@ class TestVfDaemon(TestCase):
> >              "\        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\\rte_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]->src_addr);'" %
> > + str(line_num)+\
> 
> Please drop those hacks where DTS changes DPDK source code.
Totally agree. If you need any features in testpmd or any part of DPDK, please ask and we can talk about it.
Note that all the existing test cases that modify the DPDK code need to be reworked or dropped.

I also need to figure out a way to update the community of the DTS WG progress/recommendations. I will get back on this soon.

> 
> 
> >                      " app/test-pmd/macswap_sse.h", "# ", 30)
> >          time.sleep(3)
> >
> > --
> > 2.32.0
> >
> 
> 
> --
> David Marchand
  

Patch

diff --git a/tests/TestSuite_vf_daemon.py b/tests/TestSuite_vf_daemon.py
index a08ae7b5..2c23e760 100644
--- a/tests/TestSuite_vf_daemon.py
+++ b/tests/TestSuite_vf_daemon.py
@@ -528,7 +528,7 @@  class TestVfDaemon(TestCase):
             "\        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\\rte_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]->src_addr);'" % str(line_num)+\
                     " app/test-pmd/macswap_sse.h", "# ", 30)
         time.sleep(3)