diff mbox series

[V1] tests/vhost_user_interrupt:modify execute virtio-user server side testpmd command after client side started

Message ID 20210202143715.3877934-1-weix.ling@intel.com (mailing list archive)
State Accepted
Headers
Series [V1] tests/vhost_user_interrupt:modify execute virtio-user server side testpmd command after client side started |

Commit Message

Ling, WeiX Feb. 2, 2021, 2:37 p.m. UTC 
  In DPDK 9af79db20f4cf, when launch virtio-user testpmd as server mode,
virtio-user server side testpmd expected character will be
'wait for client side started...', after client side started,
it change to 'testpmd>', so dts need modify execute virtio-user
server side testpmd command after client side started.

Signed-off-by: Ling Wei <weix.ling@intel.com>
---
 tests/TestSuite_vhost_user_interrupt.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Comments

Ling, WeiX Feb. 2, 2021, 6:46 a.m. UTC | #1 
Tested-by: Wei Ling <weix.ling@intel.com>

Regards,
Ling Wei

> -----Original Message-----
> From: Ling Wei <weix.ling@intel.com>
> Sent: Tuesday, February 2, 2021 10:37 PM
> To: dts@dpdk.org
> Cc: Ling, WeiX <weix.ling@intel.com>
> Subject: [dts][PATCH V1] tests/vhost_user_interrupt:modify execute virtio-
> user server side testpmd command after client side started
> 
> In DPDK 9af79db20f4cf, when launch virtio-user testpmd as server mode,
> virtio-user server side testpmd expected character will be 'wait for client side
> started...', after client side started, it change to 'testpmd>', so dts need
> modify execute virtio-user server side testpmd command after client side
> started.
> 
> Signed-off-by: Ling Wei <weix.ling@intel.com>
> ---
>  tests/TestSuite_vhost_user_interrupt.py | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/TestSuite_vhost_user_interrupt.py
> b/tests/TestSuite_vhost_user_interrupt.py
> index bc340c4..2a10199 100644
> --- a/tests/TestSuite_vhost_user_interrupt.py
> +++ b/tests/TestSuite_vhost_user_interrupt.py
> @@ -108,8 +108,7 @@ class TestVhostUserInterrupt(TestCase):
>              eal_params += " --single-file-segments"
>          para = " -- -i --rxq=%d --txq=%d --rss-ip" % (self.queues, self.queues)
>          command_line_client =  self.app_testpmd_path + " " + eal_params +
> para
> -        self.virtio_user.send_expect(command_line_client, "testpmd> ", 120)
> -        self.virtio_user.send_expect("set fwd txonly", "testpmd> ", 20)
> +        self.virtio_user.send_expect(command_line_client, "waiting for
> + client connection...", 120)
> 
>      def get_cbdma_ports_info_and_bind_to_dpdk(self, cbdma_num):
>          """
> @@ -231,6 +230,7 @@ class TestVhostUserInterrupt(TestCase):
>          self.get_core_list()
>          self.lanuch_virtio_user()
>          self.lanuch_l3fwd_power()
> +        self.virtio_user.send_expect("set fwd txonly", "testpmd> ", 20)
>          self.send_and_verify()
> 
>      def
> test_wake_up_split_ring_vhost_user_core_with_l3fwd_power_sample_wh
> en_multi_queues_enabled(self):
> @@ -241,6 +241,7 @@ class TestVhostUserInterrupt(TestCase):
>          self.get_core_list()
>          self.lanuch_virtio_user()
>          self.lanuch_l3fwd_power()
> +        self.virtio_user.send_expect("set fwd txonly", "testpmd> ", 20)
>          self.send_and_verify()
> 
>      def
> test_wake_up_packed_ring_vhost_user_core_with_l3fwd_power_sample(
> self):
> @@ -251,6 +252,7 @@ class TestVhostUserInterrupt(TestCase):
>          self.get_core_list()
>          self.lanuch_virtio_user(packed=True)
>          self.lanuch_l3fwd_power()
> +        self.virtio_user.send_expect("set fwd txonly", "testpmd> ", 20)
>          self.send_and_verify()
> 
>      def
> test_wake_up_packed_ring_vhost_user_core_with_l3fwd_power_sample_
> when_multi_queues_enabled(self):
> @@ -261,6 +263,7 @@ class TestVhostUserInterrupt(TestCase):
>          self.get_core_list()
>          self.lanuch_virtio_user(packed=True)
>          self.lanuch_l3fwd_power()
> +        self.virtio_user.send_expect("set fwd txonly", "testpmd> ", 20)
>          self.send_and_verify()
> 
>      def
> test_wake_up_split_ring_vhost_user_core_with_l3fwd_power_sample_wh
> en_multi_queues_enabled_and_cbdma_enabled(self):
> @@ -271,6 +274,7 @@ class TestVhostUserInterrupt(TestCase):
>          self.get_core_list()
>          self.lanuch_virtio_user(cbdma=True)
>          self.lanuch_l3fwd_power(cbdma=True)
> +        self.virtio_user.send_expect("set fwd txonly", "testpmd> ", 20)
>          self.send_and_verify()
> 
>      def tear_down(self):
> --
> 2.25.1
Wang, Yinan Feb. 2, 2021, 1:48 p.m. UTC | #2 
Acked-by: Wang, Yinan <yinan.wang@intel.com>

> -----Original Message-----
> From: dts <dts-bounces@dpdk.org> On Behalf Of Ling, WeiX
> Sent: 2021?2?2? 14:46
> To: Ling, WeiX <weix.ling@intel.com>; dts@dpdk.org
> Subject: Re: [dts] [PATCH V1] tests/vhost_user_interrupt:modify execute
> virtio-user server side testpmd command after client side started
> 
> Tested-by: Wei Ling <weix.ling@intel.com>
> 
> Regards,
> Ling Wei
> 
> > -----Original Message-----
> > From: Ling Wei <weix.ling@intel.com>
> > Sent: Tuesday, February 2, 2021 10:37 PM
> > To: dts@dpdk.org
> > Cc: Ling, WeiX <weix.ling@intel.com>
> > Subject: [dts][PATCH V1] tests/vhost_user_interrupt:modify execute virtio-
> > user server side testpmd command after client side started
> >
> > In DPDK 9af79db20f4cf, when launch virtio-user testpmd as server mode,
> > virtio-user server side testpmd expected character will be 'wait for client
> side
> > started...', after client side started, it change to 'testpmd>', so dts need
> > modify execute virtio-user server side testpmd command after client side
> > started.
> >
> > Signed-off-by: Ling Wei <weix.ling@intel.com>
> > ---
> >  tests/TestSuite_vhost_user_interrupt.py | 8 ++++++--
> >  1 file changed, 6 insertions(+), 2 deletions(-)
> >
> > diff --git a/tests/TestSuite_vhost_user_interrupt.py
> > b/tests/TestSuite_vhost_user_interrupt.py
> > index bc340c4..2a10199 100644
> > --- a/tests/TestSuite_vhost_user_interrupt.py
> > +++ b/tests/TestSuite_vhost_user_interrupt.py
> > @@ -108,8 +108,7 @@ class TestVhostUserInterrupt(TestCase):
> >              eal_params += " --single-file-segments"
> >          para = " -- -i --rxq=%d --txq=%d --rss-ip" % (self.queues, self.queues)
> >          command_line_client =  self.app_testpmd_path + " " + eal_params +
> > para
> > -        self.virtio_user.send_expect(command_line_client, "testpmd> ", 120)
> > -        self.virtio_user.send_expect("set fwd txonly", "testpmd> ", 20)
> > +        self.virtio_user.send_expect(command_line_client, "waiting for
> > + client connection...", 120)
> >
> >      def get_cbdma_ports_info_and_bind_to_dpdk(self, cbdma_num):
> >          """
> > @@ -231,6 +230,7 @@ class TestVhostUserInterrupt(TestCase):
> >          self.get_core_list()
> >          self.lanuch_virtio_user()
> >          self.lanuch_l3fwd_power()
> > +        self.virtio_user.send_expect("set fwd txonly", "testpmd> ", 20)
> >          self.send_and_verify()
> >
> >      def
> > test_wake_up_split_ring_vhost_user_core_with_l3fwd_power_sample_wh
> > en_multi_queues_enabled(self):
> > @@ -241,6 +241,7 @@ class TestVhostUserInterrupt(TestCase):
> >          self.get_core_list()
> >          self.lanuch_virtio_user()
> >          self.lanuch_l3fwd_power()
> > +        self.virtio_user.send_expect("set fwd txonly", "testpmd> ", 20)
> >          self.send_and_verify()
> >
> >      def
> > test_wake_up_packed_ring_vhost_user_core_with_l3fwd_power_sample(
> > self):
> > @@ -251,6 +252,7 @@ class TestVhostUserInterrupt(TestCase):
> >          self.get_core_list()
> >          self.lanuch_virtio_user(packed=True)
> >          self.lanuch_l3fwd_power()
> > +        self.virtio_user.send_expect("set fwd txonly", "testpmd> ", 20)
> >          self.send_and_verify()
> >
> >      def
> > test_wake_up_packed_ring_vhost_user_core_with_l3fwd_power_sample_
> > when_multi_queues_enabled(self):
> > @@ -261,6 +263,7 @@ class TestVhostUserInterrupt(TestCase):
> >          self.get_core_list()
> >          self.lanuch_virtio_user(packed=True)
> >          self.lanuch_l3fwd_power()
> > +        self.virtio_user.send_expect("set fwd txonly", "testpmd> ", 20)
> >          self.send_and_verify()
> >
> >      def
> > test_wake_up_split_ring_vhost_user_core_with_l3fwd_power_sample_wh
> > en_multi_queues_enabled_and_cbdma_enabled(self):
> > @@ -271,6 +274,7 @@ class TestVhostUserInterrupt(TestCase):
> >          self.get_core_list()
> >          self.lanuch_virtio_user(cbdma=True)
> >          self.lanuch_l3fwd_power(cbdma=True)
> > +        self.virtio_user.send_expect("set fwd txonly", "testpmd> ", 20)
> >          self.send_and_verify()
> >
> >      def tear_down(self):
> > --
> > 2.25.1
Tu, Lijuan Feb. 3, 2021, 6:27 a.m. UTC | #3 
> In DPDK 9af79db20f4cf, when launch virtio-user testpmd as server mode, virtio-
> user server side testpmd expected character will be 'wait for client side
> started...', after client side started, it change to 'testpmd>', so dts need modify
> execute virtio-user server side testpmd command after client side started.
> 
> Signed-off-by: Ling Wei <weix.ling@intel.com>

Applied, thanks
diff mbox series

Patch

diff --git a/tests/TestSuite_vhost_user_interrupt.py b/tests/TestSuite_vhost_user_interrupt.py
index bc340c4..2a10199 100644
--- a/tests/TestSuite_vhost_user_interrupt.py
+++ b/tests/TestSuite_vhost_user_interrupt.py
@@ -108,8 +108,7 @@  class TestVhostUserInterrupt(TestCase):
             eal_params += " --single-file-segments"
         para = " -- -i --rxq=%d --txq=%d --rss-ip" % (self.queues, self.queues)
         command_line_client =  self.app_testpmd_path + " " + eal_params + para
-        self.virtio_user.send_expect(command_line_client, "testpmd> ", 120)
-        self.virtio_user.send_expect("set fwd txonly", "testpmd> ", 20)
+        self.virtio_user.send_expect(command_line_client, "waiting for client connection...", 120)
 
     def get_cbdma_ports_info_and_bind_to_dpdk(self, cbdma_num):
         """
@@ -231,6 +230,7 @@  class TestVhostUserInterrupt(TestCase):
         self.get_core_list()
         self.lanuch_virtio_user()
         self.lanuch_l3fwd_power()
+        self.virtio_user.send_expect("set fwd txonly", "testpmd> ", 20)
         self.send_and_verify()
 
     def test_wake_up_split_ring_vhost_user_core_with_l3fwd_power_sample_when_multi_queues_enabled(self):
@@ -241,6 +241,7 @@  class TestVhostUserInterrupt(TestCase):
         self.get_core_list()
         self.lanuch_virtio_user()
         self.lanuch_l3fwd_power()
+        self.virtio_user.send_expect("set fwd txonly", "testpmd> ", 20)
         self.send_and_verify()
 
     def test_wake_up_packed_ring_vhost_user_core_with_l3fwd_power_sample(self):
@@ -251,6 +252,7 @@  class TestVhostUserInterrupt(TestCase):
         self.get_core_list()
         self.lanuch_virtio_user(packed=True)
         self.lanuch_l3fwd_power()
+        self.virtio_user.send_expect("set fwd txonly", "testpmd> ", 20)
         self.send_and_verify()
 
     def test_wake_up_packed_ring_vhost_user_core_with_l3fwd_power_sample_when_multi_queues_enabled(self):
@@ -261,6 +263,7 @@  class TestVhostUserInterrupt(TestCase):
         self.get_core_list()
         self.lanuch_virtio_user(packed=True)
         self.lanuch_l3fwd_power()
+        self.virtio_user.send_expect("set fwd txonly", "testpmd> ", 20)
         self.send_and_verify()
 
     def test_wake_up_split_ring_vhost_user_core_with_l3fwd_power_sample_when_multi_queues_enabled_and_cbdma_enabled(self):
@@ -271,6 +274,7 @@  class TestVhostUserInterrupt(TestCase):
         self.get_core_list()
         self.lanuch_virtio_user(cbdma=True)
         self.lanuch_l3fwd_power(cbdma=True)
+        self.virtio_user.send_expect("set fwd txonly", "testpmd> ", 20)
         self.send_and_verify()
 
     def tear_down(self):