diff --git a/tests/TestSuite_cvl_advanced_rss_pppoe.py b/tests/TestSuite_cvl_advanced_rss_pppoe.py
index bf5422d..0529165 100644
--- a/tests/TestSuite_cvl_advanced_rss_pppoe.py
+++ b/tests/TestSuite_cvl_advanced_rss_pppoe.py
@@ -28,425 +28,14 @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 import re
 import random
 import string
-from test_case import TestCase
+from test_case import TestCase, skip_unsupported_pkg
 from pmd_output import PmdOutput
 from packet import Packet
 from rte_flow_common import RssProcessing
-from config import UserConf
-
-mac_ipv4_pfcp_session_packets = {
-    'match': [
-        'Ether(dst="00:11:22:33:44:55")/IP(src="192.168.0.20",dst="192.168.0.21")/UDP(sport=22,dport=8805)/PFCP(S=1, seid=1)/Raw("x"*80)',
-        'Ether(dst="00:11:22:33:44:55")/IP(src="192.168.0.20",dst="192.168.0.21")/UDP(sport=22,dport=8805)/PFCP(S=1, seid=2)/Raw("x"*80)',
-        'Ether(dst="00:11:22:33:44:54")/IP(src="192.168.0.25",dst="192.168.0.23")/UDP(sport=23,dport=8805)/PFCP(S=1, seid=1)/Raw("x"*80)'],
-    'mismatch': [
-        'Ether(dst="00:11:22:33:44:55")/IPv6(src="CDCD:910A:2222:5498:8475:1111:3900:1536", dst="CDCD:910A:2222:5498:8475:1111:3900:2022")/UDP(sport=22,dport=8805)/PFCP(S=1, seid=1)/Raw("x"*80)',
-        'Ether(dst="00:11:22:33:44:55")/IP(src="192.168.0.20",dst="192.168.0.21")/UDP(sport=22,dport=25)/Raw("x"*80)']
-}
-
-mac_ipv4_pfcp_session = {
-    'sub_casename': 'mac_ipv4_pfcp_session',
-    'port_id': 0,
-    'rule': 'flow create 0 ingress pattern eth / ipv4 / udp / pfcp / end actions rss types pfcp end key_len 0 queues end / end',
-    'test': [
-        {
-            'send_packet': mac_ipv4_pfcp_session_packets['match'][0],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_pfcp_session_packets['match'][1],
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_pfcp_session_packets['match'][2],
-            'action': 'check_hash_same',
-        },
-        {
-            'send_packet': [i for i in mac_ipv4_pfcp_session_packets['mismatch']],
-            'action': 'check_no_hash',
-        },
-    ],
-    'post-test': [
-        {
-            'send_packet': [i for i in mac_ipv4_pfcp_session_packets['match']],
-            'action': 'check_no_hash',
-        },
-    ],
-}
-
-mac_ipv6_pfcp_session_packets = {
-    'match': [
-        'Ether(dst="00:11:22:33:44:55")/IPv6(src="CDCD:910A:2222:5498:8475:1111:3900:1536", dst="CDCD:910A:2222:5498:8475:1111:3900:2022")/UDP(sport=22,dport=8805)/PFCP(S=1, seid=1)/Raw("x"*80)',
-        'Ether(dst="00:11:22:33:44:55")/IPv6(src="CDCD:910A:2222:5498:8475:1111:3900:1536", dst="CDCD:910A:2222:5498:8475:1111:3900:2022")/UDP(sport=22,dport=8805)/PFCP(S=1, seid=2)/Raw("x"*80)',
-        'Ether(dst="00:11:22:33:44:53")/IPv6(src="CDCD:910A:2222:5498:8475:1111:3900:1537", dst="CDCD:910A:2222:5498:8475:1111:3900:2023")/UDP(sport=23,dport=8805)/PFCP(S=1, seid=1)/Raw("x"*80)'],
-    'mismatch': [
-        'Ether(dst="00:11:22:33:44:55")/IP(src="192.168.0.20",dst="192.168.0.21")/UDP(sport=22,dport=8805)/PFCP(S=1, seid=1)/Raw("x"*80)',
-        'Ether(dst="00:11:22:33:44:55")/IPv6(src="CDCD:910A:2222:5498:8475:1111:3900:1536", dst="CDCD:910A:2222:5498:8475:1111:3900:2022")/UDP(sport=22,dport=25)/Raw("x"*80)']
-}
-
-mac_ipv6_pfcp_session = {
-    'sub_casename': 'mac_ipv6_pfcp_session',
-    'port_id': 0,
-    'rule': 'flow create 0 ingress pattern eth / ipv6 / udp / pfcp / end actions rss types pfcp end key_len 0 queues end / end',
-    'test': [
-        {
-            'send_packet': mac_ipv6_pfcp_session_packets['match'][0],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv6_pfcp_session_packets['match'][1],
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv6_pfcp_session_packets['match'][2],
-            'action': 'check_hash_same',
-        },
-        {
-            'send_packet': [i for i in mac_ipv6_pfcp_session_packets['mismatch']],
-            'action': 'check_no_hash',
-        },
-    ],
-    'post-test': [
-        {
-            'send_packet': [i for i in mac_ipv6_pfcp_session_packets['match']],
-            'action': 'check_no_hash',
-        },
-    ],
-}
-
-mac_ipv4_l2tpv3_packets = {
-    'match': [
-        'Ether(dst="00:11:22:33:44:55")/IP(src="192.168.0.3",dst="192.168.0.5", proto=115)/L2TP(b\'\\x00\\x00\\x00\\x11\')/Raw("x"*480)',
-        'Ether(dst="00:11:22:33:44:55")/IP(src="192.168.0.3",dst="192.168.0.4", proto=115)/L2TP(b\'\\x00\\x00\\x00\\x12\')/Raw("x"*480)',
-        'Ether(dst="00:11:22:33:44:53")/IP(src="192.168.0.5",dst="192.168.0.7", proto=115)/L2TP(b\'\\x00\\x00\\x00\\x11\')/Raw("x"*480)'
-    ],
-    'mismatch': [
-        'Ether(dst="00:11:22:33:44:55")/IPv6(src="CDCD:910A:2222:5498:8475:1111:3900:1536", dst="CDCD:910A:2222:5498:8475:1111:3900:2022", nh=115)/L2TP(b\'\\x00\\x00\\x00\\x11\')/Raw("x"*480)',
-        'Ether(dst="00:11:22:33:44:55")/IP(src="192.168.0.20",dst="192.168.0.21")/UDP(sport=22,dport=25)/Raw("x"*80)'
-    ]
-}
-
-mac_ipv4_l2tpv3 = {
-    'sub_casename': 'mac_ipv4_l2tpv3',
-    'port_id': 0,
-    'rule': 'flow create 0 ingress pattern eth / ipv4 / l2tpv3oip / end actions rss types l2tpv3 end key_len 0 queues end / end',
-    'test': [
-        {
-            'send_packet': mac_ipv4_l2tpv3_packets['match'][0],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_l2tpv3_packets['match'][1],
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_l2tpv3_packets['match'][2],
-            'action': 'check_hash_same',
-        },
-        {
-            'send_packet': [i for i in mac_ipv4_l2tpv3_packets['mismatch']],
-            'action': 'check_no_hash',
-        },
-    ],
-    'post-test': [
-        {
-            'send_packet': [i for i in mac_ipv4_l2tpv3_packets['match']],
-            'action': 'check_no_hash',
-        },
-    ],
-}
-
-mac_ipv6_l2tpv3_packets = {
-    'match': [
-        'Ether(dst="00:11:22:33:44:55")/IPv6(src="CDCD:910A:2222:5498:8475:1111:3900:1536", dst="CDCD:910A:2222:5498:8475:1111:3900:2022", nh=115)/L2TP(b\'\\x00\\x00\\x00\\x11\')/Raw("x"*480)',
-        'Ether(dst="00:11:22:33:44:55")/IPv6(src="CDCD:910A:2222:5498:8475:1111:3900:1536", dst="CDCD:910A:2222:5498:8475:1111:3900:2022", nh=115)/L2TP(b\'\\x00\\x00\\x00\\x12\')/Raw("x"*480)',
-        'Ether(dst="00:11:22:33:44:53")/IPv6(src="CDCD:910A:2222:5498:8475:1111:3900:1537", dst="CDCD:910A:2222:5498:8475:1111:3900:2023", nh=115)/L2TP(b\'\\x00\\x00\\x00\\x11\')/Raw("x"*480)'
-    ],
-    'mismatch': [
-        'Ether(dst="00:11:22:33:44:55")/IP(src="192.168.0.3",dst="192.168.0.5", proto=115)/L2TP(b\'\\x00\\x00\\x00\\x11\')/Raw("x"*480)',
-        'Ether(dst="00:11:22:33:44:55")/IPv6(src="CDCD:910A:2222:5498:8475:1111:3900:1536", dst="CDCD:910A:2222:5498:8475:1111:3900:2022")/UDP(sport=22,dport=25)/Raw("x"*80)'
-    ]
-}
-
-mac_ipv6_l2tpv3 = {
-    'sub_casename': 'mac_ipv6_l2tpv3',
-    'port_id': 0,
-    'rule': 'flow create 0 ingress pattern eth / ipv6 / l2tpv3oip / end actions rss types l2tpv3 end key_len 0 queues end / end',
-    'test': [
-        {
-            'send_packet': mac_ipv6_l2tpv3_packets['match'][0],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv6_l2tpv3_packets['match'][1],
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv6_l2tpv3_packets['match'][2],
-            'action': 'check_hash_same',
-        },
-        {
-            'send_packet': [i for i in mac_ipv6_l2tpv3_packets['mismatch']],
-            'action': 'check_no_hash',
-        },
-    ],
-    'post-test': [
-        {
-            'send_packet': [i for i in mac_ipv6_l2tpv3_packets['match']],
-            'action': 'check_no_hash',
-        }
-    ]
-}
-
-mac_ipv4_esp_packets = {
-    'match': [
-        'Ether(dst="00:11:22:33:44:55")/IP(src="192.168.0.3",dst="192.168.0.5",proto=50)/ESP(spi=11)/Raw("x"*480)',
-        'Ether(dst="00:11:22:33:44:55")/IP(src="192.168.0.3",dst="192.168.0.5",proto=50)/ESP(spi=12)/Raw("x"*480)',
-        'Ether(dst="00:11:22:33:44:53")/IP(src="192.168.0.4",dst="192.168.0.7",proto=50)/ESP(spi=11)/Raw("x"*480)'],
-    'mismatch': [
-        'Ether(dst="00:11:22:33:44:55")/IP(src="192.168.0.3",dst="192.168.0.5", proto=115)/L2TP(b\'\\x00\\x00\\x00\\x11\')/Raw("x"*480)',
-        'Ether(dst="00:11:22:33:44:55")/IPv6(src="CDCD:910A:2222:5498:8475:1111:3900:1536", dst="CDCD:910A:2222:5498:8475:1111:3900:2022", nh=50)/ESP(spi=12)/Raw("x"*480)'
-    ]
-}
-
-mac_ipv4_esp = {
-    'sub_casename': 'mac_ipv4_esp',
-    'port_id': 0,
-    'rule': 'flow create 0 ingress pattern eth / ipv4 / esp / end actions rss types esp end key_len 0 queues end / end',
-    'test': [
-        {
-            'send_packet': mac_ipv4_esp_packets['match'][0],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_esp_packets['match'][1],
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_esp_packets['match'][2],
-            'action': 'check_hash_same',
-        },
-        {
-            'send_packet': [
-                i for i in mac_ipv4_esp_packets['mismatch']],
-            'action': 'check_no_hash',
-        },
-    ],
-    'post-test': [
-        {
-            'send_packet': [
-                i for i in mac_ipv4_esp_packets['match']],
-            'action': 'check_no_hash',
-        },
-    ],
-}
-
-mac_ipv4_udp_esp_packets = {
-    'match': [
-        'Ether(dst="00:11:22:33:44:55")/IP(src="192.168.0.3",dst="192.168.0.5")/UDP(dport=4500)/ESP(spi=11)/Raw("x"*480)',
-        'Ether(dst="00:11:22:33:44:55")/IP(src="192.168.0.3",dst="192.168.0.5")/UDP(dport=4500)/ESP(spi=12)/Raw("x"*480)',
-        'Ether(dst="00:11:22:33:44:53")/IP(src="192.168.0.4",dst="192.168.0.7")/UDP(dport=4500)/ESP(spi=11)/Raw("x"*480)'],
-    'mismatch': [
-        'Ether(dst="00:11:22:33:44:55")/IPv6(src="CDCD:910A:2222:5498:8475:1111:3900:1536", dst="CDCD:910A:2222:5498:8475:1111:3900:2022")/UDP(dport=4500)/ESP(spi=11)/Raw("x"*480)',
-        'Ether(src="00:11:22:33:44:55", dst="10:22:33:44:55:66")/IP(src="192.168.0.3",dst="192.168.0.5")/UDP(sport=25,dport=23)/Raw("x"*80)',
-        'Ether(dst="00:11:22:33:44:55")/IP(src="192.168.0.3",dst="192.168.0.5",proto=50)/ESP(spi=11)/Raw("x"*480)']
-}
-
-mac_ipv4_udp_esp = {
-    'sub_casename': 'mac_ipv4_udp_esp',
-    'port_id': 0,
-    'rule': 'flow create 0 ingress pattern eth / ipv4 / udp / esp / end actions rss types esp end key_len 0 queues end / end',
-    'test': [
-        {
-            'send_packet': mac_ipv4_udp_esp_packets['match'][0],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_udp_esp_packets['match'][1],
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_udp_esp_packets['match'][2],
-            'action': 'check_hash_same',
-        },
-        {
-            'send_packet': [i for i in mac_ipv4_udp_esp_packets['mismatch']],
-            'action': 'check_no_hash',
-        },
-    ],
-    'post-test': [
-        {
-            'send_packet': [
-                i for i in mac_ipv4_esp_packets['match']],
-            'action': 'check_no_hash',
-        },
-    ],
-}
-
-mac_ipv6_esp_packets = {
-    'match': [
-        'Ether(dst="00:11:22:33:44:55")/IPv6(src="CDCD:910A:2222:5498:8475:1111:3900:1536", dst="CDCD:910A:2222:5498:8475:1111:3900:2022", nh=50)/ESP(spi=11)/Raw("x"*480)',
-        'Ether(dst="00:11:22:33:44:55")/IPv6(src="CDCD:910A:2222:5498:8475:1111:3900:1536", dst="CDCD:910A:2222:5498:8475:1111:3900:2022", nh=50)/ESP(spi=12)/Raw("x"*480)',
-        'Ether(dst="00:11:22:33:44:53")/IPv6(src="CDCD:910A:2222:5498:8475:1111:3900:1537", dst="CDCD:910A:2222:5498:8475:1111:3900:2023", nh=50)/ESP(spi=11)/Raw("x"*480)'],
-    'mismatch': [
-        'Ether(dst="00:11:22:33:44:55")/IP(src="192.168.0.3",dst="192.168.0.5",proto=50)/ESP(spi=11)/Raw("x"*480)',
-        'Ether(src="00:11:22:33:44:55", dst="10:22:33:44:55:66")/IPv6(src="CDCD:910A:2222:5498:8475:1111:3900:1536", dst="CDCD:910A:2222:5498:8475:1111:3900:2022")/UDP(sport=25,dport=23)/Raw("x"*80)']
-}
-
-mac_ipv6_esp = {
-    'sub_casename': 'mac_ipv6_esp',
-    'port_id': 0,
-    'rule': 'flow create 0 ingress pattern eth / ipv6 / esp / end actions rss types esp end key_len 0 queues end / end',
-    'test': [
-        {
-            'send_packet': mac_ipv6_esp_packets['match'][0],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv6_esp_packets['match'][1],
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv6_esp_packets['match'][2],
-            'action': 'check_hash_same',
-        },
-        {
-            'send_packet': [i for i in mac_ipv6_esp_packets['mismatch']],
-            'action': 'check_no_hash',
-        },
-    ],
-    'post-test': [
-        {
-            'send_packet': [i for i in mac_ipv6_esp_packets['match']],
-            'action': 'check_no_hash',
-        },
-    ],
-}
-
-mac_ipv6_udp_esp_packets = {
-    'match': [
-        'Ether(dst="00:11:22:33:44:55")/IPv6(src="CDCD:910A:2222:5498:8475:1111:3900:1536", dst="CDCD:910A:2222:5498:8475:1111:3900:2022")/UDP(dport=4500)/ESP(spi=11)/Raw("x"*480)',
-        'Ether(dst="00:11:22:33:44:55")/IPv6(src="CDCD:910A:2222:5498:8475:1111:3900:1536", dst="CDCD:910A:2222:5498:8475:1111:3900:2022")/UDP(dport=4500)/ESP(spi=12)/Raw("x"*480)',
-        'Ether(dst="00:11:22:33:44:53")/IPv6(src="CDCD:910A:2222:5498:8475:1111:3900:1537", dst="CDCD:910A:2222:5498:8475:1111:3900:2023")/UDP(dport=4500)/ESP(spi=11)/Raw("x"*480)'],
-    'mismatch': [
-        'Ether(dst="00:11:22:33:44:55")/IP(src="192.168.0.3",dst="192.168.0.5")/UDP(dport=4500)/ESP(spi=11)/Raw("x"*480)',
-        'Ether(src="00:11:22:33:44:55", dst="10:22:33:44:55:66")/IPv6(src="CDCD:910A:2222:5498:8475:1111:3900:1536", dst="CDCD:910A:2222:5498:8475:1111:3900:2022")/UDP(sport=25,dport=23)/Raw("x"*80)',
-        'Ether(dst="00:11:22:33:44:55")/IPv6(src="CDCD:910A:2222:5498:8475:1111:3900:1536", dst="CDCD:910A:2222:5498:8475:1111:3900:2022", nh=50)/ESP(spi=11)/Raw("x"*480)']
-}
-
-mac_ipv6_udp_esp = {
-    'sub_casename': 'mac_ipv6_udp_esp',
-    'port_id': 0,
-    'rule': 'flow create 0 ingress pattern eth / ipv6 / udp / esp / end actions rss types esp end key_len 0 queues end / end',
-    'test': [
-        {
-            'send_packet': mac_ipv6_udp_esp_packets['match'][0],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv6_udp_esp_packets['match'][1],
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv6_udp_esp_packets['match'][2],
-            'action': 'check_hash_same',
-        },
-        {
-            'send_packet': mac_ipv6_udp_esp_packets['mismatch'],
-            'action': 'check_no_hash',
-        },
-    ],
-    'post-test': [
-        {
-            'send_packet': mac_ipv6_udp_esp_packets['match'],
-            'action': 'check_no_hash',
-        },
-    ],
-
-}
-
-mac_ipv4_ah_packets = {
-    'match': ['Ether(dst="00:11:22:33:44:55")/IP(src="192.168.0.3",dst="192.168.0.5",proto=51)/AH(spi=11)/Raw("x"*480)',
-              'Ether(dst="00:11:22:33:44:55")/IP(src="192.168.0.3",dst="192.168.0.5",proto=51)/AH(spi=12)/Raw("x"*480)',
-              'Ether(dst="00:11:22:33:44:53")/IP(src="192.168.0.4",dst="192.168.0.8",proto=51)/AH(spi=11)/Raw("x"*480)'],
-    'mismatch': [
-        'Ether(src="00:11:22:33:44:55", dst="10:22:33:44:55:66")/IP(src="192.168.0.3",dst="192.168.0.5")/UDP(sport=25,dport=23)/Raw("x"*80)',
-        'Ether(dst="00:11:22:33:44:55")/IPv6(src="CDCD:910A:2222:5498:8475:1111:3900:1536", dst="CDCD:910A:2222:5498:8475:1111:3900:2022", nh=51)/AH(spi=11)/Raw("x"*480)']
-}
-
-mac_ipv4_ah = {
-    'sub_casename': 'mac_ipv4_ah',
-    'port_id': 0,
-    'rule': 'flow create 0 ingress pattern eth / ipv4 / ah / end actions rss types ah end key_len 0 queues end / end',
-    'test': [
-        {
-            'send_packet': mac_ipv4_ah_packets['match'][0],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_ah_packets['match'][1],
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_ah_packets['match'][2],
-            'action': 'check_hash_same',
-        },
-        {
-            'send_packet': [i for i in mac_ipv4_ah_packets['mismatch']],
-            'action': 'check_no_hash',
-        },
-    ],
-    'post-test': [
-        {
-            'send_packet': [i for i in mac_ipv4_ah_packets['match']],
-            'action': 'check_no_hash',
-        },
-    ],
-
-}
-
-mac_ipv6_ah_packets = {
-    'match': [
-        'Ether(dst="00:11:22:33:44:55")/IPv6(src="CDCD:910A:2222:5498:8475:1111:3900:1536", dst="CDCD:910A:2222:5498:8475:1111:3900:2022", nh=51)/AH(spi=11)/Raw("x"*480)',
-        'Ether(dst="00:11:22:33:44:55")/IPv6(src="CDCD:910A:2222:5498:8475:1111:3900:1536", dst="CDCD:910A:2222:5498:8475:1111:3900:2022", nh=51)/AH(spi=12)/Raw("x"*480)',
-        'Ether(dst="00:11:22:33:44:53")/IPv6(src="CDCD:910A:2222:5498:8475:1111:3900:1537", dst="CDCD:910A:2222:5498:8475:1111:3900:2023", nh=51)/AH(spi=11)/Raw("x"*480)'],
-    'mismatch': [
-        'Ether(dst="00:11:22:33:44:55")/IP(src="192.168.0.3",dst="192.168.0.5",proto=51)/AH(spi=11)/Raw("x"*480)',
-        'Ether(src="00:11:22:33:44:55", dst="10:22:33:44:55:66")/IPv6(src="CDCD:910A:2222:5498:8475:1111:3900:1536", dst="CDCD:910A:2222:5498:8475:1111:3900:2022")/UDP(sport=25,dport=23)/Raw("x"*80)']
-}
-
-mac_ipv6_ah = {
-    'sub_casename': 'mac_ipv6_ah',
-    'port_id': 0,
-    'rule': 'flow create 0 ingress pattern eth / ipv6 / ah / end actions rss types ah end key_len 0 queues end / end',
-    'test': [
-        {
-            'send_packet': mac_ipv6_ah_packets['match'][0],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv6_ah_packets['match'][1],
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv6_ah_packets['match'][2],
-            'action': 'check_hash_same',
-        },
-        {
-            'send_packet': [i for i in mac_ipv6_ah_packets['mismatch']],
-            'action': 'check_no_hash',
-        },
-    ],
-    'post-test': [
-        {
-            'send_packet': [i for i in mac_ipv6_ah_packets['match']],
-            'action': 'check_no_hash',
-        },
-    ],
-}
 
 mac_pppoe_pay_packets = {
     'mismatch': [
@@ -750,7 +339,6 @@ mac_pppoe_pay_l2_src_only_session_id = {
     ],
 }
 
-
 mac_pppoe_ipv4_pay_packets = {
     'mismatch': [
         'Ether(src="00:11:22:33:44:55", dst="10:22:33:44:55:66")/PPPoE(sessionid=3)/PPP(b\'\\x00\\x57\')/IPv6(src="CDCD:910A:2222:5498:8475:1111:3900:1536", dst="CDCD:910A:2222:5498:8475:1111:3900:2022")/Raw("x"*80)',
@@ -918,7 +506,6 @@ mac_pppoe_ipv4_pay_l2_src_only_l2_dst_only = {
     'post-test': mac_pppoe_ipv4_pay_post_test
 }
 
-
 mac_pppoe_ipv4_pay_l3_src_only_packets = {
     'mac_pppoe_ipv4_pay': [
         'Ether(src="00:11:22:33:44:55", dst="10:22:33:44:55:66")/PPPoE(sessionid=3)/PPP(b\'\\x00\\x21\')/IP(src="192.168.1.1", dst="192.168.1.2")/Raw("x"*80)',
@@ -2329,6 +1916,7 @@ mac_pppoe_ipv4_tcp_pay_ipv4 = {
         },
     ],
 }
+
 mac_pppoe_ipv6_pay_packets = {
     'mismatch': [
         'Ether(src="00:11:22:33:44:55", dst="10:22:33:44:55:66")/PPPoE(sessionid=3)/PPP(b\'\\x00\\x21\')/IP(src="192.168.1.1", dst="192.168.1.2")/Raw("x"*80)',
@@ -4719,357 +4307,6 @@ simple_xor = {
     ],
 }
 
-mac_vlan_ipv4_pay_packets = {
-    'match': {
-        'mac_vlan_ipv4_pay': [
-            'Ether(src="10:22:33:44:55:66", dst="00:11:22:33:44:55",type=0x8100)/Dot1Q(vlan=1,type=0x0800)/IP(src="192.168.1.1", dst="192.168.1.2")/Raw("x" * 80)',
-            'Ether(src="10:22:33:44:55:66", dst="00:11:22:33:44:55",type=0x8100)/Dot1Q(vlan=2,type=0x0800)/IP(src="192.168.1.1", dst="192.168.1.2")/Raw("x" * 80)',
-            'Ether(src="10:22:33:44:55:99", dst="00:11:22:33:44:53",type=0x8100)/Dot1Q(vlan=1,type=0x0800)/IP(src="192.168.1.3", dst="192.168.1.4")/Raw("x" * 80)',
-        ],
-    },
-    'mismatch': [
-        'Ether(src="10:22:33:44:55:66", dst="00:11:22:33:44:55",type=0x8100)/Dot1Q(vlan=1,type=0x86dd)/IPv6(src="CDCD:910A:2222:5498:8475:1111:3900:1536", dst="CDCD:910A:2222:5498:8475:1111:3900:2022")/Raw("x" * 80)'
-    ]
-}
-
-mac_vlan_ipv4_pay = {
-    'sub_casename': 'mac_vlan_ipv4_pay',
-    'port_id': 0,
-    'rule': 'flow create 0 ingress pattern eth / vlan / ipv4 / end actions rss types c-vlan end key_len 0 queues end / end',
-    'test': [
-        {
-            'send_packet': mac_vlan_ipv4_pay_packets['match']['mac_vlan_ipv4_pay'][0],
-            'action': {'save_hash': 'mac_vlan_ipv4_pay_match'},
-        },
-        {
-            'send_packet': mac_vlan_ipv4_pay_packets['match']['mac_vlan_ipv4_pay'][1],
-            'action': {'check_hash_different': 'mac_vlan_ipv4_pay_match'},
-        },
-        {
-            'send_packet': mac_vlan_ipv4_pay_packets['match']['mac_vlan_ipv4_pay'][2],
-            'action': {'check_hash_same': 'mac_vlan_ipv4_pay_match'},
-        },
-        {
-            'send_packet': mac_vlan_ipv4_pay_packets['mismatch'][0],
-            'action': 'check_no_hash',
-        },
-    ],
-    'post-test': [
-        {
-            'send_packet': mac_vlan_ipv4_pay_packets['match']['mac_vlan_ipv4_pay'],
-            'action': 'check_no_hash',
-        },
-    ],
-}
-
-mac_vlan_ipv4_udp_pay_packets = {
-    'match': {
-        'mac_vlan_ipv4_udp_pay': [
-            'Ether(src="10:22:33:44:55:66", dst="00:11:22:33:44:55",type=0x8100)/Dot1Q(vlan=1,type=0x0800)/IP(src="192.168.1.1", dst="192.168.1.2")/UDP(sport=25,dport=23)/Raw("x" * 80)',
-            'Ether(src="10:22:33:44:55:66", dst="00:11:22:33:44:55",type=0x8100)/Dot1Q(vlan=2,type=0x0800)/IP(src="192.168.1.1", dst="192.168.1.2")/UDP(sport=25,dport=23)/Raw("x" * 80)',
-            'Ether(src="10:22:33:44:55:99", dst="00:11:22:33:44:53",type=0x8100)/Dot1Q(vlan=1,type=0x0800)/IP(src="192.168.1.3", dst="192.168.1.4")/UDP(sport=19,dport=99)/Raw("x" * 80)',
-        ]
-    },
-    'mismatch': [
-        'Ether(src="10:22:33:44:55:66", dst="00:11:22:33:44:55",type=0x8100)/Dot1Q(vlan=1,type=0x0800)/IP(src="192.168.1.1", dst="192.168.1.2")/TCP(sport=25,dport=23)/Raw("x" * 80)',
-        'Ether(src="10:22:33:44:55:66", dst="00:11:22:33:44:55",type=0x8100)/Dot1Q(vlan=1,type=0x86dd)/IPv6(src="CDCD:910A:2222:5498:8475:1111:3900:1536", dst="CDCD:910A:2222:5498:8475:1111:3900:2022")/UDP(sport=25,dport=23)/Raw("x" * 80)'
-    ]
-}
-
-mac_vlan_ipv4_udp_pay = {
-    'sub_casename': 'mac_vlan_ipv4_udp_pay',
-    'port_id': 0,
-    'rule': 'flow create 0 ingress pattern eth / vlan / ipv4 / udp / end actions rss types c-vlan end key_len 0 queues end / end',
-    'test': [
-        {
-            'send_packet': mac_vlan_ipv4_udp_pay_packets['match']['mac_vlan_ipv4_udp_pay'][0],
-            'action': {'save_hash': 'mac_vlan_ipv4_udp_pay_match'},
-        },
-        {
-            'send_packet': mac_vlan_ipv4_udp_pay_packets['match']['mac_vlan_ipv4_udp_pay'][1],
-            'action': {'check_hash_different': 'mac_vlan_ipv4_udp_pay_match'},
-        },
-        {
-            'send_packet': mac_vlan_ipv4_udp_pay_packets['match']['mac_vlan_ipv4_udp_pay'][2],
-            'action': {'check_hash_same': 'mac_vlan_ipv4_udp_pay_match'},
-        },
-        {
-            'send_packet': mac_vlan_ipv4_udp_pay_packets['mismatch'],
-            'action': 'check_no_hash',
-        },
-    ],
-    'post-test': [
-        {
-            'send_packet': mac_vlan_ipv4_udp_pay_packets['match']['mac_vlan_ipv4_udp_pay'],
-            'action': 'check_no_hash',
-        },
-    ],
-}
-
-mac_vlan_ipv4_tcp_pay_packets = {
-    'match': {
-        'mac_vlan_ipv4_tcp_pay': [
-            'Ether(src="10:22:33:44:55:66", dst="00:11:22:33:44:55",type=0x8100)/Dot1Q(vlan=1,type=0x0800)/IP(src="192.168.1.1", dst="192.168.1.2")/TCP(sport=25,dport=23)/Raw("x" * 80)',
-            'Ether(src="10:22:33:44:55:66", dst="00:11:22:33:44:55",type=0x8100)/Dot1Q(vlan=2,type=0x0800)/IP(src="192.168.1.1", dst="192.168.1.2")/TCP(sport=25,dport=23)/Raw("x" * 80)',
-            'Ether(src="10:22:33:44:55:99", dst="00:11:22:33:44:53",type=0x8100)/Dot1Q(vlan=1,type=0x0800)/IP(src="192.168.1.3", dst="192.168.1.4")/TCP(sport=19,dport=99)/Raw("x" * 80)'
-        ]
-    },
-    'mismatch': [
-        'Ether(src="10:22:33:44:55:66", dst="00:11:22:33:44:55",type=0x8100)/Dot1Q(vlan=1,type=0x0800)/IP(src="192.168.1.1", dst="192.168.1.2")/UDP(sport=25,dport=23)/Raw("x" * 80)',
-        'Ether(src="10:22:33:44:55:66", dst="00:11:22:33:44:55",type=0x8100)/Dot1Q(vlan=1,type=0x86dd)/IPv6(src="CDCD:910A:2222:5498:8475:1111:3900:1536", dst="CDCD:910A:2222:5498:8475:1111:3900:2022")/TCP(sport=25,dport=23)/Raw("x" * 80)'
-    ]
-}
-
-mac_vlan_ipv4_tcp_pay = {
-    'sub_casename': 'mac_vlan_ipv4_tcp_pay',
-    'port_id': 0,
-    'rule': 'flow create 0 ingress pattern eth / vlan / ipv4 / tcp / end actions rss types c-vlan end key_len 0 queues end / end',
-    'test': [
-        {
-            'send_packet': mac_vlan_ipv4_tcp_pay_packets['match']['mac_vlan_ipv4_tcp_pay'][0],
-            'action': {'save_hash': 'mac_vlan_ipv4_tcp_pay_match'},
-        },
-        {
-            'send_packet': mac_vlan_ipv4_tcp_pay_packets['match']['mac_vlan_ipv4_tcp_pay'][1],
-            'action': {'check_hash_different': 'mac_vlan_ipv4_tcp_pay_match'},
-        },
-        {
-            'send_packet': mac_vlan_ipv4_tcp_pay_packets['match']['mac_vlan_ipv4_tcp_pay'][2],
-            'action': {'check_hash_same': 'mac_vlan_ipv4_tcp_pay_match'},
-        },
-        {
-            'send_packet': mac_vlan_ipv4_tcp_pay_packets['mismatch'],
-            'action': 'check_no_hash',
-        },
-    ],
-    'post-test': [
-        {
-            'send_packet': mac_vlan_ipv4_tcp_pay_packets['match']['mac_vlan_ipv4_tcp_pay'],
-            'action': 'check_no_hash',
-        },
-    ],
-}
-
-mac_vlan_ipv4_sctp_pay_packets = {
-    'match': {
-        'mac_vlan_ipv4_sctp_pay': [
-            'Ether(src="10:22:33:44:55:66", dst="00:11:22:33:44:55",type=0x8100)/Dot1Q(vlan=1,type=0x0800)/IP(src="192.168.1.1", dst="192.168.1.2")/SCTP(sport=25,dport=23)/Raw("x" * 80)',
-            'Ether(src="10:22:33:44:55:66", dst="00:11:22:33:44:55",type=0x8100)/Dot1Q(vlan=2,type=0x0800)/IP(src="192.168.1.1", dst="192.168.1.2")/SCTP(sport=25,dport=23)/Raw("x" * 80)',
-            'Ether(src="10:22:33:44:55:99", dst="00:11:22:33:44:53",type=0x8100)/Dot1Q(vlan=1,type=0x0800)/IP(src="192.168.1.3", dst="192.168.1.5")/SCTP(sport=19,dport=99)/Raw("x" * 80)'
-        ]
-    },
-    'mismatch': [
-        'Ether(src="10:22:33:44:55:66", dst="00:11:22:33:44:55",type=0x8100)/Dot1Q(vlan=1,type=0x0800)/IP(src="192.168.1.1", dst="192.168.1.2")/UDP(sport=25,dport=23)/Raw("x" * 80)',
-        'Ether(src="10:22:33:44:55:66", dst="00:11:22:33:44:55",type=0x8100)/Dot1Q(vlan=1,type=0x86dd)/IPv6(src="CDCD:910A:2222:5498:8475:1111:3900:1536", dst="CDCD:910A:2222:5498:8475:1111:3900:2022")/SCTP(sport=25,dport=23)/Raw("x" * 80)'
-
-    ]
-}
-
-mac_vlan_ipv4_sctp_pay = {
-    'sub_casename': 'mac_vlan_ipv4_sctp_pay',
-    'port_id': 0,
-    'rule': 'flow create 0 ingress pattern eth / vlan / ipv4 / sctp / end actions rss types c-vlan end key_len 0 queues end / end',
-    'test': [
-        {
-            'send_packet': mac_vlan_ipv4_sctp_pay_packets['match']['mac_vlan_ipv4_sctp_pay'][0],
-            'action': {'save_hash': 'mac_vlan_ipv4_sctp_pay_match'},
-        },
-        {
-            'send_packet': mac_vlan_ipv4_sctp_pay_packets['match']['mac_vlan_ipv4_sctp_pay'][1],
-            'action': {'check_hash_different': 'mac_vlan_ipv4_sctp_pay_match'},
-        },
-        {
-            'send_packet': mac_vlan_ipv4_sctp_pay_packets['match']['mac_vlan_ipv4_sctp_pay'][2],
-            'action': {'check_hash_same': 'mac_vlan_ipv4_sctp_pay_match'},
-        },
-        {
-            'send_packet': mac_vlan_ipv4_sctp_pay_packets['mismatch'],
-            'action': 'check_no_hash',
-        },
-    ],
-    'post-test': [
-        {
-            'send_packet': mac_vlan_ipv4_sctp_pay_packets['match']['mac_vlan_ipv4_sctp_pay'],
-            'action': 'check_no_hash',
-        },
-    ],
-}
-
-mac_vlan_ipv6_pay_packets = {
-    'match': {
-        'mac_vlan_ipv6_pay': [
-            'Ether(src="10:22:33:44:55:66", dst="00:11:22:33:44:55",type=0x8100)/Dot1Q(vlan=1,type=0x86dd)/IPv6(src="CDCD:910A:2222:5498:8475:1111:3900:1536", dst="CDCD:910A:2222:5498:8475:1111:3900:2022")/Raw("x" * 80)',
-            'Ether(src="10:22:33:44:55:66", dst="00:11:22:33:44:55",type=0x8100)/Dot1Q(vlan=2,type=0x86dd)/IPv6(src="CDCD:910A:2222:5498:8475:1111:3900:1536", dst="CDCD:910A:2222:5498:8475:1111:3900:2022")/Raw("x" * 80)',
-            'Ether(src="10:22:33:44:55:99", dst="00:11:22:33:44:53",type=0x8100)/Dot1Q(vlan=1,type=0x86dd)/IPv6(src="CDCD:910A:2222:5498:8475:1111:3900:1537", dst="CDCD:910A:2222:5498:8475:1111:3900:2023")/Raw("y" * 80)'
-        ]
-    },
-    'mismatch': [
-        'Ether(src="10:22:33:44:55:66", dst="00:11:22:33:44:55",type=0x8100)/Dot1Q(vlan=1,type=0x0800)/IP(src="192.168.1.1", dst="192.168.1.2")/Raw("x" * 80)'
-    ]
-}
-
-mac_vlan_ipv6_pay = {
-    'sub_casename': 'mac_vlan_ipv6_pay',
-    'port_id': 0,
-    'rule': 'flow create 0 ingress pattern eth / vlan / ipv6 / end actions rss types c-vlan end key_len 0 queues end / end',
-    'test': [
-        {
-            'send_packet': mac_vlan_ipv6_pay_packets['match']['mac_vlan_ipv6_pay'][0],
-            'action': {'save_hash': 'mac_vlan_ipv6_pay_match'},
-        },
-        {
-            'send_packet': mac_vlan_ipv6_pay_packets['match']['mac_vlan_ipv6_pay'][1],
-            'action': {'check_hash_different': 'mac_vlan_ipv6_pay_match'},
-        },
-        {
-            'send_packet': mac_vlan_ipv6_pay_packets['match']['mac_vlan_ipv6_pay'][2],
-            'action': {'check_hash_same': 'mac_vlan_ipv6_pay_match'},
-        },
-        {
-            'send_packet': mac_vlan_ipv6_pay_packets['mismatch'],
-            'action': 'check_no_hash',
-        },
-    ],
-    'post-test': [
-        {
-            'send_packet': mac_vlan_ipv6_pay_packets['match']['mac_vlan_ipv6_pay'],
-            'action': 'check_no_hash',
-        },
-    ],
-}
-
-mac_vlan_ipv6_udp_pay_packets = {
-    'match': {
-        'mac_vlan_ipv6_udp_pay': [
-            'Ether(src="10:22:33:44:55:66", dst="00:11:22:33:44:55",type=0x8100)/Dot1Q(vlan=1,type=0x86dd)/IPv6(src="CDCD:910A:2222:5498:8475:1111:3900:1536", dst="CDCD:910A:2222:5498:8475:1111:3900:2022")/UDP(sport=25,dport=23)/Raw("x" * 80)',
-            'Ether(src="10:22:33:44:55:66", dst="00:11:22:33:44:55",type=0x8100)/Dot1Q(vlan=2,type=0x86dd)/IPv6(src="CDCD:910A:2222:5498:8475:1111:3900:1536", dst="CDCD:910A:2222:5498:8475:1111:3900:2022")/UDP(sport=25,dport=23)/Raw("x" * 80)',
-            'Ether(src="10:22:33:44:55:99", dst="00:11:22:33:44:53",type=0x8100)/Dot1Q(vlan=1,type=0x86dd)/IPv6(src="CDCD:910A:2222:5498:8475:1111:3900:1537", dst="CDCD:910A:2222:5498:8475:1111:3900:2023")/UDP(sport=23,dport=99)/Raw("x" * 80)'
-        ]
-    },
-    'mismatch': [
-        'Ether(src="10:22:33:44:55:66", dst="00:11:22:33:44:55",type=0x8100)/Dot1Q(vlan=1,type=0x0800)/IP(src="192.168.1.1", dst="192.168.1.2")/UDP(sport=25,dport=23)/Raw("x" * 80)',
-        'Ether(src="10:22:33:44:55:66", dst="00:11:22:33:44:55",type=0x8100)/Dot1Q(vlan=1,type=0x86dd)/IPv6(src="CDCD:910A:2222:5498:8475:1111:3900:1536", dst="CDCD:910A:2222:5498:8475:1111:3900:2022")/TCP(sport=25,dport=23)/Raw("x" * 80)'
-    ]
-}
-
-mac_vlan_ipv6_udp_pay = {
-    'sub_casename': 'mac_vlan_ipv6_udp_pay',
-    'port_id': 0,
-    'rule': 'flow create 0 ingress pattern eth / vlan / ipv6 / udp / end actions rss types c-vlan end key_len 0 queues end / end',
-    'test': [
-        {
-            'send_packet': mac_vlan_ipv6_udp_pay_packets['match']['mac_vlan_ipv6_udp_pay'][0],
-            'action': {'save_hash': 'mac_vlan_ipv6_udp_pay_match'},
-        },
-        {
-            'send_packet': mac_vlan_ipv6_udp_pay_packets['match']['mac_vlan_ipv6_udp_pay'][1],
-            'action': {'check_hash_different': 'mac_vlan_ipv6_udp_pay_match'},
-        },
-        {
-            'send_packet': mac_vlan_ipv6_udp_pay_packets['match']['mac_vlan_ipv6_udp_pay'][2],
-            'action': {'check_hash_same': 'mac_vlan_ipv6_udp_pay_match'},
-        },
-        {
-            'send_packet': mac_vlan_ipv6_udp_pay_packets['mismatch'],
-            'action': 'check_no_hash',
-        },
-    ],
-    'post-test': [
-        {
-            'send_packet': mac_vlan_ipv6_udp_pay_packets['match']['mac_vlan_ipv6_udp_pay'],
-            'action': 'check_no_hash',
-        },
-    ],
-}
-
-mac_vlan_ipv6_tcp_pay_packets = {
-    'match': {
-        'mac_vlan_ipv6_tcp_pay': [
-            'Ether(src="10:22:33:44:55:66", dst="00:11:22:33:44:55",type=0x8100)/Dot1Q(vlan=1,type=0x86dd)/IPv6(src="CDCD:910A:2222:5498:8475:1111:3900:1536", dst="CDCD:910A:2222:5498:8475:1111:3900:2022")/TCP(sport=25,dport=23)/Raw("x" * 80)',
-            'Ether(src="10:22:33:44:55:66", dst="00:11:22:33:44:55",type=0x8100)/Dot1Q(vlan=2,type=0x86dd)/IPv6(src="CDCD:910A:2222:5498:8475:1111:3900:1536", dst="CDCD:910A:2222:5498:8475:1111:3900:2022")/TCP(sport=25,dport=23)/Raw("x" * 80)',
-            'Ether(src="10:22:33:44:55:99", dst="00:11:22:33:44:53",type=0x8100)/Dot1Q(vlan=1,type=0x86dd)/IPv6(src="CDCD:910A:2222:5498:8475:1111:3900:1537", dst="CDCD:910A:2222:5498:8475:1111:3900:2023")/TCP(sport=19,dport=99)/Raw("x" * 80)'
-        ]
-    },
-    'mismatch': [
-        'Ether(src="10:22:33:44:55:66", dst="00:11:22:33:44:55",type=0x8100)/Dot1Q(vlan=1,type=0x0800)/IP(src="192.168.1.1", dst="192.168.1.2")/TCP(sport=25,dport=23)/Raw("x" * 80)',
-        'Ether(src="10:22:33:44:55:66", dst="00:11:22:33:44:55",type=0x8100)/Dot1Q(vlan=1,type=0x86dd)/IPv6(src="CDCD:910A:2222:5498:8475:1111:3900:1536", dst="CDCD:910A:2222:5498:8475:1111:3900:2022")/UDP(sport=25,dport=23)/Raw("x" * 80)'
-    ]
-}
-
-mac_vlan_ipv6_tcp_pay = {
-    'sub_casename': 'mac_vlan_ipv6_tcp_pay',
-    'port_id': 0,
-    'rule': 'flow create 0 ingress pattern eth / vlan / ipv6 / tcp / end actions rss types c-vlan end key_len 0 queues end / end',
-    'test': [
-        {
-            'send_packet': mac_vlan_ipv6_tcp_pay_packets['match']['mac_vlan_ipv6_tcp_pay'][0],
-            'action': {'save_hash': 'mac_vlan_ipv6_tcp_pay_match'},
-        },
-        {
-            'send_packet': mac_vlan_ipv6_tcp_pay_packets['match']['mac_vlan_ipv6_tcp_pay'][1],
-            'action': {'check_hash_different': 'mac_vlan_ipv6_tcp_pay_match'},
-        },
-        {
-            'send_packet': mac_vlan_ipv6_tcp_pay_packets['match']['mac_vlan_ipv6_tcp_pay'][2],
-            'action': {'check_hash_same': 'mac_vlan_ipv6_tcp_pay_match'},
-        },
-        {
-            'send_packet': mac_vlan_ipv6_tcp_pay_packets['mismatch'],
-            'action': 'check_no_hash',
-        },
-    ],
-    'post-test': [
-        {
-            'send_packet': mac_vlan_ipv6_tcp_pay_packets['match']['mac_vlan_ipv6_tcp_pay'],
-            'action': 'check_no_hash',
-        },
-    ],
-}
-
-mac_vlan_ipv6_sctp_pay_packets = {
-    'match': {
-        'mac_vlan_ipv6_sctp_pay': [
-            'Ether(src="10:22:33:44:55:66", dst="00:11:22:33:44:55",type=0x8100)/Dot1Q(vlan=1,type=0x86dd)/IPv6(src="CDCD:910A:2222:5498:8475:1111:3900:1536", dst="CDCD:910A:2222:5498:8475:1111:3900:2022")/SCTP(sport=25,dport=23)/Raw("x" * 80)',
-            'Ether(src="10:22:33:44:55:66", dst="00:11:22:33:44:55",type=0x8100)/Dot1Q(vlan=2,type=0x86dd)/IPv6(src="CDCD:910A:2222:5498:8475:1111:3900:1536", dst="CDCD:910A:2222:5498:8475:1111:3900:2022")/SCTP(sport=25,dport=23)/Raw("x" * 80)',
-            'Ether(src="10:22:33:44:55:99", dst="00:11:22:33:44:53",type=0x8100)/Dot1Q(vlan=1,type=0x86dd)/IPv6(src="CDCD:910A:2222:5498:8475:1111:3900:1537", dst="CDCD:910A:2222:5498:8475:1111:3900:2023")/SCTP(sport=25,dport=99)/Raw("x" * 80)'
-        ]
-    },
-    'mismatch': [
-        'Ether(src="10:22:33:44:55:66", dst="00:11:22:33:44:55",type=0x8100)/Dot1Q(vlan=1,type=0x0800)/IP(src="192.168.1.1", dst="192.168.1.2")/SCTP(sport=25,dport=23)/Raw("x" * 80)',
-        'Ether(src="10:22:33:44:55:66", dst="00:11:22:33:44:55",type=0x8100)/Dot1Q(vlan=1,type=0x86dd)/IPv6(src="CDCD:910A:2222:5498:8475:1111:3900:1536", dst="CDCD:910A:2222:5498:8475:1111:3900:2022")/UDP(sport=25,dport=23)/Raw("x" * 80)'
-    ]
-}
-
-mac_vlan_ipv6_sctp_pay = {
-    'sub_casename': 'mac_vlan_ipv6_sctp_pay',
-    'port_id': 0,
-    'rule': 'flow create 0 ingress pattern eth / vlan / ipv6 / sctp / end actions rss types c-vlan end key_len 0 queues end / end',
-    'test': [
-        {
-            'send_packet': mac_vlan_ipv6_sctp_pay_packets['match']['mac_vlan_ipv6_sctp_pay'][0],
-            'action': {'save_hash': 'mac_vlan_ipv6_sctp_pay_match'},
-        },
-        {
-            'send_packet': mac_vlan_ipv6_sctp_pay_packets['match']['mac_vlan_ipv6_sctp_pay'][1],
-            'action': {'check_hash_different': 'mac_vlan_ipv6_sctp_pay_match'},
-        },
-        {
-            'send_packet': mac_vlan_ipv6_sctp_pay_packets['match']['mac_vlan_ipv6_sctp_pay'][2],
-            'action': {'check_hash_same': 'mac_vlan_ipv6_sctp_pay_match'},
-        },
-        {
-            'send_packet': mac_vlan_ipv6_sctp_pay_packets['mismatch'],
-            'action': 'check_no_hash',
-        },
-    ],
-    'post-test': [
-        {
-            'send_packet': mac_vlan_ipv6_sctp_pay_packets['match']['mac_vlan_ipv6_sctp_pay'],
-            'action': 'check_no_hash',
-        },
-    ],
-}
-
 mac_vlan_pppoe_pay_l2_src_only_packets = [
     'Ether(src="00:11:22:33:44:55", dst="10:22:33:44:55:66")/Dot1Q(vlan=1,type=0x8864)/PPPoE(sessionid=3)/Raw("x"*80)',
     'Ether(src="00:11:22:33:44:53", dst="10:22:33:44:55:66")/Dot1Q(vlan=1,type=0x8864)/PPPoE(sessionid=3)/Raw("x"*80)',
@@ -5251,14 +4488,14 @@ mac_vlan_pppoe_pay = [
 ]
 
 
-class Advanced_rss_pppoe_vlan_ah_l2tp_pfcp(TestCase):
+class Advanced_rss_pppoe(TestCase):
 
+    @skip_unsupported_pkg(['os default', 'wireless'])
     def set_up_all(self):
         """
         Run at the start of each test suite.
         Generic filter Prerequistites
         """
-
         # Based on h/w type, choose how many ports to use
         self.dut_ports = self.dut.get_ports(self.nic)
         self.verify(len(self.dut_ports) >= 2, "Insufficient ports for testing")
@@ -5275,12 +4512,6 @@ class Advanced_rss_pppoe_vlan_ah_l2tp_pfcp(TestCase):
             self.pci_list.append(port['pci'])
         self.pkt = Packet()
         self.pmd_output = PmdOutput(self.dut)
-        self.ddp_dir = "/lib/firmware/updates/intel/ice/ddp/"
-        conf_file = 'conf/cvl_advanced_rss_pppoe.cfg'
-        conf_info = UserConf(conf_file)
-        conf_section = conf_info.conf._sections['suite']
-        self.os_default_package = conf_section['os_default_package_file_location']
-        self.comms_package = conf_section['comms_package_file_location']
         self.symmetric = False
         self.rxq = 64
         self.rsspro = RssProcessing(self, self.pmd_output, [self.tester_iface0, self.tester_iface1], self.rxq)
@@ -5309,20 +4540,7 @@ class Advanced_rss_pppoe_vlan_ah_l2tp_pfcp(TestCase):
         """
         self.dut.kill_all()
 
-    def replace_package(self, package='comms'):
-        ice_pkg_path = ''.join([self.ddp_dir,"ice.pkg"])
-        self.dut.send_expect("rm -f {}".format(ice_pkg_path), "# ")
-        if package == 'os_default':
-            self.dut.send_expect("cp {} {}".format(self.os_default_package,ice_pkg_path), "# ")
-        elif package == 'comms':
-            self.dut.send_expect("cp {} {}".format(self.comms_package,ice_pkg_path), "# ")
-        for pci in self.pci_list:
-            self.dut.send_expect("echo {0} > /sys/bus/pci/devices/{0}/driver/unbind".format(pci), "# ", 60)
-            self.dut.send_expect("echo {} > /sys/bus/pci/drivers/ice/bind".format(pci), "# ", 60)
-        pci_str = ' '.join(self.pci_list)
-        self.dut.send_expect("./usertools/dpdk-devbind.py --force --bind=vfio-pci {}".format(pci_str), "# ", 60)
-
-    def launch_testpmd(self, symmetric=False, package='comms'):
+    def launch_testpmd(self, symmetric=False):
         if symmetric:
             param = "--rxq=64 --txq=64"
         else:
@@ -5330,14 +4548,6 @@ class Advanced_rss_pppoe_vlan_ah_l2tp_pfcp(TestCase):
         out = self.pmd_output.start_testpmd(cores="1S/4C/1T", param=param,
                                             eal_param=f"-w {self.pci_list[0]}", socket=self.ports_socket)
         self.symmetric = symmetric
-        package_version = re.search('Active\spackage\sis:\s(.+),', out).group(1)
-        self.logger.info('DDP package version: %s' % package_version)
-        if package == 'comms':
-            self.verify(package_version in self.comms_package.split('/')[-1],
-                        'package version not match')
-        elif package == 'os_default':
-            self.verify(package_version in self.os_default_package.split('/')[-1],
-                        'package version not match')
         if symmetric:
             # Need config rss in setup
             self.pmd_output.execute_cmd("port config all rss all")
@@ -5345,56 +4555,15 @@ class Advanced_rss_pppoe_vlan_ah_l2tp_pfcp(TestCase):
         self.pmd_output.execute_cmd("set verbose 1")
         res = self.pmd_output.wait_link_status_up('all', timeout=15)
         self.verify(res is True, 'there have port link is down')
-        return package_version
 
-    def switch_testpmd(self, symmetric=True, pkg='comms'):
+    def switch_testpmd(self, symmetric=True):
         self.dut.kill_all()
-        self.launch_testpmd(symmetric, pkg)
+        self.launch_testpmd(symmetric)
         self.pmd_output.execute_cmd("start")
 
     def _gener_str(self, str_len=6):
         return ''.join(random.sample(string.ascii_letters + string.digits, k=str_len))
 
-    def test_mac_ipv4_pfcp_session(self):
-        self.switch_testpmd(symmetric=False)
-        self.rsspro.handle_rss_distribute_cases(cases_info=mac_ipv4_pfcp_session)
-
-    def test_mac_ipv6_pfcp_session(self):
-        self.switch_testpmd(symmetric=False)
-        self.rsspro.handle_rss_distribute_cases(cases_info=mac_ipv6_pfcp_session)
-
-    def test_mac_ipv4_l2tpv3(self):
-        self.switch_testpmd(symmetric=False)
-        self.rsspro.handle_rss_distribute_cases(cases_info=mac_ipv4_l2tpv3)
-
-    def test_mac_ipv6_l2tpv3(self):
-        self.switch_testpmd(symmetric=False)
-        self.rsspro.handle_rss_distribute_cases(cases_info=mac_ipv6_l2tpv3)
-
-    def test_mac_ipv4_esp(self):
-        self.switch_testpmd(symmetric=False)
-        self.rsspro.handle_rss_distribute_cases(cases_info=mac_ipv4_esp)
-
-    def test_mac_ipv4_udp_esp(self):
-        self.switch_testpmd(symmetric=False)
-        self.rsspro.handle_rss_distribute_cases(cases_info=mac_ipv4_udp_esp)
-
-    def test_mac_ipv6_esp(self):
-        self.switch_testpmd(symmetric=False)
-        self.rsspro.handle_rss_distribute_cases(cases_info=mac_ipv6_esp)
-
-    def test_mac_ipv6_udp_esp(self):
-        self.switch_testpmd(symmetric=False)
-        self.rsspro.handle_rss_distribute_cases(cases_info=mac_ipv6_udp_esp)
-
-    def test_mac_ipv4_ah(self):
-        self.switch_testpmd(symmetric=False)
-        self.rsspro.handle_rss_distribute_cases(cases_info=mac_ipv4_ah)
-
-    def test_mac_ipv6_ah(self):
-        self.switch_testpmd(symmetric=False)
-        self.rsspro.handle_rss_distribute_cases(cases_info=mac_ipv6_ah)
-
     def test_mac_pppoe_pay(self):
         self.switch_testpmd(symmetric=False)
         self.rsspro.handle_rss_distribute_cases(cases_info=mac_pppoe_pay)
@@ -5423,6 +4592,10 @@ class Advanced_rss_pppoe_vlan_ah_l2tp_pfcp(TestCase):
         self.switch_testpmd(symmetric=False)
         self.rsspro.handle_rss_distribute_cases(cases_info=mac_pppoe_ipv6_tcp_pay)
 
+    def test_mac_vlan_pppoe_pay(self):
+        self.switch_testpmd(symmetric=False)
+        self.rsspro.handle_rss_distribute_cases(cases_info=mac_vlan_pppoe_pay)
+
     def test_mac_pppoe_ipv4_pay_symmetric(self):
         self.switch_testpmd(symmetric=True)
         self.rsspro.handle_rss_distribute_cases(cases_info=mac_pppoe_ipv4_pay_symmetric)
@@ -5579,89 +4752,3 @@ class Advanced_rss_pppoe_vlan_ah_l2tp_pfcp(TestCase):
         ]
         self._two_rules_operation(rule_list, pkt_list, action_list2=['check_no_hash'])
 
-    def test_wrong_hash_input_set(self):
-        self.switch_testpmd(symmetric=True)
-        rule_list = [
-            'flow create 0 ingress pattern eth / pppoes / ipv4 / end actions rss types l2-src-only l2-dst-only end key_len 0 queues end / end',
-            'flow create 0 ingress pattern eth / pppoes / ipv4 / udp / end actions rss types ipv4-tcp end key_len 0 queues end / end',
-            'flow create 0 ingress pattern eth / pppoes / ipv4 / udp / end actions rss func symmetric_toeplitz types ipv4-udp l3-src-only end key_len 0 queues end / end']
-
-        for rule in rule_list:
-            self.rsspro.validate_rule(rule, check_stats=False, check_msg='Invalid argument')
-            self.rsspro.create_rule(rule, check_stats=False, msg='Invalid argument')
-
-    def test_void_action(self):
-        self.switch_testpmd(symmetric=True)
-        rule = 'flow create 0 ingress pattern eth / ipv4 / udp / pfcp / end actions end'
-        self.rsspro.validate_rule(rule, check_stats=False, check_msg='Invalid argument')
-        self.rsspro.create_rule(rule, check_stats=False, msg='Invalid argument')
-        self.rsspro.check_rule(stats=False, rule_list=[rule])
-
-    def test_delete_nonexisting_rule(self):
-        self.switch_testpmd(symmetric=True)
-        self.rsspro.check_rule(stats=False)
-        out = self.dut.send_command("flow destroy 0 rule 0", timeout=1)
-        self.verify('error' not in out, 'delete nonexisting rule raise err,expected no err')
-        self.dut.send_command("flow flush 0", timeout=1)
-
-    def test_unsupported_pattern_with_OS_default_package(self):
-        self.replace_package('os_default')
-        self.switch_testpmd(symmetric=True, pkg='os_default')
-        rule_list = [
-            'flow create 0 ingress pattern eth / ipv4 / udp / pfcp / end actions rss types pfcp end key_len 0 queues end / end',
-            'flow create 0 ingress pattern eth / ipv4 / l2tpv3oip / end actions rss types l2tpv3 end key_len 0 queues end / end',
-            'flow create 0 ingress pattern eth / ipv4 / esp / end actions rss types esp end key_len 0 queues end / end',
-            'flow create 0 ingress pattern eth / ipv4 / ah / end actions rss types ah end key_len 0 queues end / end'
-        ]
-        self.rsspro.validate_rule(rule_list, check_stats=False, check_msg='Invalid argument')
-        self.rsspro.create_rule(rule_list, check_stats=False, msg='Invalid argument')
-        self.rsspro.check_rule(stats=False)
-        self.dut.kill_all()
-        self.replace_package('comms')
-        self.launch_testpmd()
-
-    def test_invalid_port(self):
-        self.switch_testpmd(symmetric=True)
-        rule = 'flow create 1 ingress pattern eth / ipv4 / udp / pfcp / end actions rss types pfcp end key_len 0 queues end / end'
-        self.rsspro.create_rule(rule, check_stats=False, msg='No such device')
-        self.rsspro.check_rule(stats=False, rule_list=[rule])
-        pattern = 'Invalid port 1'
-        out = self.dut.send_command("flow list 1", timeout=1)
-        result = re.search(r'%s' % pattern, out)
-        self.verify(result, 'actual result not match expected,expected result is:{}'.format(pattern))
-
-    def test_mac_vlan_ipv4_pay(self):
-        self.switch_testpmd(symmetric=False)
-        self.rsspro.handle_rss_distribute_cases(cases_info=mac_vlan_ipv4_pay)
-
-    def test_mac_vlan_ipv4_udp_pay(self):
-        self.switch_testpmd(symmetric=False)
-        self.rsspro.handle_rss_distribute_cases(cases_info=mac_vlan_ipv4_udp_pay)
-
-    def test_mac_vlan_ipv4_tcp_pay(self):
-        self.switch_testpmd(symmetric=False)
-        self.rsspro.handle_rss_distribute_cases(cases_info=mac_vlan_ipv4_tcp_pay)
-
-    def test_mac_vlan_ipv4_sctp_pay(self):
-        self.switch_testpmd(symmetric=False)
-        self.rsspro.handle_rss_distribute_cases(cases_info=mac_vlan_ipv4_sctp_pay)
-
-    def test_mac_vlan_ipv6_pay(self):
-        self.switch_testpmd(symmetric=False)
-        self.rsspro.handle_rss_distribute_cases(cases_info=mac_vlan_ipv6_pay)
-
-    def test_mac_vlan_ipv6_udp_pay(self):
-        self.switch_testpmd(symmetric=False)
-        self.rsspro.handle_rss_distribute_cases(cases_info=mac_vlan_ipv6_udp_pay)
-
-    def test_mac_vlan_ipv6_tcp_pay(self):
-        self.switch_testpmd(symmetric=False)
-        self.rsspro.handle_rss_distribute_cases(cases_info=mac_vlan_ipv6_tcp_pay)
-
-    def test_mac_vlan_ipv6_sctp_pay(self):
-        self.switch_testpmd(symmetric=False)
-        self.rsspro.handle_rss_distribute_cases(cases_info=mac_vlan_ipv6_sctp_pay)
-
-    def test_mac_vlan_pppoe_pay(self):
-        self.switch_testpmd(symmetric=False)
-        self.rsspro.handle_rss_distribute_cases(cases_info=mac_vlan_pppoe_pay)
