[V2,2/2] tests/vf_interrupt_pmd: remove change DPDK code steps

Message ID 20220119075437.919618-1-weix.ling@intel.com (mailing list archive)
State Superseded
Headers
Series remove change DPDK code steps |

Checks

Context Check Description
ci/Intel-dts-doc-test success Testing OK
ci/Intel-dts-suite-test success Testing OK

Commit Message

Ling, WeiX Jan. 19, 2022, 7:54 a.m. UTC
  v1:
Remove change DPDK code steps.
v2:
Add insmod igb_uio driver step in test_nic_interrupt_PF_igb_uio case.

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

Comments

Huang, ChenyuX Jan. 19, 2022, 9:45 a.m. UTC | #1
> -----Original Message-----
> From: Wei Ling <weix.ling@intel.com>
> Sent: Wednesday, January 19, 2022 3:55 PM
> To: dts@dpdk.org
> Cc: Ling, WeiX <weix.ling@intel.com>
> Subject: [dts][PATCH V2 2/2] tests/vf_interrupt_pmd: remove change DPDK
> code steps
> 
Tested-by: Chenyu Huang <chenyux.huang@intel.com>
  
Tu, Lijuan Jan. 29, 2022, 4:17 a.m. UTC | #2
It sleeps 3 seconds, that doesn't make sense to me.

If some causes are specified with igb_uio, it should be add to support list.

Thanks.

> -----Original Message-----
> From: Wei Ling <weix.ling@intel.com>
> Sent: 2022年1月19日 15:55
> To: dts@dpdk.org
> Cc: Ling, WeiX <weix.ling@intel.com>
> Subject: [dts][PATCH V2 2/2] tests/vf_interrupt_pmd: remove change DPDK
> code steps
> 
> v1:
> Remove change DPDK code steps.
> v2:
> Add insmod igb_uio driver step in test_nic_interrupt_PF_igb_uio case.
> 
> Signed-off-by: Wei Ling <weix.ling@intel.com>
> ---
>  tests/TestSuite_vf_interrupt_pmd.py | 22 ++++++----------------
>  1 file changed, 6 insertions(+), 16 deletions(-)
> 
> diff --git a/tests/TestSuite_vf_interrupt_pmd.py
> b/tests/TestSuite_vf_interrupt_pmd.py
> index aff1f35a..3f2a77d8 100644
> --- a/tests/TestSuite_vf_interrupt_pmd.py
> +++ b/tests/TestSuite_vf_interrupt_pmd.py
> @@ -44,7 +44,6 @@ from framework.packet import Packet  from
> framework.test_case import TestCase  from framework.virt_common import
> VM
> 
> -
>  class TestVfInterruptPmd(TestCase):
>      supported_vf_driver = ['pci-stub', 'vfio-pci']
> 
> @@ -88,11 +87,8 @@ class TestVfInterruptPmd(TestCase):
> 
>      def prepare_l3fwd_power(self, use_dut):
>          """
> -        Change the DPDK source code and recompile
> +        Compile dpdk-l3fwd-power
>          """
> -        use_dut.send_expect(
> -                "sed -i -e '/DEV_RX_OFFLOAD_CHECKSUM,/d' \
> -                ./examples/l3fwd-power/main.c", "#", 10)
>          out = use_dut.build_dpdk_apps("./examples/l3fwd-power")
>          self.path = use_dut.apps_name['l3fwd-power']
>          self.verify("Error" not in out, "compilation error") @@ -101,15 +97,18 @@
> class TestVfInterruptPmd(TestCase):
>          """
>          Send a packet and verify
>          """
> +        time.sleep(3)
>          pkt = Packet(pkt_type='UDP')
>          pkt.config_layer('ether', {'dst': mac, 'src': self.tester_mac})
>          pkt.send_pkt(self.tester, tx_port=testinterface)
>          self.out2 = use_dut.get_session_output(timeout=2)
> 
> +
>      def send_packet_loop(self, mac, testinterface, use_dut, ip_addr):
>          """
>          Send a packet and verify
>          """
> +        time.sleep(3)
>          pkt = Packet(pkt_type='UDP')
>          pkt.config_layer('ether', {'dst': mac, 'src': self.tester_mac})
>          pkt.config_layer('ipv4', {'dst': '2.1.1.5', 'src': '2.1.1.%s' % ip_addr}) @@ -
> 297,6 +296,8 @@ class TestVfInterruptPmd(TestCase):
>          """
>          self.prepare_l3fwd_power(self.dut)
> 
> +        self.dut.setup_modules_linux(self.target, 'igb_uio', '')
> +
>          self.dut.ports_info[0]['port'].bind_driver(driver='igb_uio')
> 
>          self.begin_l3fwd_power(self.dut) @@ -362,17 +363,6 @@ class
> TestVfInterruptPmd(TestCase):
>              config_info += '(0,%d,%d)' % (queue, queue)
>          cmd = self.path + "-c %s -n 4 -- -P -p 0x1" % core_mask_user + " --
> config='%s'" % config_info
>          self.vm0_dut.send_expect(cmd, "L3FWD_POWER", 60)
> -        time.sleep(1)
> -        try:
> -            self.logger.info("Launch l3fwd_sample sample:")
> -            self.out = self.vm0_dut.send_expect(cmd, "L3FWD_POWER", 60)
> -            if "Error" in self.out:
> -                raise Exception("Launch l3fwd-power sample failed")
> -            else:
> -                self.logger.info("Launch l3fwd-power sample finished")
> -        except Exception as e:
> -            self.logger.error("ERROR: Failed to launch l3fwd-power sample: %s"
> -                              % str(e))
>          stroutput = ""
>          for ip in range(2, 10):
>              self.send_packet_loop(self.vf0_mac, self.rx_intf_0, self.vm0_dut, ip)
> --
> 2.25.1
  

Patch

diff --git a/tests/TestSuite_vf_interrupt_pmd.py b/tests/TestSuite_vf_interrupt_pmd.py
index aff1f35a..3f2a77d8 100644
--- a/tests/TestSuite_vf_interrupt_pmd.py
+++ b/tests/TestSuite_vf_interrupt_pmd.py
@@ -44,7 +44,6 @@  from framework.packet import Packet
 from framework.test_case import TestCase
 from framework.virt_common import VM
 
-
 class TestVfInterruptPmd(TestCase):
     supported_vf_driver = ['pci-stub', 'vfio-pci']
 
@@ -88,11 +87,8 @@  class TestVfInterruptPmd(TestCase):
 
     def prepare_l3fwd_power(self, use_dut):
         """
