[V1] tests/TestSuite_cvl_fdir.py modify the log validation for wrong action according to the change of dpdk, dpdk commit id:cb97e595d9d3b316690c8d5ac688240d2ba1e551
diff mbox series

Message ID 20201015094845.420591-1-qinx.sun@intel.com
State New
Headers show
Series
  • [V1] tests/TestSuite_cvl_fdir.py modify the log validation for wrong action according to the change of dpdk, dpdk commit id:cb97e595d9d3b316690c8d5ac688240d2ba1e551
Related show

Commit Message

Sun, QinX Oct. 15, 2020, 9:48 a.m. UTC
According to dpdk commit cb97e595d9d3b316690c8d5ac688240d2ba1e551 to
modify log validation for wrong action

Signed-off-by: sunqin <qinx.sun@intel.com>
---
 test_plans/cvl_fdir_test_plan.rst |  8 ++++----
 tests/TestSuite_cvl_fdir.py       | 14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

Comments

Peng, Yuan Oct. 15, 2020, 5:14 a.m. UTC | #1
Acked-by Peng, Yuan <yuan.peng@intel.com>

-----Original Message-----
From: dts <dts-bounces@dpdk.org> On Behalf Of sunqin
Sent: Thursday, October 15, 2020 5:49 PM
To: dts@dpdk.org
Cc: Sun, QinX <qinx.sun@intel.com>
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

According to dpdk commit cb97e595d9d3b316690c8d5ac688240d2ba1e551 to modify log validation for wrong action

Signed-off-by: sunqin <qinx.sun@intel.com>
---
 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):
--
2.17.1
Sun, QinX Oct. 15, 2020, 7:04 a.m. UTC | #2
Tested-by: Sun, QinX<qinx.sun@intel.com>

    Best Regards
    Sun qin
> -----Original Message-----
> From: sunqin <qinx.sun@intel.com>
> Sent: Thursday, October 15, 2020 5:49 PM
> To: dts@dpdk.org
> Cc: Sun, QinX <qinx.sun@intel.com>
> 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
> 
> According to dpdk commit cb97e595d9d3b316690c8d5ac688240d2ba1e551 to
> modify log validation for wrong action
LihongX Ma Oct. 16, 2020, 6:56 a.m. UTC | #3
> -----Original Message-----
> From: dts <dts-bounces@dpdk.org> On Behalf Of sunqin
> Sent: Thursday, October 15, 2020 5:49 PM
> To: dts@dpdk.org
> Cc: Sun, QinX <qinx.sun@intel.com>
> 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
> 
> According to dpdk commit cb97e595d9d3b316690c8d5ac688240d2ba1e551 to modify
> log validation for wrong action
> 
> Signed-off-by: sunqin <qinx.sun@intel.com>
> ---

The subject is the summarize of your patch, now the title is too long.
The commit id information put in comments is enough.

BTW: the format of the subject is like : [dts] [PATCH V1] tests/cvl_fdir: modify the log validation for wrong action according to the change of dpdk

Regards,
Ma,lihong

Patch
diff mbox series

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):