[V1] tests/cvl_advanced_rss: remove test steps behind the destroy rule

Message ID 20210707152333.19914-1-qinx.sun@intel.com (mailing list archive)
State Changes Requested
Headers
Series [V1] tests/cvl_advanced_rss: remove test steps behind the destroy rule |

Commit Message

Sun, QinX July 7, 2021, 3:23 p.m. UTC
  As dpdk cannot guarantee the operation after destroying the rule,
so remove the test steps behind the destroy rule step

Signed-off-by: Qin Sun <qinx.sun@intel.com>
---
 tests/TestSuite_cvl_advanced_rss.py       | 23 -----------------------
 tests/TestSuite_cvl_advanced_rss_pppoe.py |  3 ---
 2 files changed, 26 deletions(-)
  

Comments

Tu, Lijuan July 12, 2021, 5:17 a.m. UTC | #1
> -----Original Message-----
> From: dts <dts-bounces@dpdk.org> On Behalf Of Qin Sun
> Sent: 2021年7月7日 23:24
> To: dts@dpdk.org
> Cc: Sun, QinX <qinx.sun@intel.com>
> Subject: [dts] [PATCH V1] tests/cvl_advanced_rss: remove test steps behind the
> destroy rule
> 
> As dpdk cannot guarantee the operation after destroying the rule, so remove
> the test steps behind the destroy rule step
> 
> Signed-off-by: Qin Sun <qinx.sun@intel.com>

Test script should algin with test plan.
Did test plans update?

