test suite reviews and discussions
 help / color / mirror / Atom feed
From: Yan Xia <yanx.xia@intel.com>
To: dts@dpdk.org
Cc: Yan Xia <yanx.xia@intel.com>
Subject: [dts] [PATCH V2 3/3] tests/vf_kernel: modify dts because of i40evf removed
Date: Wed, 20 Oct 2021 18:10:05 +0000	[thread overview]
Message-ID: <20211020181005.332986-4-yanx.xia@intel.com> (raw)
In-Reply-To: <20211020181005.332986-1-yanx.xia@intel.com>

modify dts because of i40evf removed
dpdk commit-id: c65f9258

Signed-off-by: Yan Xia <yanx.xia@intel.com>
---
 tests/TestSuite_vf_kernel.py | 37 +++++++++++++++++++++++++++---------
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/tests/TestSuite_vf_kernel.py b/tests/TestSuite_vf_kernel.py
index a4e1e52a..e685db65 100755
--- a/tests/TestSuite_vf_kernel.py
+++ b/tests/TestSuite_vf_kernel.py
@@ -315,7 +315,10 @@ class TestVfKernel(TestCase):
         self.verify("Link detected: yes" in out, "Wrong link status")
 
         # Unload VF1 kernel driver and expect no problem for VF0
-        self.vm1_dut.send_expect("rmmod %svf" % self.kdriver, "#")
+        if self.kdriver == "i40e":
+            self.vm1_dut.send_expect("rmmod iavf", "#")
+        else:
+            self.vm1_dut.send_expect("rmmod %svf" % self.kdriver, "#")
         out = self.vm0_dut.send_expect("ethtool %s" % self.vm0_intf0, "#")
         self.verify("Link detected: yes" in out, "Wrong link status")
         vm0_vf0_mac = self.vm0_dut.ports_info[0]['port'].get_mac_addr()
@@ -330,20 +333,29 @@ class TestVfKernel(TestCase):
         self.verify(self.verify_vm_tcpdump(self.vm0_dut, self.vm0_intf0,
                                            vm0_vf0_mac), "reset PF testpmd impact VF RX failure")
 
-        self.vm1_dut.send_expect("modprobe %svf" % self.kdriver, "#")
+        if self.kdriver == "i40e":
+            self.vm1_dut.send_expect("modprobe iavf", "#")
+        else:
+            self.vm1_dut.send_expect("modprobe %svf" % self.kdriver, "#")
         out = self.vm0_dut.send_expect("ethtool %s" % self.vm0_intf0, "#")
         self.verify("Link detected: yes" in out, "Wrong link status")
         vm0_vf0_mac = self.vm0_dut.ports_info[0]['port'].get_mac_addr()
         self.verify(self.verify_vm_tcpdump(self.vm0_dut, self.vm0_intf0,
                                            vm0_vf0_mac), "load VF1 kernel driver impact VF0")
 
-        self.vm1_dut.send_expect("rmmod %svf" % self.kdriver, "#")
+        if self.kdriver == "i40e":
+            self.vm1_dut.send_expect("rmmod iavf", "#")
+        else:
+            self.vm1_dut.send_expect("rmmod %svf" % self.kdriver, "#")
         out = self.vm0_dut.send_expect("ethtool %s" % self.vm0_intf0, "#")
         self.verify("Link detected: yes" in out, "Wrong link status")
         vm0_vf0_mac = self.vm0_dut.ports_info[0]['port'].get_mac_addr()
         self.verify(self.verify_vm_tcpdump(self.vm0_dut, self.vm0_intf0,
                                            vm0_vf0_mac), "Reset VF1 kernel driver impact VF0")
-        self.vm1_dut.send_expect("modprobe %svf" % self.kdriver, "#")
+        if self.kdriver == "i40e":
+            self.vm1_dut.send_expect("modprobe iavf", "#")
+        else:
+            self.vm1_dut.send_expect("modprobe %svf" % self.kdriver, "#")
 
     def test_address(self):
         """
@@ -1048,12 +1060,19 @@ class TestVfKernel(TestCase):
         Load kernel driver stress
         """
         for i in range(100):
-            out = self.vm0_dut.send_expect("rmmod %svf" % self.kdriver, "#")
-            self.verify('error' not in out,
+            if self.kdriver == "i40e":
+                out = self.vm0_dut.send_expect("rmmod iavf", "#")
+                self.verify('error' not in out,
+                        "stress error for rmmod iavf:%s" %out)
+                out = self.vm0_dut.send_expect("modprobe iavf", "#")
+                self.verify('error' not in out, "stress error for modprobe iavf:%s" %out)
+            else:
+                out = self.vm0_dut.send_expect("rmmod %svf" % self.kdriver, "#")
+                self.verify('error' not in out,
                         "stress error for rmmod %svf:%s" % (self.kdriver, out))
-            out = self.vm0_dut.send_expect("modprobe %svf" % self.kdriver, "#")
-            self.verify('error' not in out, "stress error for modprobe %svf:%s" % (
-                self.kdriver, out))
+                out = self.vm0_dut.send_expect("modprobe %svf" % self.kdriver, "#")
+                self.verify('error' not in out, "stress error for modprobe %svf:%s" % (
+                    self.kdriver, out))
 
     def tear_down(self):
         """
-- 
2.33.1


  parent reply	other threads:[~2021-10-20 10:10 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-20 18:10 [dts] [PATCH V2 0/3] *** modify dts because of i40evf removed *** Yan Xia
2021-10-20 18:10 ` [dts] [PATCH V2 1/3] framework: modify dts because of i40evf removed Yan Xia
2021-10-22  6:29   ` Lin, Xueqin
2021-10-20 18:10 ` [dts] [PATCH V2 2/3] test_plans: " Yan Xia
2021-10-22  6:31   ` Lin, Xueqin
2021-10-20 18:10 ` Yan Xia [this message]
2021-10-21 10:21   ` [dts] [PATCH V2 3/3] tests/vf_kernel: " Chen, LingliX
2021-10-22  6:29   ` Lin, Xueqin
2021-10-25  9:05     ` Tu, Lijuan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211020181005.332986-4-yanx.xia@intel.com \
    --to=yanx.xia@intel.com \
    --cc=dts@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).