From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id C5768A0510; Wed, 18 Dec 2019 11:32:47 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 78B1F2BF9; Wed, 18 Dec 2019 11:32:47 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by dpdk.org (Postfix) with ESMTP id 085041C01 for ; Wed, 18 Dec 2019 11:32:45 +0100 (CET) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id xBIAVpvF004371 for ; Wed, 18 Dec 2019 02:32:44 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : mime-version : content-type; s=pfpt0818; bh=as+JwI1I0a5U9JisCNCHBMH/cQ3VFM+Msrd4DTQaE8Y=; b=GTOkcqtJAXRGhJaMadsMj7ITw+zswKntd0qAIBoeQjvcy9wuU79af9K9jRV5h6aLmWJ0 fhXM7kAmNixxkZNiC22xmHboVz0ne07nmePuDFfQxZnK6s2NfbBcplc5kXSCDZh0W/rE 47puxRGtmgAmk43G5Do0xcdnKOtJtgvdM/ttQjKfgjs6AgHRN+6HQoIefvITKXPggVMd VsK62eEnM4XOlKFnzSwUxf5PSQkKEJU5w0+UkVqXiPE5nI3uTvQlSgxRWMyUCxq86NH6 HckXIsU6fo33LXemICG2WJIvZMH8q4drEXdwpWiLu4Rm/xOJ82BvRKj77vEZ8BAomVJb vw== Received: from sc-exch04.marvell.com ([199.233.58.184]) by mx0b-0016f401.pphosted.com with ESMTP id 2wxn0wp6y9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Wed, 18 Dec 2019 02:32:44 -0800 Received: from SC-EXCH01.marvell.com (10.93.176.81) by SC-EXCH04.marvell.com (10.93.176.84) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 18 Dec 2019 02:32:42 -0800 Received: from maili.marvell.com (10.93.176.43) by SC-EXCH01.marvell.com (10.93.176.81) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Wed, 18 Dec 2019 02:32:42 -0800 Received: from localhost.marvell.com (unknown [10.28.10.195]) by maili.marvell.com (Postfix) with ESMTP id A3B453F7043; Wed, 18 Dec 2019 02:32:41 -0800 (PST) From: To: CC: , Praneeth Reddy Date: Wed, 18 Dec 2019 16:02:39 +0530 Message-ID: <1576665159-6699-1-git-send-email-nareddy@marvell.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 Content-Type: text/plain X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.95,18.0.572 definitions=2019-12-18_02:2019-12-17,2019-12-18 signatures=0 Subject: [dts] [PATCH] TestSuite_ipgre.py: cavium_a063 and cavium_a064 supports IPv4 GRE X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org Sender: "dts" From: Praneeth Reddy 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 --- 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