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 39562A0613 for ; Mon, 23 Sep 2019 11:24:39 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1DE741BE85; Mon, 23 Sep 2019 11:24:39 +0200 (CEST) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id 5197B324D for ; Mon, 23 Sep 2019 11:24:37 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 Sep 2019 02:24:36 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,539,1559545200"; d="scan'208";a="272221628" Received: from unknown (HELO dpdk-wenjielx-dtspatch135.sh.intel.com) ([10.240.176.135]) by orsmga001.jf.intel.com with ESMTP; 23 Sep 2019 02:24:35 -0700 From: Peng Yuan To: dts@dpdk.org Cc: Peng Yuan Date: Mon, 23 Sep 2019 17:29:05 +0800 Message-Id: <1569230945-82019-1-git-send-email-yuan.peng@intel.com> X-Mailer: git-send-email 1.9.3 Subject: [dts] [PATCH v1]tests: add some check parameters to TestSuite_ipgre.py 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" Add some check parameters to TestSuite_ipgre.py Signed-off-by: Peng Yuan diff --git a/tests/TestSuite_ipgre.py b/tests/TestSuite_ipgre.py index d74ac05..d08a933 100644 --- a/tests/TestSuite_ipgre.py +++ b/tests/TestSuite_ipgre.py @@ -63,7 +63,9 @@ class TestIpgre(TestCase): """ self.printFlag = self._enable_debug ports = self.dut.get_ports() - self.verify(self.nic in ["columbiaville_25g", "columbiaville_100g", "fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortville_25g", "carlsville"], + 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") self.verify(len(ports) >= 1, "Insufficient ports for testing") valports = [_ for _ in ports if self.tester.get_local_port(_) != -1] @@ -90,7 +92,7 @@ class TestIpgre(TestCase): """ pass - def check_packet_transmission(self, pkt_types, layer_configs=None): + def check_packet_transmission(self, pkt_types, layer_configs=None, queue=None, add_filter=0): time.sleep(1) for pkt_type in pkt_types.keys(): pkt_names = pkt_types[pkt_type] @@ -115,6 +117,14 @@ class TestIpgre(TestCase): else: print utils.GREEN("Detected %s successfully" % pkt_type) time.sleep(1) + if queue == None: # no filter + pass + else: + if add_filter: # remove filter + self.verify(("Receive queue=0x%s" % queue) in out, "Failed to enter the right queue.") + else: + self.verify(("Receive queue=0x%s" % queue) not in out, "Failed to enter the right queue.") + def save_ref_packet(self, pkt_types, layer_configs=None): for pkt_type in pkt_types.keys(): @@ -186,7 +196,7 @@ class TestIpgre(TestCase): config_layers = {'ether': {'src': self.outer_mac_src}, 'ipv4': {'proto': 'gre'}} # Start testpmd and enable rxonly forwarding mode - testpmd_cmd = "./%s/app/testpmd -c ffff -n 4 -- -i --enable-rx-cksum --enable-rx-cksum" % self.target + testpmd_cmd = "./%s/app/testpmd -c ffff -n 4 -- -i --enable-rx-cksum" % self.target self.dut.send_expect( testpmd_cmd, "testpmd>", 20) @@ -278,12 +288,16 @@ class TestIpgre(TestCase): # Send packet inner ip address matched and check packet received by queue 3 pkt_types = {"MAC_IP_GRE_IPv4-TUNNEL_UDP_PKT": ["TUNNEL_GRENAT", "INNER_L4_UDP"]} config_layers = {'ether': {'src': self.outer_mac_src}, - 'ipv4': {'dst': "0.0.0.0", 'proto': 'gre'}} - self.check_packet_transmission(pkt_types, config_layers) + 'ipv4': {'proto': 'gre', + 'src': self.outer_ip_src, + 'dst': self.outer_ip_dst}, + 'inner_ipv4':{'dst': "0.0.0.0"}} + self.check_packet_transmission(pkt_types, config_layers, "3", 1) # Remove tunnel filter and check same packet received by queue 0 cmd = "tunnel_filter rm 0 %s %s 0.0.0.0 1 ipingre iip 0 3"%(outer_mac, inner_mac) self.dut.send_expect( cmd, "testpmd>") + self.check_packet_transmission(pkt_types, config_layers, "3") # Add GRE filter that forward outer ip address 0.0.0.0 to queue 3 cmd = "tunnel_filter add 0 %s %s 0.0.0.0 1 ipingre oip 0 3"%(outer_mac, inner_mac) @@ -293,11 +307,13 @@ class TestIpgre(TestCase): pkt_types = {"MAC_IP_GRE_IPv4-TUNNEL_UDP_PKT": ["TUNNEL_GRENAT", "INNER_L4_UDP"]} config_layers = {'ether': {'src': self.outer_mac_src}, 'ipv4': {'dst': "0.0.0.0", 'proto': 'gre'}} - self.check_packet_transmission(pkt_types, config_layers) + self.check_packet_transmission(pkt_types, config_layers, "3", 1) # Add GRE filter that forward outer ip address 0.0.0.0 to queue 3 - cmd = "tunnel_filter rm 0 %s %s 0.0.0.0 1 ipingre iip 0 3"%(outer_mac, inner_mac) + cmd = "tunnel_filter rm 0 %s %s 0.0.0.0 1 ipingre oip 0 3"%(outer_mac, inner_mac) self.dut.send_expect( cmd, "testpmd>") + self.check_packet_transmission(pkt_types, config_layers, "3") + time.sleep(2) self.dut.send_expect("quit", "#") @@ -437,14 +453,12 @@ class TestIpgre(TestCase): def tear_down(self): """ Run after each test case. - Nothing to do. """ - pass + self.dut.kill_all() def tear_down_all(self): """ Run after each test suite. Nothing to do. """ - self.dut.kill_all() pass -- 2.7.4