[prev in list] [next in list] [prev in thread] [next in thread]
List: dpdk-dts
Subject: [dts] [PATCH V2 ] tests/TestSuite_uni_pkt: enable CVL25G&100G nic to support uni_pkt case
From: "zhiwei.he" <zhiwei.he () intel ! com>
Date: 2019-08-30 14:40:54
Message-ID: 1567176054-40524-1-git-send-email-zhiwei.he () intel ! com
[Download RAW message or body]
From: "zhiwei.he" <zhiwei.he@intel.com>
Signed-off-by: zhiwei.he <zhiwei.he@intel.com>
---
tests/TestSuite_uni_pkt.py | 43 +++++++++++++++++++++++++------------------
1 file changed, 25 insertions(+), 18 deletions(-)
diff --git a/tests/TestSuite_uni_pkt.py b/tests/TestSuite_uni_pkt.py
index e70bc0d..0a49a0a 100644
--- a/tests/TestSuite_uni_pkt.py
+++ b/tests/TestSuite_uni_pkt.py
@@ -93,14 +93,21 @@ class TestUniPacket(TestCase):
"""
Check whether L2 packet can be detected"
"""
- self.verify(("fortville" in self.nic or "fortpark_TLV" in self.nic or \
"carlsville" in self.nic), + self.verify(("fortville" in self.nic or \
"fortpark_TLV" in self.nic or "carlsville" in self.nic or "columbiaville" in \
self.nic), "L2 packet detect only support by Fortville")
- self.L2_types = {
- "TIMESYNC": "L2_ETHER_TIMESYNC",
- "ARP": "L2_ETHER_ARP",
- "LLDP": "L2_ETHER_LLDP",
- }
-
+ #Change this code start for DPDK-15109, the share code doest not support \
TIMESYNC, once /supported then will enable + if "columbiaville" in self.nic:
+ self.L2_types = {
+ "ARP": "L2_ETHER_ARP",
+ "LLDP": "L2_ETHER_LLDP",
+ }
+ else:
+ self.L2_types = {
+ "TIMESYNC": "L2_ETHER_TIMESYNC",
+ "ARP": "L2_ETHER_ARP",
+ "LLDP": "L2_ETHER_LLDP",
+ }
+ #Change this code end for DPDK-15109, the share code doest not support \
TIMESYNC, once supported then will enable for l2_type in self.L2_types.keys():
pkt_name = self.L2_types[l2_type]
pkt = Packet(pkt_type=l2_type)
@@ -115,7 +122,7 @@ class TestUniPacket(TestCase):
"""
checked that whether L3 and L4 packet can be normally detected.
"""
- if "fortville" in self.nic or "fortpark_TLV" in self.nic or "carlsville" in \
self.nic: + if "fortville" in self.nic or "fortpark_TLV" in self.nic or \
"carlsville" in self.nic or "columbiaville" in self.nic: outerL4Type = "L4_NONFRAG"
ipv4_default_packet_type = ["L2_ETHER", "L3_IPV4_EXT_UNKNOWN"]
elif "niantic" in self.nic.lower() or "powerville" in self.nic.lower() or \
"cavium" in self.nic.lower() or "twinpond" in self.nic.lower() or "twinville" in \
self.nic.lower() or "sageville" in self.nic.lower() or "sagepond" in self.nic.lower() \
or "springville" in self.nic.lower(): @@ -133,7 +140,7 @@ class \
TestUniPacket(TestCase): }
# delete the unsupported packet based on nic type
- if "fortville" in self.nic or "fortpark_TLV" in self.nic or "carlsville" in \
self.nic: + if "fortville" in self.nic or "fortpark_TLV" in self.nic or \
"carlsville" in self.nic or "columbiaville" in self.nic: \
pktType.pop("MAC_IPihl_PKT") pktType.pop("MAC_IPihl_SCTP_PKT")
elif "niantic" in self.nic.lower() or "powerville" in self.nic.lower() or \
"cavium" in self.nic.lower() or "twinpond" in self.nic.lower() or "twinville" in \
self.nic.lower() or "sageville" in self.nic.lower() or "sagepond" in self.nic.lower() \
or "springville" in self.nic.lower(): @@ -146,7 +153,7 @@ class \
TestUniPacket(TestCase): """
checked that whether IPv6 and L4 packet can be normally detected.
"""
- if "fortville" in self.nic or "fortpark_TLV" in self.nic or "carlsville" in \
self.nic: + if "fortville" in self.nic or "fortpark_TLV" in self.nic or \
"carlsville" in self.nic or "columbiaville" in self.nic: outerL4Type = "L4_NONFRAG"
ipv6_default_packet_type = ["L2_ETHER", "L3_IPV6_EXT_UNKNOWN"]
elif "niantic" in self.nic.lower() or "powerville" in self.nic.lower() or \
"cavium" in self.nic.lower() or "twinpond" in self.nic.lower() or "twinville" in \
self.nic.lower() or "sageville" in self.nic.lower() or "sagepond" in self.nic.lower() \
or "springville" in self.nic.lower(): @@ -162,7 +169,7 @@ class \
TestUniPacket(TestCase): }
# delete the unsupported packet based on nic type
- if "fortville" in self.nic or "fortpark_TLV" in self.nic or "carlsville" in \
self.nic: + if "fortville" in self.nic or "fortpark_TLV" in self.nic or \
"carlsville" in self.nic or "columbiaville" in self.nic: \
pktType.pop("MAC_IPv6FRAG_PKT_N") elif "niantic" in self.nic.lower() or "powerville" \
in self.nic.lower() or "cavium" in self.nic.lower() or "twinpond" in self.nic.lower() \
or "twinville" in self.nic.lower() or "sageville" in self.nic.lower() or "sagepond" \
in self.nic.lower() or "springville" in self.nic.lower(): \
pktType.pop("MAC_IPv6FRAG_PKT_F") @@ -174,7 +181,7 @@ class TestUniPacket(TestCase):
checked that whether IP in IPv4 tunnel packet can be normally
detected by Fortville.
"""
- self.verify(("fortville" in self.nic or "fortpark_TLV" in self.nic or \
"carlsville" in self.nic), + self.verify(("fortville" in self.nic or \
"fortpark_TLV" in self.nic or "carlsville" in self.nic or "columbiaville" in \
self.nic),
"IP in IPv4 tunnel packet type detect only support by \
Fortville")
ipv4_in_ipv4_packet_type = ["L2_ETHER", "L3_IPV4_EXT_UNKNOWN", "TUNNEL_IP", \
"INNER_L3_IPV4_EXT_UNKNOWN"]
ipv6_in_ipv4_packet_type = ["L2_ETHER", "L3_IPV4_EXT_UNKNOWN", "TUNNEL_IP", \
"INNER_L3_IPV6_EXT_UNKNOWN"] @@ -201,7 +208,7 @@ class TestUniPacket(TestCase):
checked that whether IPv4 in IPv6 tunnel packet can be normally
detected.
"""
- self.verify(self.nic in ["niantic", "fortville_eagle", \
"fortville_spirit","powerville", "fortpark_TLV", + self.verify(self.nic in \
["columbiaville_25g", "columbiaville_100g", "niantic", "fortville_eagle", \
"fortville_spirit","powerville", "fortpark_TLV",
"fortville_25g", "fortville_spirit_single", "carlsville"], "not support \
%s" % self.nic) pktType = {
"MAC_IP_IPv6_PKT": ["L2_ETHER", "L3_IPV4", "TUNNEL_IP", \
"INNER_L3_IPV6"], @@ -218,7 +225,7 @@ class TestUniPacket(TestCase):
checked that whether IP in IPv6 tunnel packet can be normally
detected by Fortville.
"""
- self.verify(("fortville" in self.nic or "fortpark_TLV" in self.nic or \
"carlsville" in self.nic), + self.verify(("fortville" in self.nic or \
"fortpark_TLV" in self.nic or "carlsville" in self.nic or "columbiaville" in \
self.nic),
"IP in IPv6 tunnel packet type detect only support by \
Fortville")
ipv4_in_ipv6_packet_type = ["L2_ETHER", "L3_IPV4_EXT_UNKNOWN", "TUNNEL_IP", \
"INNER_L3_IPV4_EXT_UNKNOWN"]
ipv6_in_ipv6_packet_type = ["L2_ETHER", "L3_IPV4_EXT_UNKNOWN", "TUNNEL_IP", \
"INNER_L3_IPV6_EXT_UNKNOWN"] @@ -244,7 +251,7 @@ class TestUniPacket(TestCase):
checked that whether NVGRE tunnel packet can be normally detected
by Fortville.
"""
- self.verify(("fortville" in self.nic or "fortpark_TLV" in self.nic or \
"carlsville" in self.nic), + self.verify(("fortville" in self.nic or \
"fortpark_TLV" in self.nic or "carlsville" in self.nic or "columbiaville" in \
self.nic),
"NVGRE tunnel packet type detect only support by Fortville")
nvgre_base_packet_type = ["L2_ETHER", "L3_IPV4_EXT_UNKNOWN", \
"TUNNEL_GRENAT"] # INNER IPV4 not with vlan
@@ -281,7 +288,7 @@ class TestUniPacket(TestCase):
checked that whether NVGRE in IPv6 tunnel packet can be normally
detected by Fortville.
"""
- self.verify(("fortville" in self.nic or "fortpark_TLV" in self.nic or \
"carlsville" in self.nic), + self.verify(("fortville" in self.nic or \
"fortpark_TLV" in self.nic or "carlsville" in self.nic or "columbiaville" in \
self.nic), "NVGRE in IPv6 detect only support by Fortville")
nvgre_base_packet_type = ["L2_ETHER", "L3_IPV6_EXT_UNKNOWN", \
"TUNNEL_GRENAT"] # INNER IPV4 not with vlan
@@ -352,7 +359,7 @@ class TestUniPacket(TestCase):
"""
checked that whether GRE tunnel packet can be normally detected by \
Fortville. """
- self.verify(("fortville" in self.nic or "fortpark_TLV" in self.nic or \
"carlsville" in self.nic), + self.verify(("fortville" in self.nic or \
"fortpark_TLV" in self.nic or "carlsville" in self.nic or "columbiaville" in \
self.nic),
"GRE tunnel packet type detect only support by Fortville")
base_packet_type = [" L2_ETHER", " L3_IPV4_EXT_UNKNOWN", "TUNNEL_GRENAT"]
pktType = {
@@ -371,7 +378,7 @@ class TestUniPacket(TestCase):
checked that whether Vxlan tunnel packet can be normally detected by
Fortville.
"""
- self.verify(("fortville" in self.nic or "fortpark_TLV" in self.nic or \
"carlsville" in self.nic), + self.verify(("fortville" in self.nic or \
"fortpark_TLV" in self.nic or "carlsville" in self.nic or "columbiaville" in \
self.nic),
"Vxlan tunnel packet type detect only support by Fortville")
self.dut.send_expect("rx_vxlan_port add 4789 0", "testpmd>", 10)
--
1.8.3.1
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic