[V2,4/6] tests/flow_classify_softnic: update case code for dpdk code change

Message ID 1636450824-120178-4-git-send-email-songx.jiale@intel.com (mailing list archive)
State Superseded
Headers
Series [V2,1/6] tests/cvl_advanced_iavf_rss_vlan_esp_ah_l2tp_pfcp: update case code for dpdk code change |

Commit Message

Jiale, SongX Nov. 9, 2021, 9:40 a.m. UTC
  Signed-off-by: Jiale Song <songx.jiale@intel.com>
---
 test_plans/flow_classify_softnic_test_plan.rst | 8 ++++----
 tests/TestSuite_flow_classify_softnic.py       | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)
  

Patch

diff --git a/test_plans/flow_classify_softnic_test_plan.rst b/test_plans/flow_classify_softnic_test_plan.rst
index b18d32b6..2b46d0af 100644
--- a/test_plans/flow_classify_softnic_test_plan.rst
+++ b/test_plans/flow_classify_softnic_test_plan.rst
@@ -562,7 +562,7 @@  a) Map the table a::
     dst mask 255.255.255.255 src spec 100.0.0.1 dst spec 200.0.0.1 proto spec 17 \
     / udp src mask 0 dst mask 0 src spec 100 dst spec 200 / end actions queue index 3 / end
 
-   Error reported, rule item is inconsistent with the table match.
+   Invalid port 4, rule item is inconsistent with the table match.
    Table with hask key mask for src addr, but the rule added is for dst addr.
 
 b) Map the table b::
@@ -571,7 +571,7 @@  b) Map the table b::
     dst mask 255.255.255.255 src spec 100.0.0.1 dst spec 200.0.0.1 proto spec 17 \
     / udp src mask 0 dst mask 0 src spec 100 dst spec 200 / end actions queue index 3 / end
 
-   Error reported, rule item is inconsistent with the table match.
+   Invalid port 4, rule item is inconsistent with the table match.
    Table with hask key mask for dst addr 255.255.255.0, but the rule added is 255.255.255.255.
 
 Test Case: ipv6 rule item inconsistent with table match format
@@ -605,7 +605,7 @@  a) Map the table a::
     src spec 2001::1 dst spec 0::1 proto spec 17 / udp src mask 0 dst mask 65535 \
     src spec 31 dst spec 41 / end actions queue index 3 / end
 
-   Error reported, rule item is inconsistent with the table match.
+   Invalid port 4, rule item is inconsistent with the table match.
    Table with hask key mask for 5 tuple, but the rule added mask udp src with 0.
 
 b) Map the table b::
@@ -615,7 +615,7 @@  b) Map the table b::
     ABCD:EF01:2345:6789:ABCD:EF01:2345:5789 dst spec 0:0:0:0:0:0:0:0 proto spec 17 \
     / udp src mask 0 dst mask 0 src spec 0 dst spec 0 / end actions queue index 3 / end
 
-   Error reported, rule item is inconsistent with the table match.
+   Invalid port 4, rule item is inconsistent with the table match.
    Table with hask key mask for dst addr, but the rule added is for src addr.
 
 Test Case: ipv4 hash table rss action
diff --git a/tests/TestSuite_flow_classify_softnic.py b/tests/TestSuite_flow_classify_softnic.py
index a2c15dcc..329e3d4c 100644
--- a/tests/TestSuite_flow_classify_softnic.py
+++ b/tests/TestSuite_flow_classify_softnic.py
@@ -844,13 +844,13 @@  class TestFlowClassifySoftnic(TestCase):
         self.start_testpmd(filename, self.port_num)
 
         # create rule
