From patchwork Thu Oct 15 09:48:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Sun, QinX" X-Patchwork-Id: 80708 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id DF78DA04B7; Wed, 14 Oct 2020 11:54:35 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D6AE71DDC8; Wed, 14 Oct 2020 11:54:34 +0200 (CEST) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id 4769B1DDB9 for ; Wed, 14 Oct 2020 11:54:32 +0200 (CEST) IronPort-SDR: mA4C8BpVESjuB66OM2pbWDjYabl44Gfp4Hoa/h6GZgQRNKSJAzWCdyAMHJWQXiSNYJCH14QUkU tBiHbN2tfRRA== X-IronPort-AV: E=McAfee;i="6000,8403,9773"; a="227710132" X-IronPort-AV: E=Sophos;i="5.77,374,1596524400"; d="scan'208";a="227710132" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Oct 2020 02:54:30 -0700 IronPort-SDR: SpVhllDh1PhsFiS4h1OpQiDS/pvRiY6qiXMx0zzM8TI3iZeC+BmOiyJofOJcnayY3gp4Geq+6y OvTa10avjoeQ== X-IronPort-AV: E=Sophos;i="5.77,374,1596524400"; d="scan'208";a="299877572" Received: from unknown (HELO localhost.localdomain) ([10.240.183.61]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Oct 2020 02:54:28 -0700 From: sunqin To: dts@dpdk.org Cc: sunqin Date: Thu, 15 Oct 2020 17:48:45 +0800 Message-Id: <20201015094845.420591-1-qinx.sun@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [dts] [PATCH V1] tests/TestSuite_cvl_fdir.py modify the log validation for wrong action according to the change of dpdk, dpdk commit id:cb97e595d9d3b316690c8d5ac688240d2ba1e551 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" According to dpdk commit cb97e595d9d3b316690c8d5ac688240d2ba1e551 to modify log validation for wrong action Signed-off-by: sunqin Signed-off-by: sunqin Tested-by: Sun, QinX --- test_plans/cvl_fdir_test_plan.rst | 8 ++++---- tests/TestSuite_cvl_fdir.py | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/test_plans/cvl_fdir_test_plan.rst b/test_plans/cvl_fdir_test_plan.rst index 0e1521f..740cb37 100644 --- a/test_plans/cvl_fdir_test_plan.rst +++ b/test_plans/cvl_fdir_test_plan.rst @@ -610,7 +610,7 @@ Note: there may be error message change. get the message:: - Invalid input action: Invalid argument + 'error' in message Discontinuous queues:: @@ -2939,7 +2939,7 @@ Subcase 1: invalid parameters of queue index Failed to create flow, report message:: - Invalid queue for FDIR.: Invalid argument + 'error' in message 2. check there is no rule listed. @@ -3053,7 +3053,7 @@ Subcase 6: conflicted rules or:: - Invalid input action number: Invalid argument + 'error' in message 3. check there is only one rule listed. @@ -3066,7 +3066,7 @@ Subcase 7: conflicted actions Failed to create flow, report message:: - Invalid input action: Invalid argument + 'error' in message 2. check there is no rule listed. diff --git a/tests/TestSuite_cvl_fdir.py b/tests/TestSuite_cvl_fdir.py index e5a9c71..fd005b3 100644 --- a/tests/TestSuite_cvl_fdir.py +++ b/tests/TestSuite_cvl_fdir.py @@ -2428,7 +2428,7 @@ class TestCVLFdir(TestCase): check_stats=False, check_msg='Bad arguments') self.validate_fdir_rule( 'flow validate 0 ingress pattern eth / ipv4 src is 192.168.0.20 dst is 192.168.0.21 proto is 255 ttl is 2 tos is 4 / end actions rss queues 2 3 end / rss / end', - check_stats=False, check_msg='Invalid input action number: Invalid argument') + check_stats=False, check_msg='error') self.validate_fdir_rule( 'flow validate 0 ingress pattern eth / ipv4 src is 192.168.0.20 dst is 192.168.0.21 proto is 255 ttl is 2 tos is 4 / end actions passthru / mark id 4294967296 / end', check_stats=False, check_msg='Bad arguments') @@ -2580,7 +2580,7 @@ class TestCVLFdir(TestCase): def test_invalid_parameters_of_queue_index(self): rule = "flow create 0 ingress pattern eth dst is 00:11:22:33:44:55 / ipv4 src is 192.168.0.20 dst is 192.168.0.21 proto is 255 ttl is 2 tos is 4 / end actions queue index 64 / end" out = self.dut.send_command(rule, timeout=1) - self.verify("Invalid input action: Invalid argument" in out, "failed with output: %s" % out) + self.verify("error" in out, "failed with output: %s" % out) self.check_fdir_rule(port_id=0, stats=False) def test_invalid_parameters_of_rss_queues(self): @@ -2588,11 +2588,11 @@ class TestCVLFdir(TestCase): "flow create 0 ingress pattern eth dst is 00:11:22:33:44:55 / ipv4 src is 192.168.0.20 dst is 192.168.0.21 proto is 255 ttl is 2 tos is 4 / end actions rss queues 1 2 3 end / end", "flow create 0 ingress pattern eth dst is 00:11:22:33:44:55 / ipv4 src is 192.168.0.20 dst is 192.168.0.21 proto is 255 ttl is 2 tos is 4 / end actions rss queues 0 end / end", "flow create 0 ingress pattern eth dst is 00:11:22:33:44:55 / ipv4 src is 192.168.0.20 dst is 192.168.0.21 proto is 255 ttl is 2 tos is 4 / end actions rss queues end / end"] - self.create_fdir_rule(rule=rule1, check_stats=False, msg='Invalid input action: Invalid argument') + self.create_fdir_rule(rule=rule1, check_stats=False, msg='error') rule2 = 'flow create 0 ingress pattern eth dst is 00:11:22:33:44:55 / ipv4 src is 192.168.0.20 dst is 192.168.0.21 proto is 255 ttl is 2 tos is 4 / end actions rss queues 1 2 3 5 end / end' - self.create_fdir_rule(rule2, check_stats=False, msg='Invalid input action: Invalid argument') + self.create_fdir_rule(rule2, check_stats=False, msg='error') rule3 = 'flow create 0 ingress pattern eth dst is 00:11:22:33:44:55 / ipv4 src is 192.168.0.20 dst is 192.168.0.21 proto is 255 ttl is 2 tos is 4 / end actions rss queues 63 64 end / end' - self.create_fdir_rule(rule3, check_stats=False, msg='Invalid input action: Invalid argument') + self.create_fdir_rule(rule3, check_stats=False, msg='error') try: # restart testpmd self.dut.send_expect("quit", "# ") @@ -2655,13 +2655,13 @@ class TestCVLFdir(TestCase): 'flow create 0 ingress pattern eth dst is 00:11:22:33:44:55 / ipv6 dst is CDCD:910A:2222:5498:8475:1111:3900:2021 / end actions mark / end', 'flow create 0 ingress pattern eth dst is 00:11:22:33:44:55 / ipv6 dst is CDCD:910A:2222:5498:8475:1111:3900:2020 src is 2001::2 / udp src is 22 dst is 23 / end actions queue index 1 / mark / end'] self.create_fdir_rule(rule2[0:4], check_stats=False, msg="Rule already exists!: File exists", validate=False) - self.create_fdir_rule(rule2[4:7], check_stats=False, msg="Invalid input action number: Invalid argument", validate=False) + self.create_fdir_rule(rule2[4:7], check_stats=False, msg="error", validate=False) self.create_fdir_rule(rule2[7:], check_stats=False, msg="Invalid input set: Invalid argument", validate=False) self.check_fdir_rule(stats=True, rule_list=rule_li) def test_conflicted_actions(self): rule1 = "flow create 0 ingress pattern eth dst is 00:11:22:33:44:55 / ipv4 src is 192.168.0.20 dst is 192.168.0.21 ttl is 2 tos is 4 / end actions queue index 1 / rss queues 2 3 end / end" - self.create_fdir_rule(rule1, check_stats=False, msg="Invalid input action number: Invalid argument") + self.create_fdir_rule(rule1, check_stats=False, msg="error") self.check_fdir_rule(stats=False) def test_void_action(self):