Tested-by: Zeng, XiaoxiaoX <xiaoxiaox.zeng@intel.com>

Best regards,
Zeng,xiaoxiao


> -----Original Message-----
> From: Zeng, XiaoxiaoX
> Sent: Tuesday, June 16, 2020 1:22 AM
> To: dts@dpdk.org
> Cc: Zeng, XiaoxiaoX <xiaoxiaox.zeng@intel.com>
> Subject: [dts] [PATCH V1]tests/cvl_advanced_iavf_rss:change pfcp case
> according to testplan
> 
> *. change pfcp part test according to the latest
> cvl_advanced_iavf_rss_test_plan
> 
> Signed-off-by: Zeng Xiaoxiao <xiaoxiaox.zeng@intel.com>
> ---
>  tests/TestSuite_cvl_advanced_iavf_rss.py | 50 ++++++++++++++----------
>  1 file changed, 30 insertions(+), 20 deletions(-)
> 
> diff --git a/tests/TestSuite_cvl_advanced_iavf_rss.py
> b/tests/TestSuite_cvl_advanced_iavf_rss.py
> index 1e6ac19..ade3bba 100644
> --- a/tests/TestSuite_cvl_advanced_iavf_rss.py
> +++ b/tests/TestSuite_cvl_advanced_iavf_rss.py
> @@ -268,26 +268,25 @@ tv_iavf_mac_cvlan_rss = {
>      "check_func": rfc.check_iavf_packets_rss_queue  }
> 
> -tv_iavf_mac_ipv4_pfcp_session = {
> -    "name": "iavf_mac_ipv4_pfcp_session",
> -    "rte_flow_pattern": "flow create 0 ingress pattern eth / ipv4 / udp / pfcp /
> end actions rss types pfcp end key_len 0 queues end / end",
> -    "scapy_str": [
> -
> 'Ether(dst="%s")/IP(src=RandIP(),dst=RandIP())/UDP(sport=RandShort(),dp
> ort=RandShort())/PFCP(Sfield=1, SEID=12)/Raw("X"*480)' % vf0_mac,
> -
> 'Ether(dst="%s")/IP(src=RandIP(),dst=RandIP())/UDP(sport=RandShort(),dp
> ort=RandShort())/PFCP(Sfield=0)/("X"*480)' % vf0_mac,
> -
> 'Ether(dst="%s")/IPv6()/UDP(sport=RandShort(),dport=RandShort())/PFCP(S
> field=1, SEID=12)/("X"*480)' % vf0_mac,
> +tv_iavf_mac_ipv4_pfcp_session_match_dismatch = {
> +    "name": "iavf_mac_ipv4_pfcp_session_match_dismatch",
> +    "rte_flow_pattern": "flow create 0 ingress pattern eth / ipv4 / udp / pfcp
> / end actions rss types pfcp end key_len 0 queues end / end",
> +
> "match_str":['Ether(dst="%s")/IP(src="192.168.0.20",dst="192.168.0.21")/UD
> P(sport=22,dport=8805)/PFCP(Sfield=1, SEID=RandShort())/Raw("x"*480)'%
> +                 vf0_mac],
> +    "dismatch_str": [
> +
> 'Ether(dst="%s")/IP(src="192.168.0.20",dst="192.168.0.21")/UDP(sport=22,d
> port=8805)/PFCP(Sfield=0)/Raw("X"*480)' % vf0_mac,
> +        'Ether(dst="%s")/IPv6()/UDP(sport=22,dport=8805)/PFCP(Sfield=1,
> +SEID=12)/("X"*480)' % vf0_mac,
>      ],
>      "send_count": 100,
>      "check_func": rfc.check_iavf_packets_rss_queue  }
> 
> -tv_iavf_mac_ipv6_pfcp_session = {
> -    "name": "iavf_mac_ipv6_pfcp_session",
> -    "rte_flow_pattern": "flow create 0 ingress pattern eth / ipv6 / udp / pfcp /
> end actions rss types pfcp end key_len 0 queues end / end",
> -    "scapy_str":
> ['Ether(dst="%s")/IPv6()/UDP(sport=RandShort(),dport=RandShort())/PFCP(
> Sfield=1, SEID=12)/("X"*480)' % vf0_mac,
> -
> 'Ether(dst="%s")/IPv6()/UDP(sport=RandShort(),dport=RandShort())/PFCP(S
> field=0)/("X"*480)' % vf0_mac,
> -
> 'Ether(dst="%s")/IP(src=RandIP(),dst=RandIP())/UDP(sport=RandShort(),dp
> ort=RandShort())/PFCP(Sfield=1, SEID=12)/'
> -                  '("X"*480)' % vf0_mac,
> -                  ],
> +tv_iavf_mac_ipv6_pfcp_session_match_dismatch = {
> +    "name": "iavf_mac_ipv6_pfcp_session_match_dismatch",
> +    "rte_flow_pattern": "flow create 0 ingress pattern eth / ipv6 / udp / pfcp
> / end actions rss types pfcp end key_len 0 queues end / end",
> +    "match_str":
> ['Ether(dst="%s")/IPv6()/UDP(sport=22,dport=8805)/PFCP(Sfield=1,
> SEID=RandShort())/Raw("x"*480)' %vf0_mac],
> +    "dismatch_str":
> ['Ether(dst="%s")/IPv6()/UDP(sport=22,dport=8805)/PFCP(Sfield=0)/("X"*48
> 0)' % vf0_mac,
> +
> +'Ether(dst="%s")/IP(src="192.168.0.20",dst="192.168.0.21")/UDP(sport=22
> +,dport=8805)/PFCP(Sfield=1, SEID=12)/("X"*480)' % vf0_mac],
>      "send_count": 100,
>      "check_func": rfc.check_iavf_packets_rss_queue  } @@ -655,9 +654,12
> @@ tvs_iavf_mac_rss_cvlan = [
>      tv_iavf_mac_cvlan_rss,
>  ]
> 
> -tvs_iavf_mac_rss_pfcp = [
> -    tv_iavf_mac_ipv4_pfcp_session,
> -    tv_iavf_mac_ipv6_pfcp_session,
> +tvs_iavf_mac_rss_pfcp_ipv4 = [
> +    tv_iavf_mac_ipv4_pfcp_session_match_dismatch,
> +]
> +
> +tvs_iavf_mac_rss_pfcp_ipv6 = [
> +    tv_iavf_mac_ipv6_pfcp_session_match_dismatch,
>  ]
> 
>  tvs_iavf_gtpu_ipv4 = [
> @@ -956,9 +958,17 @@ class AdvancedIavfRSSTest(TestCase):
>          self.create_testpmd_command(self.vf0_prop)
>          self._rte_flow_validate_pattern(tvs_iavf_mac_rss_cvlan)
> 
> -    def test_iavf_rss_PFCP(self):
> +    def test_iavf_rss_PFCP_ipv4(self):
> +        self.create_testpmd_command(self.vf0_prop)
> +        self.pmd_output.execute_cmd("flow validate 0 ingress pattern eth /
> ipv4 / udp / pfcp / end actions rss types pfcp end key_len 0 queues end "
> +                                    "/ end")
> +        self._rte_flow_validate_pattern(tvs_iavf_mac_rss_pfcp_ipv4)
> +
> +    def test_iavf_rss_PFCP_ipv6(self):
>          self.create_testpmd_command(self.vf0_prop)
> -        self._rte_flow_validate_pattern(tvs_iavf_mac_rss_pfcp)
> +        self.pmd_output.execute_cmd("flow validate 0 ingress pattern eth /
> ipv6 / udp / pfcp / end actions rss types pfcp end key_len 0 queues end "
> +                                    "/ end")
> +        self._rte_flow_validate_pattern(tvs_iavf_mac_rss_pfcp_ipv6)
> 
>      def test_iavf_ipv4_gtpu_updown(self):
>          self.create_testpmd_command(self.vf0_prop)
> --
> 2.17.1