From: Zhimin Huang <zhiminx.huang@intel.com>
To: dts@dpdk.org
Cc: Zhimin Huang <zhiminx.huang@intel.com>
Subject: [dts] [PATCH V2 1/2] tests/kernelpf_iavf:fix vlan issue
Date: Mon, 6 Sep 2021 17:40:39 +0800 [thread overview]
Message-ID: <20210906094040.6867-2-zhiminx.huang@intel.com> (raw)
In-Reply-To: <20210906094040.6867-1-zhiminx.huang@intel.com>
1.use dts framework interface to get kernel driver version.
2.according to dpdk code and kernel change about vlan for cvl,fix dts code
to adapt test point.
Signed-off-by: Zhimin Huang <zhiminx.huang@intel.com>
---
tests/TestSuite_kernelpf_iavf.py | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/tests/TestSuite_kernelpf_iavf.py b/tests/TestSuite_kernelpf_iavf.py
index 5db1ec0..9b340a9 100644
--- a/tests/TestSuite_kernelpf_iavf.py
+++ b/tests/TestSuite_kernelpf_iavf.py
@@ -67,6 +67,8 @@ class TestKernelpfIavf(TestCase):
self.vf_mac = '00:01:23:45:67:89'
self.add_addr = '00:11:22:33:44:55'
self.wrong_mac = '00:11:22:33:44:99'
+ # get driver version
+ self.driver_version = self.nic_obj.driver_version
self.port = self.dut_ports[0]
self.vm_port = 0
@@ -155,10 +157,6 @@ class TestKernelpfIavf(TestCase):
self.dut.send_expect("ip link set %s vf 0 mac %s" %
(self.host_intf, self.vf_mac), "# ")
- # get driver version
- out = self.dut.send_expect("ethtool -i %s | awk -F':' 'NR==2{print $2}'" % self.host_intf, "# ")
- self.driver_version = out.replace(" ", "")
-
try:
for port in self.sriov_vfs_port:
@@ -420,7 +418,7 @@ class TestKernelpfIavf(TestCase):
out = self.send_and_getout(vlan=random_vlan, pkt_type="VLAN_UDP")
tcpdump_out = self.get_tcpdump_package()
receive_pkt = re.findall('vlan %s' % random_vlan, tcpdump_out)
- if self.driver_version < "2.13.10" or self.kdriver == 'ice':
+ if self.kdriver == 'i40e' and self.driver_version < "2.13.10":
self.verify(len(receive_pkt) == 2, "fail to tester received vlan packet!!!")
self.verify(self.vf_mac in out, "Failed to received vlan packet!!!")
else:
@@ -489,7 +487,7 @@ class TestKernelpfIavf(TestCase):
# send vlan 1 packet, vf can receive packet
out = self.send_and_getout(vlan=1, pkt_type="VLAN_UDP")
- if self.driver_version < "2.13.10" or self.kdriver == 'ice':
+ if self.kdriver == 'i40e' and self.driver_version < "2.13.10":
self.verify(self.vf_mac in out, "received vlan 1 packet!!!")
else:
self.verify(self.vf_mac not in out, "Received vlan 1 packet!!!")
@@ -537,7 +535,7 @@ class TestKernelpfIavf(TestCase):
self.send_and_getout(vlan=random_vlan, pkt_type="VLAN_UDP")
tcpdump_out = self.get_tcpdump_package()
receive_pkt = re.findall('vlan %s' % random_vlan, tcpdump_out)
- if self.driver_version < "2.13.10" or self.kdriver == 'ice':
+ if self.kdriver == 'i40e' and self.driver_version < "2.13.10":
self.verify(len(receive_pkt) == 2, 'Failed to not received vlan packet!!!')
else:
self.verify(len(receive_pkt) == 1, 'Failed to not received vlan packet!!!')
@@ -574,7 +572,7 @@ class TestKernelpfIavf(TestCase):
time.sleep(1)
tcpdump_out = self.get_tcpdump_package()
receive_pkt = re.findall('vlan %s' % random_vlan, tcpdump_out)
- if self.driver_version < "2.13.10" or self.kdriver == 'ice':
+ if self.kdriver == 'i40e' and self.driver_version < "2.13.10":
self.verify(len(receive_pkt) == 2, 'Failed to received vlan packet!!!')
else:
self.verify(len(receive_pkt) == 1, 'Failed to received vlan packet!!!')
@@ -917,7 +915,7 @@ class TestKernelpfIavf(TestCase):
self.scapy_send_packet(self.vf_mac, self.tester_intf, vlan_flags=True, count=10)
out = self.vm_dut.get_session_output()
packets = len(re.findall('received 1 packets', out))
- if self.driver_version < "2.13.10" or self.kdriver == 'ice':
+ if self.kdriver == 'i40e' and self.driver_version < "2.13.10":
self.verify(packets == 10, "Not receive expected packet")
else:
self.verify(packets == 0, "Receive expected packet")
--
2.17.1
next prev parent reply other threads:[~2021-09-06 1:09 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-06 9:40 [dts] [PATCH V2 0/2] fix vlan issue for cvl Zhimin Huang
2021-09-06 9:40 ` Zhimin Huang [this message]
2021-09-06 1:17 ` [dts] [PATCH V2 1/2] tests/kernelpf_iavf:fix vlan issue Huang, ZhiminX
2021-09-06 3:32 ` Tu, Lijuan
2021-09-06 9:40 ` [dts] [PATCH V2 2/2] tests/vf_vlan:fix " Zhimin Huang
2021-09-06 1:17 ` Huang, ZhiminX
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=20210906094040.6867-2-zhiminx.huang@intel.com \
--to=zhiminx.huang@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).