From: yaobing <bingx.y.yao@intel.com>
To: dts@dpdk.org
Cc: yaobing <bingx.y.yao@intel.com>
Subject: [dts] [PATCH V1] tests/TestSuite_uni_pkt.py
Date: Mon, 21 Jan 2019 15:53:27 +0800 [thread overview]
Message-ID: <1548057207-15616-1-git-send-email-bingx.y.yao@intel.com> (raw)
some packets are not match with packet type
Signed-off-by: yaobing <bingx.y.yao@intel.com>
---
tests/TestSuite_uni_pkt.py | 52 ++++++++++++++++++++++++++++----------
1 file changed, 38 insertions(+), 14 deletions(-)
diff --git a/tests/TestSuite_uni_pkt.py b/tests/TestSuite_uni_pkt.py
index 17de58f..d01e06f 100644
--- a/tests/TestSuite_uni_pkt.py
+++ b/tests/TestSuite_uni_pkt.py
@@ -305,9 +305,7 @@ class TestUniPacket(TestCase):
"MAC_IPv6_NVGRE_MAC_IPv6FRAG_PKT": nvgre_ipv6_default_packet_type + ["INNER_L4_FRAG"],
"MAC_IPv6_NVGRE_MAC_IPv6_PKT": nvgre_ipv6_default_packet_type + ["INNER_L4_NONFRAG"],
"MAC_IPv6_NVGRE_MAC_IPv6_UDP_PKT": nvgre_ipv6_default_packet_type + ["INNER_L4_UDP"],
- "MAC_IPv6_NVGRE_MAC_IPv6_TCP_PKT": nvgre_ipv6_default_packet_type + ["INNER_L4_TCP"],
- "MAC_IPv6_NVGRE_MAC_IPv6_SCTP_PKT": nvgre_ipv6_default_packet_type + ["INNER_L4_NONFRAG"],
- "MAC_IPv6_NVGRE_MAC_IPv6_ICMP_PKT": nvgre_ipv6_default_packet_type + ["INNER_L4_NONFRAG"],
+ "MAC_IPv6_NVGRE_MAC_IPv6_TCP_PKT": nvgre_ipv6_default_packet_type + ["INNER_L4_TCP"],
"MAC_IPv6_NVGRE_MAC_VLAN_IPFRAG_PKT": nvgre_ipv4_vlan_packet_type + ["INNER_L4_FRAG"],
"MAC_IPv6_NVGRE_MAC_VLAN_IP_PKT": nvgre_ipv4_vlan_packet_type + ["INNER_L4_NONFRAG"],
"MAC_IPv6_NVGRE_MAC_VLAN_IP_UDP_PKT": nvgre_ipv4_vlan_packet_type + ["INNER_L4_UDP"],
@@ -317,12 +315,38 @@ class TestUniPacket(TestCase):
"MAC_IPv6_NVGRE_MAC_VLAN_IPv6FRAG_PKT": nvgre_ipv6_vlan_packet_type + ["INNER_L4_FRAG"],
"MAC_IPv6_NVGRE_MAC_VLAN_IPv6_PKT": nvgre_ipv6_vlan_packet_type + ["INNER_L4_NONFRAG"],
"MAC_IPv6_NVGRE_MAC_VLAN_IPv6_UDP_PKT": nvgre_ipv6_vlan_packet_type + ["INNER_L4_UDP"],
- "MAC_IPv6_NVGRE_MAC_VLAN_IPv6_TCP_PKT": nvgre_ipv6_vlan_packet_type + ["INNER_L4_TCP"],
- "MAC_IPv6_NVGRE_MAC_VLAN_IPv6_SCTP_PKT":nvgre_ipv6_vlan_packet_type + ["INNER_L4_NONFRAG"],
- "MAC_IPv6_NVGRE_MAC_VLAN_IPv6_ICMP_PKT":nvgre_ipv6_vlan_packet_type + ["INNER_L4_NONFRAG"]
+ "MAC_IPv6_NVGRE_MAC_VLAN_IPv6_TCP_PKT": nvgre_ipv6_vlan_packet_type + ["INNER_L4_TCP"]
}
self.run_test(pkt_types)
+ pkt_special = [
+ ["MAC_IPv6_NVGRE_MAC_IPv6_SCTP_PKT",nvgre_ipv6_default_packet_type + ["INNER_L4_SCTP"],
+ ['ether', 'ipv6', 'nvgre', 'inner_mac', 'inner_ipv6', 'inner_sctp', 'raw']],
+ ["MAC_IPv6_NVGRE_MAC_IPv6_ICMP_PKT",nvgre_ipv6_default_packet_type + ["INNER_L4_ICMP"],
+ ['ether', 'ipv6', 'nvgre', 'inner_mac', 'inner_ipv6', 'inner_icmp', 'raw']],
+ ["MAC_IPv6_NVGRE_MAC_VLAN_IPv6_SCTP_PKT",nvgre_ipv6_vlan_packet_type + ["INNER_L4_SCTP"],
+ ['ether', 'ipv6', 'nvgre', 'inner_mac', 'inner_vlan', 'inner_ipv6', 'inner_sctp', 'raw']],
+ ["MAC_IPv6_NVGRE_MAC_VLAN_IPv6_ICMP_PKT",nvgre_ipv6_vlan_packet_type + ["INNER_L4_ICMP"],
+ ['ether', 'ipv6', 'nvgre', 'inner_mac', 'inner_vlan', 'inner_ipv6', 'inner_icmp', 'raw']]
+ ]
+ self.run_special_cope(pkt_special)
+
+ def run_special_cope(self, pkt_special):
+ time.sleep(1)
+ for pkts in pkt_special:
+ pkt = Packet()
+ pkt.assign_layers(pkts[2])
+ if 'inner_icmp' in pkts[2]:
+ pkt.config_layers([('ipv6',{'nh':47}), ('inner_ipv6', {'nh': 58})])
+ else:
+ pkt.config_layers([('ipv6',{'nh':47}),('inner_ipv6', {'nh': 132})])
+ pkt.send_pkt(tx_port=self.tester_iface)
+ out = self.dut.get_session_output(timeout=2)
+ for pkt_layer_name in pkts[1]:
+ if pkt_layer_name not in out:
+ print utils.RED("Fail to detect %s" % pkt_layer_name)
+ raise VerifyFailure("Failed to detect %s" % pkt_layer_name)
+ print utils.GREEN("Detected %s successfully" % pkts[0])
def test_GRE_tunnel(self):
"""
@@ -330,16 +354,16 @@ class TestUniPacket(TestCase):
"""
self.verify(("fortville" in self.nic or "fortpark_TLV" in self.nic),
"GRE tunnel packet type detect only support by Fortville")
- IPv4_packet_type = [" L2_ETHER", " L3_IPV4_EXT_UNKNOWN", "L4_NONFRAG"]
+ base_packet_type = [" L2_ETHER", " L3_IPV4_EXT_UNKNOWN", "TUNNEL_GRENAT"]
pktType = {
- "MAC_IP_GRE_IPFRAG_PKT": IPv4_packet_type,
- "MAC_IP_GRE_IP_PKT": IPv4_packet_type,
- "MAC_IP_GRE_IP_UDP_PKT": IPv4_packet_type,
- "MAC_IP_GRE_IP_TCP_PKT": IPv4_packet_type,
- "MAC_IP_GRE_IP_SCTP_PKT": IPv4_packet_type,
- "MAC_IP_GRE_IP_ICMP_PKT": IPv4_packet_type,
- "MAC_IP_GRE_PKT": IPv4_packet_type
+ "MAC_IP_GRE_IPFRAG_PKT": base_packet_type + ["INNER_L3_IPV4_EXT_UNKNOWN", "INNER_L4_FRAG"],
+ "MAC_IP_GRE_IP_PKT": base_packet_type + ["INNER_L3_IPV4_EXT_UNKNOWN", "INNER_L4_NONFRAG"],
+ "MAC_IP_GRE_IP_UDP_PKT": base_packet_type + ["INNER_L3_IPV4_EXT_UNKNOWN", "INNER_L4_UDP"],
+ "MAC_IP_GRE_IP_TCP_PKT": base_packet_type + ["INNER_L3_IPV4_EXT_UNKNOWN", "INNER_L4_TCP"],
+ "MAC_IP_GRE_IP_SCTP_PKT": base_packet_type + ["INNER_L3_IPV4_EXT_UNKNOWN", "INNER_L4_SCTP"],
+ "MAC_IP_GRE_IP_ICMP_PKT": base_packet_type + ["INNER_L3_IPV4_EXT_UNKNOWN", "INNER_L4_ICMP"],
+ "MAC_IP_GRE_PKT": base_packet_type
}
self.run_test(pktType)
--
2.17.2
next reply other threads:[~2019-01-21 7:49 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-21 7:53 yaobing [this message]
2019-01-22 4:17 ` Zhu, WenhuiX
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=1548057207-15616-1-git-send-email-bingx.y.yao@intel.com \
--to=bingx.y.yao@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).