-        Change the DPDK source code and recompile
+        Compile dpdk-l3fwd-power
         """
-        use_dut.send_expect(
-                "sed -i -e '/DEV_RX_OFFLOAD_CHECKSUM,/d' \
-                ./examples/l3fwd-power/main.c", "#", 10)
         out = use_dut.build_dpdk_apps("./examples/l3fwd-power")
         self.path = use_dut.apps_name['l3fwd-power']
         self.verify("Error" not in out, "compilation error")
@@ -101,15 +97,18 @@  class TestVfInterruptPmd(TestCase):
         """
         Send a packet and verify
         """
+        time.sleep(3)
         pkt = Packet(pkt_type='UDP')
         pkt.config_layer('ether', {'dst': mac, 'src': self.tester_mac})
         pkt.send_pkt(self.tester, tx_port=testinterface)
         self.out2 = use_dut.get_session_output(timeout=2)
 
+
     def send_packet_loop(self, mac, testinterface, use_dut, ip_addr):
         """
         Send a packet and verify
         """
+        time.sleep(3)
         pkt = Packet(pkt_type='UDP')
         pkt.config_layer('ether', {'dst': mac, 'src': self.tester_mac})
         pkt.config_layer('ipv4', {'dst': '2.1.1.5', 'src': '2.1.1.%s' % ip_addr})
@@ -297,6 +296,8 @@  class TestVfInterruptPmd(TestCase):
         """
         self.prepare_l3fwd_power(self.dut)
 
+        self.dut.setup_modules_linux(self.target, 'igb_uio', '')
+
         self.dut.ports_info[0]['port'].bind_driver(driver='igb_uio')
 
         self.begin_l3fwd_power(self.dut)
@@ -362,17 +363,6 @@  class TestVfInterruptPmd(TestCase):
             config_info += '(0,%d,%d)' % (queue, queue)
         cmd = self.path + "-c %s -n 4 -- -P -p 0x1" % core_mask_user + " --config='%s'" % config_info
         self.vm0_dut.send_expect(cmd, "L3FWD_POWER", 60)
-        time.sleep(1)
-        try:
-            self.logger.info("Launch l3fwd_sample sample:")
-            self.out = self.vm0_dut.send_expect(cmd, "L3FWD_POWER", 60)
-            if "Error" in self.out:
-                raise Exception("Launch l3fwd-power sample failed")
-            else:
-                self.logger.info("Launch l3fwd-power sample finished")
-        except Exception as e:
-            self.logger.error("ERROR: Failed to launch l3fwd-power sample: %s"
-                              % str(e))
         stroutput = ""
         for ip in range(2, 10):
             self.send_packet_loop(self.vf0_mac, self.rx_intf_0, self.vm0_dut, ip)