[V1] tests/cvl_dcf_flow_priority: modify PPP proto field to byte type

Message ID 20210706053843.6254-1-qinx.sun@intel.com (mailing list archive)
State Changes Requested
Headers
Series [V1] tests/cvl_dcf_flow_priority: modify PPP proto field to byte type |

Commit Message

Sun, QinX July 6, 2021, 5:38 a.m. UTC
  modify PPP proto field to byte type to adapt scapy2.4.4,
replace 'insmod xxx' with 'modprobe ice' to reduce configure file

Signed-off-by: Qin Sun <qinx.sun@intel.com>
---
 tests/TestSuite_cvl_dcf_flow_priority.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 tests/TestSuite_cvl_dcf_flow_priority.py
  

Comments

Sun, QinX July 8, 2021, 6:35 a.m. UTC | #1
> -----Original Message-----
> From: Sun, QinX <qinx.sun@intel.com>
> Sent: Tuesday, July 6, 2021 1:39 PM
> To: dts@dpdk.org
> Cc: Sun, QinX <qinx.sun@intel.com>
> Subject: [dts] [PATCH V1] tests/cvl_dcf_flow_priority: modify PPP proto field to byte type

Tested-by: Qin Sun <qinx.sun@intel.com>
  
Tu, Lijuan July 12, 2021, 3:22 a.m. UTC | #2
> -----Original Message-----
> From: dts <dts-bounces@dpdk.org> On Behalf Of Qin Sun
> Sent: 2021年7月6日 13:39
> To: dts@dpdk.org
> Cc: Sun, QinX <qinx.sun@intel.com>
> Subject: [dts] [PATCH V1] tests/cvl_dcf_flow_priority: modify PPP proto field to
> byte type
> 
> modify PPP proto field to byte type to adapt scapy2.4.4, replace 'insmod xxx'
> with 'modprobe ice' to reduce configure file
> 
> Signed-off-by: Qin Sun <qinx.sun@intel.com>
> ---
>  tests/TestSuite_cvl_dcf_flow_priority.py | 7 ++-----
>  1 file changed, 2 insertions(+), 5 deletions(-)  mode change 100644 => 100755
> tests/TestSuite_cvl_dcf_flow_priority.py
> 
> diff --git a/tests/TestSuite_cvl_dcf_flow_priority.py
> b/tests/TestSuite_cvl_dcf_flow_priority.py
> old mode 100644
> new mode 100755
> index 532d993..1e9c1f5
> --- a/tests/TestSuite_cvl_dcf_flow_priority.py
> +++ b/tests/TestSuite_cvl_dcf_flow_priority.py
> @@ -1155,11 +1155,8 @@ class CVLDCFFlowPriorityTest(TestCase):
>          """
>          Run before each test case.
>          """
> -        self.suite_config = rfc.get_suite_config(self)
> -        ice_driver_file_location = self.suite_config["ice_driver_file_location"]
>          self.dut.send_expect("rmmod ice","#",30)
> -        self.dut.send_expect("insmod %s" % ice_driver_file_location, "# ", 60)
> -        time.sleep(10)
> +        self.dut.send_expect("modprobe ice","#",30)

@Qi: why reload ice drive in set_up? I think there must be some limitation here.

@Qin, I think ice have been load before , so it is redundant .

> 
>      def create_testpmd_command(self):
>          """
> @@ -1733,7 +1730,7 @@ class CVLDCFFlowPriorityTest(TestCase):
>          self.dut.send_expect("flow destroy 0 rule 1", "testpmd> ", 15)
>          matched_dic["expect_results"]["expect_pkts"]=0
>          self.send_and_check_packets(matched_dic)
> -        matched_dic =
> {"scapy_str":['Ether(dst="00:11:22:33:44:55",type=0x8100)/Dot1Q(vlan=1,type=
> 0x8100)/Dot1Q(vlan=0x2,type=0x8864)/PPPoE(sessionid=0x1)/PPP(proto=0x21)/
> IP()/UDP(dport=23)/("X"*480)'],
> +        matched_dic =
> + {"scapy_str":['Ether(dst="00:11:22:33:44:55",type=0x8100)/Dot1Q(vlan=1
> + ,type=0x8100)/Dot1Q(vlan=0x2,type=0x8864)/PPPoE(sessionid=1)/PPP(b\'\\
> + x00\\x21\')/IP()/UDP(dport=23)/("X"*480)'],
>                         "check_func":{"func":rfc.check_vf_rx_packets_number,
>                                       "param":{"expect_port":2, "expect_queue":"null"}},
>                         "expect_results":{"expect_pkts":1}}
> --
> 2.25.1
  

Patch

diff --git a/tests/TestSuite_cvl_dcf_flow_priority.py b/tests/TestSuite_cvl_dcf_flow_priority.py
old mode 100644
new mode 100755
index 532d993..1e9c1f5
--- a/tests/TestSuite_cvl_dcf_flow_priority.py
+++ b/tests/TestSuite_cvl_dcf_flow_priority.py
@@ -1155,11 +1155,8 @@  class CVLDCFFlowPriorityTest(TestCase):
         """
         Run before each test case.
         """
-        self.suite_config = rfc.get_suite_config(self)
-        ice_driver_file_location = self.suite_config["ice_driver_file_location"]
         self.dut.send_expect("rmmod ice","#",30)
-        self.dut.send_expect("insmod %s" % ice_driver_file_location, "# ", 60)
-        time.sleep(10)
+        self.dut.send_expect("modprobe ice","#",30)
   
     def create_testpmd_command(self):
         """
@@ -1733,7 +1730,7 @@  class CVLDCFFlowPriorityTest(TestCase):
         self.dut.send_expect("flow destroy 0 rule 1", "testpmd> ", 15)
         matched_dic["expect_results"]["expect_pkts"]=0
         self.send_and_check_packets(matched_dic)
-        matched_dic = {"scapy_str":['Ether(dst="00:11:22:33:44:55",type=0x8100)/Dot1Q(vlan=1,type=0x8100)/Dot1Q(vlan=0x2,type=0x8864)/PPPoE(sessionid=0x1)/PPP(proto=0x21)/IP()/UDP(dport=23)/("X"*480)'],
+        matched_dic = {"scapy_str":['Ether(dst="00:11:22:33:44:55",type=0x8100)/Dot1Q(vlan=1,type=0x8100)/Dot1Q(vlan=0x2,type=0x8864)/PPPoE(sessionid=1)/PPP(b\'\\x00\\x21\')/IP()/UDP(dport=23)/("X"*480)'],
                        "check_func":{"func":rfc.check_vf_rx_packets_number,
                                      "param":{"expect_port":2, "expect_queue":"null"}},
                        "expect_results":{"expect_pkts":1}}