diff mbox series

[V2,4/4] tests/iavf_fdir:add esp flow test case

Message ID 20210914181204.20088-5-zhiminx.huang@intel.com (mailing list archive)
State Changes Requested
Headers show
Series enable esp flow | expand

Checks

Context Check Description
ci/Intel-dts-test fail Testing issues

Commit Message

Zhimin Huang Sept. 14, 2021, 6:12 p.m. UTC
add 21.08 new feature testcase,this feature support esp flow to match outer ip header.
take ip src/dst and spi for inputset,add 4 new cases in iavf_fdir test suite.

Signed-off-by: Zhimin Huang <zhiminx.huang@intel.com>
---
 tests/TestSuite_iavf_fdir.py | 162 +++++++++++++++++++++++++++--------
 1 file changed, 128 insertions(+), 34 deletions(-)

Comments

Lin, Xueqin Sept. 15, 2021, 3:28 a.m. UTC | #1
> -----Original Message-----
> From: Huang, ZhiminX <zhiminx.huang@intel.com>
> Sent: Wednesday, September 15, 2021 2:12 AM
> To: dts@dpdk.org
> Cc: Lin, Xueqin <xueqin.lin@intel.com>; Huang, ZhiminX
> <zhiminx.huang@intel.com>
> Subject: [dts] [PATCH V2 4/4] tests/iavf_fdir:add esp flow test case
> 
> add 21.08 new feature testcase,this feature support esp flow to match outer
> ip header.
> take ip src/dst and spi for inputset,add 4 new cases in iavf_fdir test suite.
> 
> Signed-off-by: Zhimin Huang <zhiminx.huang@intel.com>
Acked-by: Xueqin Lin <xueqin.lin@intel.com>
> ---
>  tests/TestSuite_iavf_fdir.py | 162 +++++++++++++++++++++++++++--------
>  1 file changed, 128 insertions(+), 34 deletions(-)
> 
> diff --git a/tests/TestSuite_iavf_fdir.py b/tests/TestSuite_iavf_fdir.py index
> 74771afe..fc51878a 100644
> --- a/tests/TestSuite_iavf_fdir.py
> +++ b/tests/TestSuite_iavf_fdir.py
> @@ -274,18 +274,22 @@ MAC_IPV6_L2TPv3 = {
> 
>  MAC_IPV4_ESP = {
>      "match": [
> -
> 'Ether(dst="00:11:22:33:44:55")/IP(src="192.168.0.3",proto=50)/ESP(spi=7)/R
> aw("x"*480)',
> -
> 'Ether(dst="00:11:22:33:44:55")/IP(src="192.168.1.3",proto=50)/ESP(spi=7)/R
> aw("x"*480)'],
> +
> + 'Ether(dst="00:11:22:33:44:55")/IP(src="192.168.0.20",dst="192.168.0.2
> + 1",proto=50)/ESP(spi=7)/Raw("x"*480)'],
>      "mismatch": [
> -
> 'Ether(dst="00:11:22:33:44:55")/IP(src="192.168.0.3",proto=50)/ESP(spi=17)/
> Raw("x"*480)']
> +
> 'Ether(dst="00:11:22:33:44:55")/IP(src="192.168.0.22",dst="192.168.0.21",pr
> oto=50)/ESP(spi=7)/Raw("x"*480)',
> +
> 'Ether(dst="00:11:22:33:44:55")/IP(src="192.168.0.20",dst="192.168.0.11",pr
> oto=50)/ESP(spi=7)/Raw("x"*480)',
> +
> 'Ether(dst="00:11:22:33:44:55")/IP(src="192.168.0.20",dst="192.168.0.21",pr
> oto=50)/ESP(spi=17)/Raw("x"*480)'
> +    ]
>  }
> 
>  MAC_IPV6_ESP = {
>      "match": [
> -
> 'Ether(dst="00:11:22:33:44:55")/IPv6(src="1111:2222:3333:4444:5555:6666:7
> 777:8888",nh=50)/ESP(spi=7)/Raw("x"*480)',
> -
> 'Ether(dst="00:11:22:33:44:55")/IPv6(src="1111:2222:3333:4444:5555:6666:7
> 777:9999",nh=50)/ESP(spi=7)/Raw("x"*480)'],
> +
> + 'Ether(dst="00:11:22:33:44:55")/IPv6(src="2001::1",dst="2001::2",nh=50
> + )/ESP(spi=7)/Raw("x"*480)'],
>      "mismatch": [
> -
> 'Ether(dst="00:11:22:33:44:55")/IPv6(src="1111:2222:3333:4444:5555:6666:7
> 777:8888",nh=50)/ESP(spi=17)/Raw("x"*480)']
> +
> 'Ether(dst="00:11:22:33:44:55")/IPv6(src="2001::8",dst="2001::2",nh=50)/ESP
> (spi=7)/Raw("x"*480)',
> +
> 'Ether(dst="00:11:22:33:44:55")/IPv6(src="2001::1",dst="2001::9",nh=50)/ESP
> (spi=7)/Raw("x"*480)',
> +
> 'Ether(dst="00:11:22:33:44:55")/IPv6(src="2001::1",dst="2001::2",nh=50)/ESP
> (spi=17)/Raw("x"*480)'
> +    ]
>  }
> 
>  MAC_IPV4_AH = {
> @@ -306,20 +310,20 @@ MAC_IPV6_AH = {
> 
>  MAC_IPV4_NAT_T_ESP = {
>      "match": [
> -
> 'Ether(dst="00:11:22:33:44:55")/IP(src="192.168.0.20")/UDP(dport=4500)/ES
> P(spi=2)/Raw("x"*480)'],
> +
> + 'Ether(dst="00:11:22:33:44:55")/IP(src="192.168.0.20",dst="192.168.0.2
> + 1")/UDP(dport=4500)/ESP(spi=7)/Raw("x"*480)'],
>      "mismatch": [
> -
> 'Ether(dst="00:11:22:33:44:55")/IP(src="192.168.10.20")/UDP(dport=4500)/E
> SP(spi=2)/Raw("x"*480)',
> -
> 'Ether(dst="00:11:22:33:44:55")/IP(src="192.168.0.20")/UDP(dport=4500)/ES
> P(spi=12)/Raw("x"*480)',
> -
> 'Ether(dst="00:11:22:33:44:55")/IP(dst="192.168.0.20")/UDP(dport=4500)/ES
> P(spi=2)/Raw("x"*480)']
> +
> 'Ether(dst="00:11:22:33:44:55")/IP(src="192.168.0.22",dst="192.168.0.21")/U
> DP(dport=4500)/ESP(spi=7)/Raw("x"*480)',
> +
> 'Ether(dst="00:11:22:33:44:55")/IP(src="192.168.0.20",dst="192.168.0.11")/U
> DP(dport=4500)/ESP(spi=7)/Raw("x"*480)',
> +
> + 'Ether(dst="00:11:22:33:44:55")/IP(src="192.168.0.20",dst="192.168.0.2
> + 1")/UDP(dport=4500)/ESP(spi=17)/Raw("x"*480)']
>  }
> 
>  MAC_IPV6_NAT_T_ESP = {
>      "match": [
> -
> 'Ether(dst="00:11:22:33:44:55")/IPv6(dst="1111:2222:3333:4444:5555:6666:7
> 777:8888")/UDP(dport=4500)/ESP(spi=2)/Raw("x"*480)'],
> +
> + 'Ether(dst="00:11:22:33:44:55")/IPv6(src="2001::1",dst="2001::2")/UDP(
> + dport=4500)/ESP(spi=7)/Raw("x"*480)'],
>      "mismatch": [
> -
> 'Ether(dst="00:11:22:33:44:55")/IPv6(dst="1111:2222:3333:4444:5555:6666:7
> 777:8888")/UDP(dport=4500)/ESP(spi=12)/Raw("x"*480)',
> -
> 'Ether(dst="00:11:22:33:44:55")/IPv6(dst="1111:2222:3333:4444:5555:6666:7
> 777:9999")/UDP(dport=4500)/ESP(spi=2)/Raw("x"*480)',
> -
> 'Ether(dst="00:11:22:33:44:55")/IPv6(src="1111:2222:3333:4444:5555:6666:7
> 777:8888")/UDP(dport=4500)/ESP(spi=2)/Raw("x"*480)']
> +
> 'Ether(dst="00:11:22:33:44:55")/IPv6(src="2001::8",dst="2001::2")/UDP(dpor
> t=4500)/ESP(spi=7)/Raw("x"*480)',
> +
> 'Ether(dst="00:11:22:33:44:55")/IPv6(src="2001::1",dst="2001::9")/UDP(dpor
> t=4500)/ESP(spi=7)/Raw("x"*480)',
> +
> + 'Ether(dst="00:11:22:33:44:55")/IPv6(src="2001::1",dst="2001::2")/UDP(
> + dport=4500)/ESP(spi=17)/Raw("x"*480)']
>  }
> 
>  L2_Ethertype = [
> @@ -2126,44 +2130,86 @@ tv_mac_ipv6_l2tpv3_mark = {
> 
>  tv_mac_ipv4_esp_queue_index = {
>      "name": "test_mac_ipv4_esp_queue_index",
> -    "rule": "flow create 0 ingress pattern eth / ipv4 / esp spi is 7 / end actions
> queue index 13 / mark id 7 / end",
> +    "rule": "flow create 0 ingress pattern eth / ipv4 src is
> + 192.168.0.20 dst is 192.168.0.21 / esp spi is 7 / end actions queue
> + index 13 / mark id 7 / end",
>      "scapy_str": MAC_IPV4_ESP,
>      "check_param": {"port_id": 0, "queue": 13, "mark_id": 7}  }
> 
>  tv_mac_ipv4_esp_queue_group = {
>      "name": "test_mac_ipv4_esp_queue_group",
> -    "rule": "flow create 0 ingress pattern eth / ipv4 / esp spi is 7 / end actions
> rss queues 1 2 3 4 end / mark id 6 / end",
> +    "rule": "flow create 0 ingress pattern eth / ipv4 src is
> + 192.168.0.20 dst is 192.168.0.21 / esp spi is 7 / end actions rss
> + queues 1 2 3 4 end / mark id 6 / end",
>      "scapy_str": MAC_IPV4_ESP,
>      "check_param": {"port_id": 0, "queue": [1, 2, 3, 4], "mark_id": 6}  }
> 
> +tv_mac_ipv4_esp_passthru = {
> +    "name": "test_mac_ipv4_esp_passthru",
> +    "rule": "flow create 0 ingress pattern eth / ipv4 src is 192.168.0.20 dst is
> 192.168.0.21 / esp spi is 7 / end actions passthru / mark id 1 / end",
> +    "scapy_str": MAC_IPV4_ESP,
> +    "check_param": {"port_id": 0, "passthru": 1, "mark_id": 1} }
> +
> +tv_mac_ipv4_esp_drop = {
> +    "name": "test_mac_ipv4_esp_drop",
> +    "rule": "flow create 0 ingress pattern eth / ipv4 src is 192.168.0.20 dst is
> 192.168.0.21 / esp spi is 7 / end actions drop / end",
> +    "scapy_str": MAC_IPV4_ESP,
> +    "check_param": {"port_id": 0, "drop": 1} }
> +
> +tv_mac_ipv4_esp_mark_rss = {
> +    "name": "test_mac_ipv4_esp_mark_rss",
> +    "rule": "flow create 0 ingress pattern eth / ipv4 src is 192.168.0.20 dst is
> 192.168.0.21 / esp spi is 7 / end actions mark id 2 / rss / end",
> +    "scapy_str": MAC_IPV4_ESP,
> +    "check_param": {"port_id": 0, "passthru": 1, "mark_id": 2} }
> +
>  tv_mac_ipv4_esp_mark = {
>      "name": "test_mac_ipv4_esp_mark",
> -    "rule": "flow create 0 ingress pattern eth / ipv4 / esp spi is 7 / end actions
> mark id 15 / end",
> +    "rule": "flow create 0 ingress pattern eth / ipv4 src is
> + 192.168.0.20 dst is 192.168.0.21 / esp spi is 7 / end actions mark id
> + 15 / end",
>      "scapy_str": MAC_IPV4_ESP,
> -    "check_param": {"port_id": 0, "passthru": 1, "mark_id": 15}
> +    "check_param": {"port_id": 0, "mark_id": 15}
>  }
> 
>  tv_mac_ipv6_esp_queue_index = {
>      "name": "test_mac_ipv6_esp_queue_index",
> -    "rule": "flow create 0 ingress pattern eth / ipv6 / esp spi is 7 / end actions
> queue index 13 / mark id 7 / end",
> +    "rule": "flow create 0 ingress pattern eth / ipv6 src is 2001::1
> + dst is 2001::2 / esp spi is 7 / end actions queue index 13 / mark id 7
> + / end",
>      "scapy_str": MAC_IPV6_ESP,
>      "check_param": {"port_id": 0, "queue": 13, "mark_id": 7}  }
> 
>  tv_mac_ipv6_esp_queue_group = {
>      "name": "test_mac_ipv6_esp_queue_group",
> -    "rule": "flow create 0 ingress pattern eth / ipv6 / esp spi is 7 / end actions
> rss queues 1 2 3 4 end / mark id 6 / end",
> +    "rule": "flow create 0 ingress pattern eth / ipv6 src is 2001::1
> + dst is 2001::2 / esp spi is 7 / end actions rss queues 1 2 3 4 end /
> + mark id 6 / end",
>      "scapy_str": MAC_IPV6_ESP,
>      "check_param": {"port_id": 0, "queue": [1, 2, 3, 4], "mark_id": 6}  }
> 
> +tv_mac_ipv6_esp_passthru = {
> +    "name": "test_mac_ipv6_esp_passthru",
> +    "rule": "flow create 0 ingress pattern eth / ipv6 src is 2001::1 dst is 2001::2
> / esp spi is 7 / end actions passthru / mark id 1 / end",
> +    "scapy_str": MAC_IPV6_ESP,
> +    "check_param": {"port_id": 0, "passthru": 1, "mark_id": 1} }
> +
> +tv_mac_ipv6_esp_drop = {
> +    "name": "test_mac_ipv6_esp_drop",
> +    "rule": "flow create 0 ingress pattern eth / ipv6 src is 2001::1 dst is 2001::2
> / esp spi is 7 / end actions drop / end",
> +    "scapy_str": MAC_IPV6_ESP,
> +    "check_param": {"port_id": 0, "drop": 1} }
> +
> +tv_mac_ipv6_esp_mark_rss = {
> +    "name": "test_mac_ipv6_esp_mark_rss",
> +    "rule": "flow create 0 ingress pattern eth / ipv6 src is 2001::1 dst is 2001::2
> / esp spi is 7 / end actions mark id 2 / rss / end",
> +    "scapy_str": MAC_IPV6_ESP,
> +    "check_param": {"port_id": 0, "passthru": 1, "mark_id": 2} }
> +
>  tv_mac_ipv6_esp_mark = {
>      "name": "test_mac_ipv6_esp_mark",
> -    "rule": "flow create 0 ingress pattern eth / ipv6 / esp spi is 7 / end actions
> mark id 15 / end",
> +    "rule": "flow create 0 ingress pattern eth / ipv6 src is 2001::1
> + dst is 2001::2 / esp spi is 7 / end actions mark id 15 / end",
>      "scapy_str": MAC_IPV6_ESP,
> -    "check_param": {"port_id": 0, "passthru": 1, "mark_id": 15}
> +    "check_param": {"port_id": 0, "mark_id": 15}
>  }
> 
>  tv_mac_ipv4_ah_queue_index = {
> @@ -2210,44 +2256,86 @@ tv_mac_ipv6_ah_mark = {
> 
>  tv_mac_ipv4_nat_t_esp_queue_index = {
>      "name": "test_mac_ipv4_nat_t_esp_queue_index",
> -    "rule": "flow create 0 ingress pattern eth / ipv4 src is 192.168.0.20 / udp /
> esp spi is 2 / end actions queue index 13 / mark id 7 / end",
> +    "rule": "flow create 0 ingress pattern eth / ipv4 src is
> + 192.168.0.20 dst is 192.168.0.21 / udp / esp spi is 7 / end actions
> + queue index 13 / mark id 7 / end",
>      "scapy_str": MAC_IPV4_NAT_T_ESP,
>      "check_param": {"port_id": 0, "queue": 13, "mark_id": 7}  }
> 
>  tv_mac_ipv4_nat_t_esp_queue_group = {
>      "name": "test_mac_ipv4_nat_t_esp_queue_group",
> -    "rule": "flow create 0 ingress pattern eth / ipv4 src is 192.168.0.20 / udp /
> esp spi is 2 / end actions rss queues 1 2 3 4 end / mark id 6 / end",
> +    "rule": "flow create 0 ingress pattern eth / ipv4 src is
> + 192.168.0.20 dst is 192.168.0.21 / udp / esp spi is 7 / end actions
> + rss queues 1 2 3 4 end / mark id 6 / end",
>      "scapy_str": MAC_IPV4_NAT_T_ESP,
>      "check_param": {"port_id": 0, "queue": [1, 2, 3, 4], "mark_id": 6}  }
> 
> +tv_mac_ipv4_nat_t_esp_passthru = {
> +    "name": "test_mac_ipv4_nat_t_esp_passthru",
> +    "rule": "flow create 0 ingress pattern eth / ipv4 src is 192.168.0.20 dst is
> 192.168.0.21 / udp / esp spi is 7 / end actions passthru / mark id 1 / end",
> +    "scapy_str": MAC_IPV4_NAT_T_ESP,
> +    "check_param": {"port_id": 0, "passthru": 1, "mark_id": 1} }
> +
> +tv_mac_ipv4_nat_t_esp_drop = {
> +    "name": "test_mac_ipv4_nat_t_esp_drop",
> +    "rule": "flow create 0 ingress pattern eth / ipv4 src is 192.168.0.20 dst is
> 192.168.0.21 / udp / esp spi is 7 / end actions drop / end",
> +    "scapy_str": MAC_IPV4_NAT_T_ESP,
> +    "check_param": {"port_id": 0, "drop": 1} }
> +
> +tv_mac_ipv4_nat_t_esp_mark_rss = {
> +    "name": "test_mac_ipv4_nat_t_esp_mark_rss",
> +    "rule": "flow create 0 ingress pattern eth / ipv4 src is 192.168.0.20 dst is
> 192.168.0.21 / udp / esp spi is 7 / end actions mark id 2 / rss / end",
> +    "scapy_str": MAC_IPV4_NAT_T_ESP,
> +    "check_param": {"port_id": 0, "passthru": 1, "mark_id": 2} }
> +
>  tv_mac_ipv4_nat_t_esp_mark = {
>      "name": "test_mac_ipv4_nat_t_esp_mark",
> -    "rule": "flow create 0 ingress pattern eth / ipv4 src is 192.168.0.20 / udp /
> esp spi is 2 / end actions mark id 15 / end",
> +    "rule": "flow create 0 ingress pattern eth / ipv4 src is
> + 192.168.0.20 dst is 192.168.0.21 / udp / esp spi is 7 / end actions
> + mark id 15 / end",
>      "scapy_str": MAC_IPV4_NAT_T_ESP,
> -    "check_param": {"port_id": 0, "passthru": 1, "mark_id": 15}
> +    "check_param": {"port_id": 0, "mark_id": 15}
>  }
> 
>  tv_mac_ipv6_nat_t_esp_queue_index = {
>      "name": "test_mac_ipv6_nat_t_esp_queue_index",
> -    "rule": "flow create 0 ingress pattern eth / ipv6 dst is
> 1111:2222:3333:4444:5555:6666:7777:8888 / udp / esp spi is 2 / end actions
> queue index 13 / mark id 7 / end",
> +    "rule": "flow create 0 ingress pattern eth / ipv6 src is 2001::1
> + dst is 2001::2 / udp / esp spi is 7 / end actions queue index 13 /
> + mark id 7 / end",
>      "scapy_str": MAC_IPV6_NAT_T_ESP,
>      "check_param": {"port_id": 0, "queue": 13, "mark_id": 7}  }
> 
>  tv_mac_ipv6_nat_t_esp_queue_group = {
>      "name": "test_mac_ipv6_nat_t_esp_queue_group",
> -    "rule": "flow create 0 ingress pattern eth / ipv6 dst is
> 1111:2222:3333:4444:5555:6666:7777:8888 / udp / esp spi is 2 / end actions
> rss queues 1 2 3 4 end / mark id 6 / end",
> +    "rule": "flow create 0 ingress pattern eth / ipv6 src is 2001::1
> + dst is 2001::2 / udp / esp spi is 7 / end actions rss queues 1 2 3 4
> + end / mark id 6 / end",
>      "scapy_str": MAC_IPV6_NAT_T_ESP,
>      "check_param": {"port_id": 0, "queue": [1, 2, 3, 4], "mark_id": 6}  }
> 
> +tv_mac_ipv6_nat_t_esp_passthru = {
> +    "name": "test_mac_ipv6_nat_t_esp_passthru",
> +    "rule": "flow create 0 ingress pattern eth / ipv6 src is 2001::1 dst is 2001::2
> / udp / esp spi is 7 / end actions passthru / mark id 1 / end",
> +    "scapy_str": MAC_IPV6_NAT_T_ESP,
> +    "check_param": {"port_id": 0, "passthru": 1, "mark_id": 1} }
> +
> +tv_mac_ipv6_nat_t_esp_drop = {
> +    "name": "test_mac_ipv6_nat_t_esp_drop",
> +    "rule": "flow create 0 ingress pattern eth / ipv6 src is 2001::1 dst is 2001::2
> / udp / esp spi is 7 / end actions drop / end",
> +    "scapy_str": MAC_IPV6_NAT_T_ESP,
> +    "check_param": {"port_id": 0, "drop": 1} }
> +
> +tv_mac_ipv6_nat_t_esp_mark_rss = {
> +    "name": "test_mac_ipv6_nat_t_esp_mark_rss",
> +    "rule": "flow create 0 ingress pattern eth / ipv6 src is 2001::1 dst is 2001::2
> / udp / esp spi is 7 / end actions mark id 2 / rss / end",
> +    "scapy_str": MAC_IPV6_NAT_T_ESP,
> +    "check_param": {"port_id": 0, "passthru": 1, "mark_id": 2} }
> +
>  tv_mac_ipv6_nat_t_esp_mark = {
>      "name": "test_mac_ipv6_nat_t_esp_mark",
> -    "rule": "flow create 0 ingress pattern eth / ipv6 dst is
> 1111:2222:3333:4444:5555:6666:7777:8888 / udp / esp spi is 2 / end actions
> mark id 15 / end",
> +    "rule": "flow create 0 ingress pattern eth / ipv6 src is 2001::1
> + dst is 2001::2 / udp / esp spi is 7 / end actions mark id 15 / end",
>      "scapy_str": MAC_IPV6_NAT_T_ESP,
> -    "check_param": {"port_id": 0, "passthru": 1, "mark_id": 15}
> +    "check_param": {"port_id": 0, "mark_id": 15}
>  }
> 
>  # mac_ipv4_tcp_without_input_set
> @@ -6902,17 +6990,23 @@ vectors_ipv4_l2tpv3 =
> [tv_mac_ipv4_l2tpv3_queue_index, tv_mac_ipv4_l2tpv3_queue_
> 
>  vectors_ipv6_l2tpv3 = [tv_mac_ipv6_l2tpv3_queue_index,
> tv_mac_ipv6_l2tpv3_queue_group, tv_mac_ipv6_l2tpv3_mark]
> 
> -vectors_ipv4_esp = [tv_mac_ipv4_esp_queue_index,
> tv_mac_ipv4_esp_queue_group, tv_mac_ipv4_esp_mark]
> +vectors_ipv4_esp = [tv_mac_ipv4_esp_queue_index,
> tv_mac_ipv4_esp_queue_group, tv_mac_ipv4_esp_mark,
> +                    tv_mac_ipv4_esp_drop, tv_mac_ipv4_esp_mark_rss,
> +tv_mac_ipv4_esp_passthru]
> 
> -vectors_ipv6_esp = [tv_mac_ipv6_esp_queue_index,
> tv_mac_ipv6_esp_queue_group, tv_mac_ipv6_esp_mark]
> +vectors_ipv6_esp = [tv_mac_ipv6_esp_queue_index,
> tv_mac_ipv6_esp_queue_group, tv_mac_ipv6_esp_mark,
> +                    tv_mac_ipv6_esp_drop, tv_mac_ipv6_esp_mark_rss,
> +tv_mac_ipv6_esp_passthru]
> 
>  vectors_ipv4_ah = [tv_mac_ipv4_ah_queue_index,
> tv_mac_ipv4_ah_queue_group, tv_mac_ipv4_ah_mark]
> 
>  vectors_ipv6_ah = [tv_mac_ipv6_ah_queue_index,
> tv_mac_ipv6_ah_queue_group, tv_mac_ipv6_ah_mark]
> 
> -vectors_ipv4_nat_t_esp = [tv_mac_ipv4_nat_t_esp_queue_index,
> tv_mac_ipv4_nat_t_esp_queue_group, tv_mac_ipv4_nat_t_esp_mark]
> +vectors_ipv4_nat_t_esp = [tv_mac_ipv4_nat_t_esp_queue_index,
> tv_mac_ipv4_nat_t_esp_queue_group,
> +                          tv_mac_ipv4_nat_t_esp_mark, tv_mac_ipv4_nat_t_esp_drop,
> tv_mac_ipv4_nat_t_esp_mark_rss,
> +                          tv_mac_ipv4_nat_t_esp_passthru]
> 
> -vectors_ipv6_nat_t_esp = [tv_mac_ipv6_nat_t_esp_queue_index,
> tv_mac_ipv6_nat_t_esp_queue_group, tv_mac_ipv6_nat_t_esp_mark]
> +vectors_ipv6_nat_t_esp = [tv_mac_ipv6_nat_t_esp_queue_index,
> tv_mac_ipv6_nat_t_esp_queue_group,
> +                          tv_mac_ipv6_nat_t_esp_mark, tv_mac_ipv6_nat_t_esp_drop,
> tv_mac_ipv6_nat_t_esp_mark_rss,
> +                          tv_mac_ipv6_nat_t_esp_passthru]
> 
>  vectors_ipv4_tcp_without_input_set =
> [tv_mac_ipv4_tcp_without_input_set_queue_index,
> tv_mac_ipv4_tcp_without_input_set_queue_group,
>                                        tv_mac_ipv4_tcp_without_input_set_mark_rss,
> tv_mac_ipv4_tcp_without_input_set_passthru,
> --
> 2.17.1
Tu, Lijuan Sept. 27, 2021, 5:20 a.m. UTC | #2
> -----Original Message-----
> From: dts <dts-bounces@dpdk.org> On Behalf Of Zhimin Huang
> Sent: 2021年9月15日 2:12
> To: dts@dpdk.org
> Cc: Lin, Xueqin <xueqin.lin@intel.com>; Huang, ZhiminX
> <zhiminx.huang@intel.com>
> Subject: [dts] [PATCH V2 4/4] tests/iavf_fdir:add esp flow test case
> 
> add 21.08 new feature testcase,this feature support esp flow to match outer ip
> header.
> take ip src/dst and spi for inputset,add 4 new cases in iavf_fdir test suite.
> 
> Signed-off-by: Zhimin Huang <zhiminx.huang@intel.com>

It didn't pass CI testing, please fix them and re-submit.

DOC test failed information:
reading sources... [ 99%] vxlan_gpe_support_in_i40e_test_plan
reading sources... [100%] vxlan_test_plan

iavf_fdir_test_plan.rst:49: WARNING: Malformed table.

+------------------------------+------------------------------+-------------------------------------------------------------------+
|    Packet Type               |        Pattern               |            Input Set                                              |
--
+------------------------------+------------------------------+-------------------------------------------------------------------+
|                              |MAC_IPV4_GTPU_EH_UL_IPV6_TCP  | inner:[Source IPv6], [Dest IPv6], [Source Port], [Dest Port]      |
+------------------------------+------------------------------+-------------------------------------------------------------------+
iavf_fdir_test_plan.rst:3686: WARNING: Literal block expected; none found.
iavf_fdir_test_plan.rst:3899: WARNING: Literal block expected; none found.
rxtx_offload_test_plan.rst:741: WARNING: Unexpected indentation.
looking for now-outdated files... none found
pickling environment... done
checking consistency... done
DPDK STV team
diff mbox series

Patch

diff --git a/tests/TestSuite_iavf_fdir.py b/tests/TestSuite_iavf_fdir.py
index 74771afe..fc51878a 100644
--- a/tests/TestSuite_iavf_fdir.py
+++ b/tests/TestSuite_iavf_fdir.py
@@ -274,18 +274,22 @@  MAC_IPV6_L2TPv3 = {
 
 MAC_IPV4_ESP = {
     "match": [
-        'Ether(dst="00:11:22:33:44:55")/IP(src="192.168.0.3",proto=50)/ESP(spi=7)/Raw("x"*480)',
-        'Ether(dst="00:11:22:33:44:55")/IP(src="192.168.1.3",proto=50)/ESP(spi=7)/Raw("x"*480)'],
+        'Ether(dst="00:11:22:33:44:55")/IP(src="192.168.0.20",dst="192.168.0.21",proto=50)/ESP(spi=7)/Raw("x"*480)'],
     "mismatch": [
-        'Ether(dst="00:11:22:33:44:55")/IP(src="192.168.0.3",proto=50)/ESP(spi=17)/Raw("x"*480)']
+        'Ether(dst="00:11:22:33:44:55")/IP(src="192.168.0.22",dst="192.168.0.21",proto=50)/ESP(spi=7)/Raw("x"*480)',
+        'Ether(dst="00:11:22:33:44:55")/IP(src="192.168.0.20",dst="192.168.0.11",proto=50)/ESP(spi=7)/Raw("x"*480)',
+        'Ether(dst="00:11:22:33:44:55")/IP(src="192.168.0.20",dst="192.168.0.21",proto=50)/ESP(spi=17)/Raw("x"*480)'
+    ]
 }
 
 MAC_IPV6_ESP = {
     "match": [
-        'Ether(dst="00:11:22:33:44:55")/IPv6(src="1111:2222:3333:4444:5555:6666:7777:8888",nh=50)/ESP(spi=7)/Raw("x"*480)',
-        'Ether(dst="00:11:22:33:44:55")/IPv6(src="1111:2222:3333:4444:5555:6666:7777:9999",nh=50)/ESP(spi=7)/Raw("x"*480)'],
+        'Ether(dst="00:11:22:33:44:55")/IPv6(src="2001::1",dst="2001::2",nh=50)/ESP(spi=7)/Raw("x"*480)'],
     "mismatch": [
-        'Ether(dst="00:11:22:33:44:55")/IPv6(src="1111:2222:3333:4444:5555:6666:7777:8888",nh=50)/ESP(spi=17)/Raw("x"*480)']
+        'Ether(dst="00:11:22:33:44:55")/IPv6(src="2001::8",dst="2001::2",nh=50)/ESP(spi=7)/Raw("x"*480)',
+        'Ether(dst="00:11:22:33:44:55")/IPv6(src="2001::1",dst="2001::9",nh=50)/ESP(spi=7)/Raw("x"*480)',
+        'Ether(dst="00:11:22:33:44:55")/IPv6(src="2001::1",dst="2001::2",nh=50)/ESP(spi=17)/Raw("x"*480)'
+    ]
 }
 
 MAC_IPV4_AH = {
@@ -306,20 +310,20 @@  MAC_IPV6_AH = {
 
 MAC_IPV4_NAT_T_ESP = {
     "match": [
-        'Ether(dst="00:11:22:33:44:55")/IP(src="192.168.0.20")/UDP(dport=4500)/ESP(spi=2)/Raw("x"*480)'],
+        'Ether(dst="00:11:22:33:44:55")/IP(src="192.168.0.20",dst="192.168.0.21")/UDP(dport=4500)/ESP(spi=7)/Raw("x"*480)'],
     "mismatch": [
-        'Ether(dst="00:11:22:33:44:55")/IP(src="192.168.10.20")/UDP(dport=4500)/ESP(spi=2)/Raw("x"*480)',
-        'Ether(dst="00:11:22:33:44:55")/IP(src="192.168.0.20")/UDP(dport=4500)/ESP(spi=12)/Raw("x"*480)',
-        'Ether(dst="00:11:22:33:44:55")/IP(dst="192.168.0.20")/UDP(dport=4500)/ESP(spi=2)/Raw("x"*480)']
+        'Ether(dst="00:11:22:33:44:55")/IP(src="192.168.0.22",dst="192.168.0.21")/UDP(dport=4500)/ESP(spi=7)/Raw("x"*480)',
+        'Ether(dst="00:11:22:33:44:55")/IP(src="192.168.0.20",dst="192.168.0.11")/UDP(dport=4500)/ESP(spi=7)/Raw("x"*480)',
+        'Ether(dst="00:11:22:33:44:55")/IP(src="192.168.0.20",dst="192.168.0.21")/UDP(dport=4500)/ESP(spi=17)/Raw("x"*480)']
 }
 
 MAC_IPV6_NAT_T_ESP = {
     "match": [
-        'Ether(dst="00:11:22:33:44:55")/IPv6(dst="1111:2222:3333:4444:5555:6666:7777:8888")/UDP(dport=4500)/ESP(spi=2)/Raw("x"*480)'],
+        'Ether(dst="00:11:22:33:44:55")/IPv6(src="2001::1",dst="2001::2")/UDP(dport=4500)/ESP(spi=7)/Raw("x"*480)'],
     "mismatch": [
-        'Ether(dst="00:11:22:33:44:55")/IPv6(dst="1111:2222:3333:4444:5555:6666:7777:8888")/UDP(dport=4500)/ESP(spi=12)/Raw("x"*480)',
-        'Ether(dst="00:11:22:33:44:55")/IPv6(dst="1111:2222:3333:4444:5555:6666:7777:9999")/UDP(dport=4500)/ESP(spi=2)/Raw("x"*480)',
-        'Ether(dst="00:11:22:33:44:55")/IPv6(src="1111:2222:3333:4444:5555:6666:7777:8888")/UDP(dport=4500)/ESP(spi=2)/Raw("x"*480)']
+        'Ether(dst="00:11:22:33:44:55")/IPv6(src="2001::8",dst="2001::2")/UDP(dport=4500)/ESP(spi=7)/Raw("x"*480)',
+        'Ether(dst="00:11:22:33:44:55")/IPv6(src="2001::1",dst="2001::9")/UDP(dport=4500)/ESP(spi=7)/Raw("x"*480)',
+        'Ether(dst="00:11:22:33:44:55")/IPv6(src="2001::1",dst="2001::2")/UDP(dport=4500)/ESP(spi=17)/Raw("x"*480)']
 }
 
 L2_Ethertype = [
@@ -2126,44 +2130,86 @@  tv_mac_ipv6_l2tpv3_mark = {
 
 tv_mac_ipv4_esp_queue_index = {
     "name": "test_mac_ipv4_esp_queue_index",
-    "rule": "flow create 0 ingress pattern eth / ipv4 / esp spi is 7 / end actions queue index 13 / mark id 7 / end",
+    "rule": "flow create 0 ingress pattern eth / ipv4 src is 192.168.0.20 dst is 192.168.0.21 / esp spi is 7 / end actions queue index 13 / mark id 7 / end",
     "scapy_str": MAC_IPV4_ESP,
     "check_param": {"port_id": 0, "queue": 13, "mark_id": 7}
 }
 
 tv_mac_ipv4_esp_queue_group = {
     "name": "test_mac_ipv4_esp_queue_group",
-    "rule": "flow create 0 ingress pattern eth / ipv4 / esp spi is 7 / end actions rss queues 1 2 3 4 end / mark id 6 / end",
+    "rule": "flow create 0 ingress pattern eth / ipv4 src is 192.168.0.20 dst is 192.168.0.21 / esp spi is 7 / end actions rss queues 1 2 3 4 end / mark id 6 / end",
     "scapy_str": MAC_IPV4_ESP,
     "check_param": {"port_id": 0, "queue": [1, 2, 3, 4], "mark_id": 6}
 }
 
+tv_mac_ipv4_esp_passthru = {
+    "name": "test_mac_ipv4_esp_passthru",
+    "rule": "flow create 0 ingress pattern eth / ipv4 src is 192.168.0.20 dst is 192.168.0.21 / esp spi is 7 / end actions passthru / mark id 1 / end",
+    "scapy_str": MAC_IPV4_ESP,
+    "check_param": {"port_id": 0, "passthru": 1, "mark_id": 1}
+}
+
+tv_mac_ipv4_esp_drop = {
+    "name": "test_mac_ipv4_esp_drop",
+    "rule": "flow create 0 ingress pattern eth / ipv4 src is 192.168.0.20 dst is 192.168.0.21 / esp spi is 7 / end actions drop / end",
+    "scapy_str": MAC_IPV4_ESP,
+    "check_param": {"port_id": 0, "drop": 1}
+}
+
+tv_mac_ipv4_esp_mark_rss = {
+    "name": "test_mac_ipv4_esp_mark_rss",
+    "rule": "flow create 0 ingress pattern eth / ipv4 src is 192.168.0.20 dst is 192.168.0.21 / esp spi is 7 / end actions mark id 2 / rss / end",
+    "scapy_str": MAC_IPV4_ESP,
+    "check_param": {"port_id": 0, "passthru": 1, "mark_id": 2}
+}
+
 tv_mac_ipv4_esp_mark = {
     "name": "test_mac_ipv4_esp_mark",
-    "rule": "flow create 0 ingress pattern eth / ipv4 / esp spi is 7 / end actions mark id 15 / end",
+    "rule": "flow create 0 ingress pattern eth / ipv4 src is 192.168.0.20 dst is 192.168.0.21 / esp spi is 7 / end actions mark id 15 / end",
     "scapy_str": MAC_IPV4_ESP,
-    "check_param": {"port_id": 0, "passthru": 1, "mark_id": 15}
+    "check_param": {"port_id": 0, "mark_id": 15}
 }
 
 tv_mac_ipv6_esp_queue_index = {
     "name": "test_mac_ipv6_esp_queue_index",
-    "rule": "flow create 0 ingress pattern eth / ipv6 / esp spi is 7 / end actions queue index 13 / mark id 7 / end",
+    "rule": "flow create 0 ingress pattern eth / ipv6 src is 2001::1 dst is 2001::2 / esp spi is 7 / end actions queue index 13 / mark id 7 / end",
     "scapy_str": MAC_IPV6_ESP,
     "check_param": {"port_id": 0, "queue": 13, "mark_id": 7}
 }
 
 tv_mac_ipv6_esp_queue_group = {
     "name": "test_mac_ipv6_esp_queue_group",
-    "rule": "flow create 0 ingress pattern eth / ipv6 / esp spi is 7 / end actions rss queues 1 2 3 4 end / mark id 6 / end",
+    "rule": "flow create 0 ingress pattern eth / ipv6 src is 2001::1 dst is 2001::2 / esp spi is 7 / end actions rss queues 1 2 3 4 end / mark id 6 / end",
     "scapy_str": MAC_IPV6_ESP,
     "check_param": {"port_id": 0, "queue": [1, 2, 3, 4], "mark_id": 6}
 }
 
+tv_mac_ipv6_esp_passthru = {
+    "name": "test_mac_ipv6_esp_passthru",
+    "rule": "flow create 0 ingress pattern eth / ipv6 src is 2001::1 dst is 2001::2 / esp spi is 7 / end actions passthru / mark id 1 / end",
+    "scapy_str": MAC_IPV6_ESP,
+    "check_param": {"port_id": 0, "passthru": 1, "mark_id": 1}
+}
+
+tv_mac_ipv6_esp_drop = {
+    "name": "test_mac_ipv6_esp_drop",
+    "rule": "flow create 0 ingress pattern eth / ipv6 src is 2001::1 dst is 2001::2 / esp spi is 7 / end actions drop / end",
+    "scapy_str": MAC_IPV6_ESP,
+    "check_param": {"port_id": 0, "drop": 1}
+}
+
+tv_mac_ipv6_esp_mark_rss = {
+    "name": "test_mac_ipv6_esp_mark_rss",
+    "rule": "flow create 0 ingress pattern eth / ipv6 src is 2001::1 dst is 2001::2 / esp spi is 7 / end actions mark id 2 / rss / end",
+    "scapy_str": MAC_IPV6_ESP,
+    "check_param": {"port_id": 0, "passthru": 1, "mark_id": 2}
+}
+
 tv_mac_ipv6_esp_mark = {
     "name": "test_mac_ipv6_esp_mark",
-    "rule": "flow create 0 ingress pattern eth / ipv6 / esp spi is 7 / end actions mark id 15 / end",
+    "rule": "flow create 0 ingress pattern eth / ipv6 src is 2001::1 dst is 2001::2 / esp spi is 7 / end actions mark id 15 / end",
     "scapy_str": MAC_IPV6_ESP,
-    "check_param": {"port_id": 0, "passthru": 1, "mark_id": 15}
+    "check_param": {"port_id": 0, "mark_id": 15}
 }
 
 tv_mac_ipv4_ah_queue_index = {
@@ -2210,44 +2256,86 @@  tv_mac_ipv6_ah_mark = {
 
 tv_mac_ipv4_nat_t_esp_queue_index = {
     "name": "test_mac_ipv4_nat_t_esp_queue_index",
-    "rule": "flow create 0 ingress pattern eth / ipv4 src is 192.168.0.20 / udp / esp spi is 2 / end actions queue index 13 / mark id 7 / end",
+    "rule": "flow create 0 ingress pattern eth / ipv4 src is 192.168.0.20 dst is 192.168.0.21 / udp / esp spi is 7 / end actions queue index 13 / mark id 7 / end",
     "scapy_str": MAC_IPV4_NAT_T_ESP,
     "check_param": {"port_id": 0, "queue": 13, "mark_id": 7}
 }
 
 tv_mac_ipv4_nat_t_esp_queue_group = {
     "name": "test_mac_ipv4_nat_t_esp_queue_group",
-    "rule": "flow create 0 ingress pattern eth / ipv4 src is 192.168.0.20 / udp / esp spi is 2 / end actions rss queues 1 2 3 4 end / mark id 6 / end",
+    "rule": "flow create 0 ingress pattern eth / ipv4 src is 192.168.0.20 dst is 192.168.0.21 / udp / esp spi is 7 / end actions rss queues 1 2 3 4 end / mark id 6 / end",
     "scapy_str": MAC_IPV4_NAT_T_ESP,
     "check_param": {"port_id": 0, "queue": [1, 2, 3, 4], "mark_id": 6}
 }
 
+tv_mac_ipv4_nat_t_esp_passthru = {
+    "name": "test_mac_ipv4_nat_t_esp_passthru",
+    "rule": "flow create 0 ingress pattern eth / ipv4 src is 192.168.0.20 dst is 192.168.0.21 / udp / esp spi is 7 / end actions passthru / mark id 1 / end",
+    "scapy_str": MAC_IPV4_NAT_T_ESP,
+    "check_param": {"port_id": 0, "passthru": 1, "mark_id": 1}
+}
+
+tv_mac_ipv4_nat_t_esp_drop = {
+    "name": "test_mac_ipv4_nat_t_esp_drop",
+    "rule": "flow create 0 ingress pattern eth / ipv4 src is 192.168.0.20 dst is 192.168.0.21 / udp / esp spi is 7 / end actions drop / end",
+    "scapy_str": MAC_IPV4_NAT_T_ESP,
+    "check_param": {"port_id": 0, "drop": 1}
+}
+
+tv_mac_ipv4_nat_t_esp_mark_rss = {
+    "name": "test_mac_ipv4_nat_t_esp_mark_rss",
+    "rule": "flow create 0 ingress pattern eth / ipv4 src is 192.168.0.20 dst is 192.168.0.21 / udp / esp spi is 7 / end actions mark id 2 / rss / end",
+    "scapy_str": MAC_IPV4_NAT_T_ESP,
+    "check_param": {"port_id": 0, "passthru": 1, "mark_id": 2}
+}
+
 tv_mac_ipv4_nat_t_esp_mark = {
     "name": "test_mac_ipv4_nat_t_esp_mark",
-    "rule": "flow create 0 ingress pattern eth / ipv4 src is 192.168.0.20 / udp / esp spi is 2 / end actions mark id 15 / end",
+    "rule": "flow create 0 ingress pattern eth / ipv4 src is 192.168.0.20 dst is 192.168.0.21 / udp / esp spi is 7 / end actions mark id 15 / end",
     "scapy_str": MAC_IPV4_NAT_T_ESP,
-    "check_param": {"port_id": 0, "passthru": 1, "mark_id": 15}
+    "check_param": {"port_id": 0, "mark_id": 15}
 }
 
 tv_mac_ipv6_nat_t_esp_queue_index = {
     "name": "test_mac_ipv6_nat_t_esp_queue_index",
-    "rule": "flow create 0 ingress pattern eth / ipv6 dst is 1111:2222:3333:4444:5555:6666:7777:8888 / udp / esp spi is 2 / end actions queue index 13 / mark id 7 / end",
+    "rule": "flow create 0 ingress pattern eth / ipv6 src is 2001::1 dst is 2001::2 / udp / esp spi is 7 / end actions queue index 13 / mark id 7 / end",
     "scapy_str": MAC_IPV6_NAT_T_ESP,
     "check_param": {"port_id": 0, "queue": 13, "mark_id": 7}
 }
 
 tv_mac_ipv6_nat_t_esp_queue_group = {
     "name": "test_mac_ipv6_nat_t_esp_queue_group",
-    "rule": "flow create 0 ingress pattern eth / ipv6 dst is 1111:2222:3333:4444:5555:6666:7777:8888 / udp / esp spi is 2 / end actions rss queues 1 2 3 4 end / mark id 6 / end",
+    "rule": "flow create 0 ingress pattern eth / ipv6 src is 2001::1 dst is 2001::2 / udp / esp spi is 7 / end actions rss queues 1 2 3 4 end / mark id 6 / end",
     "scapy_str": MAC_IPV6_NAT_T_ESP,
     "check_param": {"port_id": 0, "queue": [1, 2, 3, 4], "mark_id": 6}
 }
 
+tv_mac_ipv6_nat_t_esp_passthru = {
+    "name": "test_mac_ipv6_nat_t_esp_passthru",
+    "rule": "flow create 0 ingress pattern eth / ipv6 src is 2001::1 dst is 2001::2 / udp / esp spi is 7 / end actions passthru / mark id 1 / end",
+    "scapy_str": MAC_IPV6_NAT_T_ESP,
+    "check_param": {"port_id": 0, "passthru": 1, "mark_id": 1}
+}
+
+tv_mac_ipv6_nat_t_esp_drop = {
+    "name": "test_mac_ipv6_nat_t_esp_drop",
+    "rule": "flow create 0 ingress pattern eth / ipv6 src is 2001::1 dst is 2001::2 / udp / esp spi is 7 / end actions drop / end",
+    "scapy_str": MAC_IPV6_NAT_T_ESP,
+    "check_param": {"port_id": 0, "drop": 1}
+}
+
+tv_mac_ipv6_nat_t_esp_mark_rss = {
+    "name": "test_mac_ipv6_nat_t_esp_mark_rss",
+    "rule": "flow create 0 ingress pattern eth / ipv6 src is 2001::1 dst is 2001::2 / udp / esp spi is 7 / end actions mark id 2 / rss / end",
+    "scapy_str": MAC_IPV6_NAT_T_ESP,
+    "check_param": {"port_id": 0, "passthru": 1, "mark_id": 2}
+}
+
 tv_mac_ipv6_nat_t_esp_mark = {
     "name": "test_mac_ipv6_nat_t_esp_mark",
-    "rule": "flow create 0 ingress pattern eth / ipv6 dst is 1111:2222:3333:4444:5555:6666:7777:8888 / udp / esp spi is 2 / end actions mark id 15 / end",
+    "rule": "flow create 0 ingress pattern eth / ipv6 src is 2001::1 dst is 2001::2 / udp / esp spi is 7 / end actions mark id 15 / end",
     "scapy_str": MAC_IPV6_NAT_T_ESP,
-    "check_param": {"port_id": 0, "passthru": 1, "mark_id": 15}
+    "check_param": {"port_id": 0, "mark_id": 15}
 }
 
 # mac_ipv4_tcp_without_input_set
@@ -6902,17 +6990,23 @@  vectors_ipv4_l2tpv3 = [tv_mac_ipv4_l2tpv3_queue_index, tv_mac_ipv4_l2tpv3_queue_
 
 vectors_ipv6_l2tpv3 = [tv_mac_ipv6_l2tpv3_queue_index, tv_mac_ipv6_l2tpv3_queue_group, tv_mac_ipv6_l2tpv3_mark]
 
-vectors_ipv4_esp = [tv_mac_ipv4_esp_queue_index, tv_mac_ipv4_esp_queue_group, tv_mac_ipv4_esp_mark]
+vectors_ipv4_esp = [tv_mac_ipv4_esp_queue_index, tv_mac_ipv4_esp_queue_group, tv_mac_ipv4_esp_mark,
+                    tv_mac_ipv4_esp_drop, tv_mac_ipv4_esp_mark_rss, tv_mac_ipv4_esp_passthru]
 
-vectors_ipv6_esp = [tv_mac_ipv6_esp_queue_index, tv_mac_ipv6_esp_queue_group, tv_mac_ipv6_esp_mark]
+vectors_ipv6_esp = [tv_mac_ipv6_esp_queue_index, tv_mac_ipv6_esp_queue_group, tv_mac_ipv6_esp_mark,
+                    tv_mac_ipv6_esp_drop, tv_mac_ipv6_esp_mark_rss, tv_mac_ipv6_esp_passthru]
 
 vectors_ipv4_ah = [tv_mac_ipv4_ah_queue_index, tv_mac_ipv4_ah_queue_group, tv_mac_ipv4_ah_mark]
 
 vectors_ipv6_ah = [tv_mac_ipv6_ah_queue_index, tv_mac_ipv6_ah_queue_group, tv_mac_ipv6_ah_mark]
 
-vectors_ipv4_nat_t_esp = [tv_mac_ipv4_nat_t_esp_queue_index, tv_mac_ipv4_nat_t_esp_queue_group, tv_mac_ipv4_nat_t_esp_mark]
+vectors_ipv4_nat_t_esp = [tv_mac_ipv4_nat_t_esp_queue_index, tv_mac_ipv4_nat_t_esp_queue_group,
+                          tv_mac_ipv4_nat_t_esp_mark, tv_mac_ipv4_nat_t_esp_drop, tv_mac_ipv4_nat_t_esp_mark_rss,
+                          tv_mac_ipv4_nat_t_esp_passthru]
 
-vectors_ipv6_nat_t_esp = [tv_mac_ipv6_nat_t_esp_queue_index, tv_mac_ipv6_nat_t_esp_queue_group, tv_mac_ipv6_nat_t_esp_mark]
+vectors_ipv6_nat_t_esp = [tv_mac_ipv6_nat_t_esp_queue_index, tv_mac_ipv6_nat_t_esp_queue_group,
+                          tv_mac_ipv6_nat_t_esp_mark, tv_mac_ipv6_nat_t_esp_drop, tv_mac_ipv6_nat_t_esp_mark_rss,
+                          tv_mac_ipv6_nat_t_esp_passthru]
 
 vectors_ipv4_tcp_without_input_set = [tv_mac_ipv4_tcp_without_input_set_queue_index, tv_mac_ipv4_tcp_without_input_set_queue_group,
                                       tv_mac_ipv4_tcp_without_input_set_mark_rss, tv_mac_ipv4_tcp_without_input_set_passthru,