> ---
>  tests/TestSuite_cvl_advanced_rss.py       | 23 -----------------------
>  tests/TestSuite_cvl_advanced_rss_pppoe.py |  3 ---
>  2 files changed, 26 deletions(-)
> 
> diff --git a/tests/TestSuite_cvl_advanced_rss.py
> b/tests/TestSuite_cvl_advanced_rss.py
> index 1534eb8d..da756ac1 100644
> --- a/tests/TestSuite_cvl_advanced_rss.py
> +++ b/tests/TestSuite_cvl_advanced_rss.py
> @@ -6365,13 +6365,6 @@ class AdvancedRSSTest(TestCase):
>          self.rssprocess.handle_tests(tests, 0)
>          self.rssprocess.destroy_rule(port_id=0, rule_id=rule_id_1)
>          self.rssprocess.check_rule(port_id=0)
> -        tests = [
> -                    {
> -                        'send_packet':
> 'Ether(dst="00:11:22:33:44:55")/IP(src="192.168.0.3",dst="192.168.0.5")/Raw("
> x"*480)',
> -                        'action': {'check_no_hash': 'ipv4-pay'},
> -                    },
> -                ]
> -        self.rssprocess.handle_tests(tests, 0)
>          self.rssprocess.destroy_rule(port_id=0, rule_id=rule_id_0)
> 
>          # Subcase 3: two rules, scope smaller created first, and the larger one
> created later @@ -6411,15 +6404,7 @@ class AdvancedRSSTest(TestCase):
>                  ]
>          self.rssprocess.handle_tests(tests, 0)
>          self.rssprocess.destroy_rule(port_id=0, rule_id=rule_id_1)
> -        self.rssprocess.handle_tests(tests_3, 0)
>          self.rssprocess.destroy_rule(port_id=0, rule_id=rule_id_0)
> -        tests = [
> -                    {
> -                        'send_packet':
> 'Ether(dst="00:11:22:33:44:55")/IP(src="192.168.0.3",dst="192.168.0.5")/UDP(s
> port=23, dport=45)/Raw("x"*480)',
> -                        'action': {'check_no_hash': 'ipv4-udp-pay'},
> -                    },
> -                ]
> -        self.rssprocess.handle_tests(tests, 0)
> 
>          # Subcase 4: two rules, scope larger created first, and the smaller one
> created later
>          self.logger.info('===================Test sub case: multirules subcase 4
> ================') @@ -6458,15 +6443,7 @@ class
> AdvancedRSSTest(TestCase):
>                  ]
>          self.rssprocess.handle_tests(tests, 0)
>          self.rssprocess.destroy_rule(port_id=0, rule_id=rule_id_1)
> -        self.rssprocess.handle_tests(tests_4, 0)
>          self.rssprocess.destroy_rule(port_id=0, rule_id=rule_id_0)
> -        tests = [
> -                    {
> -                        'send_packet':
> 'Ether(dst="00:11:22:33:44:55")/IP(src="192.168.0.3",dst="192.168.0.5")/UDP(s
> port=23, dport=45)/Raw("x"*480)',
> -                        'action': {'check_no_hash': 'ipv4-udp-pay'},
> -                    },
> -                ]
> -        self.rssprocess.handle_tests(tests, 0)
>          self.verify(not self.rssprocess.error_msgs, 'some subcases failed')
> 
>      def tear_down(self):
> diff --git a/tests/TestSuite_cvl_advanced_rss_pppoe.py
> b/tests/TestSuite_cvl_advanced_rss_pppoe.py
> index 0529165a..2d3e226e 100644
> --- a/tests/TestSuite_cvl_advanced_rss_pppoe.py
> +++ b/tests/TestSuite_cvl_advanced_rss_pppoe.py
> @@ -4710,12 +4710,9 @@ class Advanced_rss_pppoe(TestCase):
>          # destory rule 1
>          self.rsspro.destroy_rule(rule_id=1)
>          self.rsspro.check_rule(rule_list=['1'], stats=False)
> -        pkt_list[1], pkt_list[2] = pkt_list[2], pkt_list[1]
> -        self._send_pkt_action(pkt_list, action_list=action_list1)
>          # destory rule 0
>          self.rsspro.destroy_rule(rule_id=0)
>          self.rsspro.check_rule(rule_list=['0'], stats=False)
> -        self._send_pkt_action([pkt_list[0]], action_list=action_list2)
> 
>      def test_two_rules_smaller_first_larger_later(self, ):
>          """
> --
> 2.17.1
  

Patch

diff --git a/tests/TestSuite_cvl_advanced_rss.py b/tests/TestSuite_cvl_advanced_rss.py
index 1534eb8d..da756ac1 100644
--- a/tests/TestSuite_cvl_advanced_rss.py
+++ b/tests/TestSuite_cvl_advanced_rss.py
@@ -6365,13 +6365,6 @@  class AdvancedRSSTest(TestCase):
         self.rssprocess.handle_tests(tests, 0)
         self.rssprocess.destroy_rule(port_id=0, rule_id=rule_id_1)
         self.rssprocess.check_rule(port_id=0)
-        tests = [
-                    {
-                        'send_packet': 'Ether(dst="00:11:22:33:44:55")/IP(src="192.168.0.3",dst="192.168.0.5")/Raw("x"*480)',
-                        'action': {'check_no_hash': 'ipv4-pay'},
-                    },
-                ]
-        self.rssprocess.handle_tests(tests, 0)
         self.rssprocess.destroy_rule(port_id=0, rule_id=rule_id_0)
 
         # Subcase 3: two rules, scope smaller created first, and the larger one created later
@@ -6411,15 +6404,7 @@  class AdvancedRSSTest(TestCase):
                 ]
         self.rssprocess.handle_tests(tests, 0)
         self.rssprocess.destroy_rule(port_id=0, rule_id=rule_id_1)
-        self.rssprocess.handle_tests(tests_3, 0)
         self.rssprocess.destroy_rule(port_id=0, rule_id=rule_id_0)
-        tests = [
-                    {
-                        'send_packet': 'Ether(dst="00:11:22:33:44:55")/IP(src="192.168.0.3",dst="192.168.0.5")/UDP(sport=23, dport=45)/Raw("x"*480)',
-                        'action': {'check_no_hash': 'ipv4-udp-pay'},
-                    },
-                ]
-        self.rssprocess.handle_tests(tests, 0)
 
         # Subcase 4: two rules, scope larger created first, and the smaller one created later
         self.logger.info('===================Test sub case: multirules subcase 4 ================')
@@ -6458,15 +6443,7 @@  class AdvancedRSSTest(TestCase):
                 ]
         self.rssprocess.handle_tests(tests, 0)
         self.rssprocess.destroy_rule(port_id=0, rule_id=rule_id_1)
-        self.rssprocess.handle_tests(tests_4, 0)
         self.rssprocess.destroy_rule(port_id=0, rule_id=rule_id_0)
-        tests = [
-                    {
-                        'send_packet': 'Ether(dst="00:11:22:33:44:55")/IP(src="192.168.0.3",dst="192.168.0.5")/UDP(sport=23, dport=45)/Raw("x"*480)',
-                        'action': {'check_no_hash': 'ipv4-udp-pay'},
-                    },
-                ]
-        self.rssprocess.handle_tests(tests, 0)
         self.verify(not self.rssprocess.error_msgs, 'some subcases failed')
 
     def tear_down(self):
diff --git a/tests/TestSuite_cvl_advanced_rss_pppoe.py b/tests/TestSuite_cvl_advanced_rss_pppoe.py
index 0529165a..2d3e226e 100644
--- a/tests/TestSuite_cvl_advanced_rss_pppoe.py
+++ b/tests/TestSuite_cvl_advanced_rss_pppoe.py
@@ -4710,12 +4710,9 @@  class Advanced_rss_pppoe(TestCase):
         # destory rule 1
         self.rsspro.destroy_rule(rule_id=1)
         self.rsspro.check_rule(rule_list=['1'], stats=False)
-        pkt_list[1], pkt_list[2] = pkt_list[2], pkt_list[1]
-        self._send_pkt_action(pkt_list, action_list=action_list1)
         # destory rule 0
         self.rsspro.destroy_rule(rule_id=0)
         self.rsspro.check_rule(rule_list=['0'], stats=False)
-        self._send_pkt_action([pkt_list[0]], action_list=action_list2)
 
     def test_two_rules_smaller_first_larger_later(self, ):
         """