[dts] [PATCH] TestSuite_ipgre.py: cavium_a063 and cavium_a064 supports IPv4 GRE
Tu, Lijuan
lijuan.tu at intel.com
Fri Dec 20 09:06:54 CET 2019
applied
> -----Original Message-----
> From: dts [mailto:dts-bounces at dpdk.org] On Behalf Of
> nareddy at marvell.com
> Sent: Wednesday, December 18, 2019 6:33 PM
> To: dts at dpdk.org
> Cc: pvukkisala at marvell.com; Praneeth Reddy <nareddy at marvell.com>
> Subject: [dts] [PATCH] TestSuite_ipgre.py: cavium_a063 and cavium_a064
> supports IPv4 GRE
>
> From: Praneeth Reddy <nareddy at marvell.com>
>
> Added support GRE for cavium_a063 and cavium_a064 Hardware vlan is not
> supported for cavium_a063 and cavium_a064 test_GRE_packet_filter is not
> supported by cavium_a063 and cavium_a064, added to checklist
>
> Signed-off-by: Praneeth Reddy <nareddy at marvell.com>
> ---
> conf/test_case_checklist.json | 4 +-
> tests/TestSuite_ipgre.py | 91 ++++++++++++++++++++++++++++--------------
> -
> 2 files changed, 63 insertions(+), 32 deletions(-)
>
> diff --git a/conf/test_case_checklist.json b/conf/test_case_checklist.json
> index 38b1335..a42d1e7 100644
> --- a/conf/test_case_checklist.json
> +++ b/conf/test_case_checklist.json
> @@ -2407,7 +2407,9 @@
> ],
> "NIC": [
> "columbiaville_25g",
> - "columbiaville_100g"
> + "columbiaville_100g",
> + "cavium_a063",
> + "cavium_a064"
> ],
> "Target": [
> "ALL"
> diff --git a/tests/TestSuite_ipgre.py b/tests/TestSuite_ipgre.py index
> c6bb380..71f26cd 100644
> --- a/tests/TestSuite_ipgre.py
> +++ b/tests/TestSuite_ipgre.py
> @@ -65,8 +65,8 @@ class TestIpgre(TestCase):
> ports = self.dut.get_ports()
> self.verify(self.nic in ["fortville_eagle", "fortville_spirit",
> "fortville_spirit_single", "fortville_25g", "carlsville",
> - "columbiaville_25g", "columbiaville_100g"],
> - "GRE tunnel packet type only support by fortville and carlsville")
> + "columbiaville_25g", "columbiaville_100g",
> "cavium_a063", "cavium_a064"],
> + "GRE tunnel packet type only support by fortville,
> + carlsville and cavium")
> self.verify(len(ports) >= 1, "Insufficient ports for testing")
> valports = [_ for _ in ports if self.tester.get_local_port(_) != -1]
> # start testpmd
> @@ -189,14 +189,24 @@ class TestIpgre(TestCase):
> Start testpmd and enable rxonly forwarding mode
> Send packet as table listed and packet type match each layer
> """
> - pkt_types = {
> - "MAC_IP_GRE_IPv4-TUNNEL_UDP_PKT": ["TUNNEL_GRENAT",
> "INNER_L4_UDP"],
> - "MAC_IP_GRE_IPv4-TUNNEL_TCP_PKT": ["TUNNEL_GRENAT",
> "INNER_L4_TCP"],
> - "MAC_IP_GRE_IPv4-TUNNEL_SCTP_PKT": ["TUNNEL_GRENAT",
> "INNER_L4_SCTP"],
> - "MAC_VLAN_IP_GRE_IPv4-TUNNEL_UDP_PKT": ["TUNNEL_GRENAT",
> "INNER_L4_UDP"],
> - "MAC_VLAN_IP_GRE_IPv4-TUNNEL_TCP_PKT": ["TUNNEL_GRENAT",
> "INNER_L4_TCP"],
> - "MAC_VLAN_IP_GRE_IPv4-TUNNEL_SCTP_PKT": ["TUNNEL_GRENAT",
> "INNER_L4_SCTP"]
> - }
> + if (self.nic in ["cavium_a063", "cavium_a064"]):
> + pkt_types = {
> + "MAC_IP_GRE_IPv4-TUNNEL_UDP_PKT": ["TUNNEL_GRE",
> "INNER_L4_UDP"],
> + "MAC_IP_GRE_IPv4-TUNNEL_TCP_PKT": ["TUNNEL_GRE",
> "INNER_L4_TCP"],
> + "MAC_IP_GRE_IPv4-TUNNEL_SCTP_PKT": ["TUNNEL_GRE",
> "INNER_L4_SCTP"],
> + "MAC_VLAN_IP_GRE_IPv4-TUNNEL_UDP_PKT": ["TUNNEL_GRE",
> "INNER_L4_UDP"],
> + "MAC_VLAN_IP_GRE_IPv4-TUNNEL_TCP_PKT": ["TUNNEL_GRE",
> "INNER_L4_TCP"],
> + "MAC_VLAN_IP_GRE_IPv4-TUNNEL_SCTP_PKT": ["TUNNEL_GRE",
> "INNER_L4_SCTP"]
> + }
> + else:
> + pkt_types = {
> + "MAC_IP_GRE_IPv4-TUNNEL_UDP_PKT": ["TUNNEL_GRENAT",
> "INNER_L4_UDP"],
> + "MAC_IP_GRE_IPv4-TUNNEL_TCP_PKT": ["TUNNEL_GRENAT",
> "INNER_L4_TCP"],
> + "MAC_IP_GRE_IPv4-TUNNEL_SCTP_PKT": ["TUNNEL_GRENAT",
> "INNER_L4_SCTP"],
> + "MAC_VLAN_IP_GRE_IPv4-TUNNEL_UDP_PKT":
> ["TUNNEL_GRENAT", "INNER_L4_UDP"],
> + "MAC_VLAN_IP_GRE_IPv4-TUNNEL_TCP_PKT":
> ["TUNNEL_GRENAT", "INNER_L4_TCP"],
> + "MAC_VLAN_IP_GRE_IPv4-TUNNEL_SCTP_PKT":
> ["TUNNEL_GRENAT", "INNER_L4_SCTP"]
> + }
> config_layers = {'ether': {'src': self.outer_mac_src},
> 'ipv4': {'proto': 'gre'}}
> # Start testpmd and enable rxonly forwarding mode @@ -217,29
> +227,48 @@ class TestIpgre(TestCase):
> Start testpmd and enable rxonly forwarding mode
> Send packet as table listed and packet type match each layer
> """
> - pkt_types_ipv6_ip = {
> - "MAC_IPv6_GRE_IPv4-TUNNEL_UDP_PKT": ["TUNNEL_GRENAT",
> "INNER_L4_UDP"],
> - "MAC_IPv6_GRE_IPv4-TUNNEL_TCP_PKT": ["TUNNEL_GRENAT",
> "INNER_L4_TCP"],
> - "MAC_IPv6_GRE_IPv4-TUNNEL_SCTP_PKT": ["TUNNEL_GRENAT",
> "INNER_L4_SCTP"],
> - "MAC_VLAN_IPv6_GRE_IPv4-TUNNEL_UDP_PKT":
> ["TUNNEL_GRENAT", "INNER_L4_UDP", "PKT_RX_VLAN"],
> - "MAC_VLAN_IPv6_GRE_IPv4-TUNNEL_TCP_PKT":
> ["TUNNEL_GRENAT", "INNER_L4_TCP", "PKT_RX_VLAN"],
> - "MAC_VLAN_IPv6_GRE_IPv4-TUNNEL_SCTP_PKT":
> ["TUNNEL_GRENAT", "INNER_L4_SCTP", "PKT_RX_VLAN"]
> - }
> -
> - pkt_types_ipv6_ipv6 = {
> - "MAC_IPv6_GRE_IPv6-TUNNEL_UDP_PKT": ["TUNNEL_GRENAT",
> "INNER_L4_UDP"],
> - "MAC_IPv6_GRE_IPv6-TUNNEL_TCP_PKT": ["TUNNEL_GRENAT",
> "INNER_L4_TCP"],
> - "MAC_VLAN_IPv6_GRE_IPv6-TUNNEL_UDP_PKT":
> ["TUNNEL_GRENAT", "INNER_L4_UDP", "PKT_RX_VLAN"],
> - "MAC_VLAN_IPv6_GRE_IPv6-TUNNEL_TCP_PKT":
> ["TUNNEL_GRENAT", "INNER_L4_TCP", "PKT_RX_VLAN"]
> - }
> -
> - pkt_types_ipv6_ipv6_SCTP = {
> - "MAC_IPv6_GRE_IPv6-TUNNEL_SCTP_PKT": ["TUNNEL_GRENAT",
> "INNER_L4_SCTP"],
> - "MAC_VLAN_IPv6_GRE_IPv6-TUNNEL_SCTP_PKT":
> ["TUNNEL_GRENAT", "INNER_L4_SCTP", "PKT_RX_VLAN"]
> - }
> + if (self.nic in ["cavium_a063", "cavium_a064"]):
> + pkt_types_ipv6_ip = {
> + "MAC_IPv6_GRE_IPv4-TUNNEL_UDP_PKT": ["TUNNEL_GRE",
> "INNER_L4_UDP"],
> + "MAC_IPv6_GRE_IPv4-TUNNEL_TCP_PKT": ["TUNNEL_GRE",
> "INNER_L4_TCP"],
> + "MAC_IPv6_GRE_IPv4-TUNNEL_SCTP_PKT": ["TUNNEL_GRE",
> "INNER_L4_SCTP"]
> + }
> +
> + pkt_types_ipv6_ipv6 = {
> + "MAC_IPv6_GRE_IPv6-TUNNEL_UDP_PKT": ["TUNNEL_GRE",
> "INNER_L4_UDP"],
> + "MAC_IPv6_GRE_IPv6-TUNNEL_TCP_PKT": ["TUNNEL_GRE",
> "INNER_L4_TCP"]
> + }
> +
> + pkt_types_ipv6_ipv6_SCTP = {
> + "MAC_IPv6_GRE_IPv6-TUNNEL_SCTP_PKT": ["TUNNEL_GRE",
> "INNER_L4_SCTP"]
> + }
> + else:
> + pkt_types_ipv6_ip = {
> + "MAC_IPv6_GRE_IPv4-TUNNEL_UDP_PKT":
> ["TUNNEL_GRENAT", "INNER_L4_UDP"],
> + "MAC_IPv6_GRE_IPv4-TUNNEL_TCP_PKT":
> ["TUNNEL_GRENAT", "INNER_L4_TCP"],
> + "MAC_IPv6_GRE_IPv4-TUNNEL_SCTP_PKT":
> ["TUNNEL_GRENAT", "INNER_L4_SCTP"],
> + "MAC_VLAN_IPv6_GRE_IPv4-TUNNEL_UDP_PKT":
> ["TUNNEL_GRENAT", "INNER_L4_UDP", "PKT_RX_VLAN"],
> + "MAC_VLAN_IPv6_GRE_IPv4-TUNNEL_TCP_PKT":
> ["TUNNEL_GRENAT", "INNER_L4_TCP", "PKT_RX_VLAN"],
> + "MAC_VLAN_IPv6_GRE_IPv4-TUNNEL_SCTP_PKT":
> ["TUNNEL_GRENAT", "INNER_L4_SCTP", "PKT_RX_VLAN"]
> + }
> +
> + pkt_types_ipv6_ipv6 = {
> + "MAC_IPv6_GRE_IPv6-TUNNEL_UDP_PKT":
> ["TUNNEL_GRENAT", "INNER_L4_UDP"],
> + "MAC_IPv6_GRE_IPv6-TUNNEL_TCP_PKT": ["TUNNEL_GRENAT",
> "INNER_L4_TCP"],
> + "MAC_VLAN_IPv6_GRE_IPv6-TUNNEL_UDP_PKT":
> ["TUNNEL_GRENAT", "INNER_L4_UDP", "PKT_RX_VLAN"],
> + "MAC_VLAN_IPv6_GRE_IPv6-TUNNEL_TCP_PKT":
> ["TUNNEL_GRENAT", "INNER_L4_TCP", "PKT_RX_VLAN"]
> + }
> +
> + pkt_types_ipv6_ipv6_SCTP = {
> + "MAC_IPv6_GRE_IPv6-TUNNEL_SCTP_PKT":
> ["TUNNEL_GRENAT", "INNER_L4_SCTP"],
> + "MAC_VLAN_IPv6_GRE_IPv6-TUNNEL_SCTP_PKT":
> ["TUNNEL_GRENAT", "INNER_L4_SCTP", "PKT_RX_VLAN"]
> + }
>
> # Start testpmd and enable rxonly forwarding mode
> - testpmd_cmd = "./%s/app/testpmd -c ffff -n 4 -- -i --enable-rx-cksum --
> enable-hw-vlan" % self.target
> + if (self.nic in ["cavium_a063", "cavium_a064"]):
> + testpmd_cmd = "./%s/app/testpmd -c ffff -n 4 -- -i --enable-rx-
> cksum" % self.target
> + else:
> + testpmd_cmd = "./%s/app/testpmd -c ffff -n 4 -- -i
> + --enable-rx-cksum --enable-hw-vlan" % self.target
> self.dut.send_expect(testpmd_cmd, "testpmd>", 20)
> self.dut.send_expect("set fwd rxonly", "testpmd>")
> self.dut.send_expect("set verbose 1", "testpmd>")
> --
> 1.8.3.1
More information about the dts
mailing list