-        self.dut.send_expect("flow create 4 group 0 ingress pattern eth / ipv4 proto mask 0 src mask 0.0.0.0 dst mask 255.255.255.255 src spec 100.0.0.1 dst spec 200.0.0.1 proto spec 17 / udp src mask 0 dst mask 0 src spec 100 dst spec 200 / end actions queue index 3 / end", "error", 60)
+        self.dut.send_expect("flow create 4 group 0 ingress pattern eth / ipv4 proto mask 0 src mask 0.0.0.0 dst mask 255.255.255.255 src spec 100.0.0.1 dst spec 200.0.0.1 proto spec 17 / udp src mask 0 dst mask 0 src spec 100 dst spec 200 / end actions queue index 3 / end", "Invalid port 4", 60)
         self.dut.send_expect("quit", "# ", 60)
 
         cmd = "pipeline RX table match hash ext key 8 mask FFFFFF0000000000 offset 286 buckets 16K size 64K action AP0"
         self.set_table(cmd, filename)
         self.start_testpmd(filename, self.port_num)
-        self.dut.send_expect("flow create 4 group 0 ingress pattern eth / ipv4 proto mask 0 src mask 0.0.0.0 dst mask 255.255.255.255 src spec 100.0.0.1 dst spec 200.0.0.1 proto spec 17 / udp src mask 0 dst mask 0 src spec 100 dst spec 200 / end actions queue index 3 / end", "error", 60)
+        self.dut.send_expect("flow create 4 group 0 ingress pattern eth / ipv4 proto mask 0 src mask 0.0.0.0 dst mask 255.255.255.255 src spec 100.0.0.1 dst spec 200.0.0.1 proto spec 17 / udp src mask 0 dst mask 0 src spec 100 dst spec 200 / end actions queue index 3 / end", "Invalid port 4", 60)
         self.dut.send_expect("quit", "# ", 60)
 
         # ipv6
@@ -858,13 +858,13 @@  class TestFlowClassifySoftnic(TestCase):
         cmd = "pipeline RX table match hash ext key 64 mask 0000FF00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000000000000 offset 274 buckets 16K size 64K action AP0"
         self.set_table(cmd, filename)
         self.start_testpmd(filename, self.port_num)
-        self.dut.send_expect("flow create 4 group 0 ingress pattern eth / ipv6 proto mask 255 src mask ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff dst mask ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff src spec 2001::1 dst spec 0::1 proto spec 17 / udp src mask 0 dst mask 65535 src spec 31 dst spec 41 / end actions queue index 3 / end", "error", 60)
+        self.dut.send_expect("flow create 4 group 0 ingress pattern eth / ipv6 proto mask 255 src mask ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff dst mask ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff src spec 2001::1 dst spec 0::1 proto spec 17 / udp src mask 0 dst mask 65535 src spec 31 dst spec 41 / end actions queue index 3 / end", "Invalid port 4", 60)
         self.dut.send_expect("quit", "# ", 60)
 
         cmd = "pipeline RX table match hash ext key 16 mask FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF offset 294 buckets 16K size 64K action AP0"
         self.set_table(cmd, filename)
         self.start_testpmd(filename, self.port_num)
-        self.dut.send_expect("flow create 4 group 0 ingress pattern eth / ipv6 proto mask 0  src mask ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff dst mask 0:0:0:0:0:0:0:0 src spec ABCD:EF01:2345:6789:ABCD:EF01:2345:5789 dst spec 0:0:0:0:0:0:0:0 proto spec 17 / udp src mask 0 dst mask 0 src spec 0 dst spec 0 / end actions queue index 3 / end", "error", 60)
+        self.dut.send_expect("flow create 4 group 0 ingress pattern eth / ipv6 proto mask 0  src mask ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff dst mask 0:0:0:0:0:0:0:0 src spec ABCD:EF01:2345:6789:ABCD:EF01:2345:5789 dst spec 0:0:0:0:0:0:0:0 proto spec 17 / udp src mask 0 dst mask 0 src spec 0 dst spec 0 / end actions queue index 3 / end", "Invalid port 4", 60)
         self.dut.send_expect("quit", "# ", 60)
 
     def test_ipv4_hash_rss_action(self):