diff --git a/tests/TestSuite_cvl_advanced_rss_gtpu.py b/tests/TestSuite_cvl_advanced_rss_gtpu.py
index 054f1907..c5277678 100755
--- a/tests/TestSuite_cvl_advanced_rss_gtpu.py
+++ b/tests/TestSuite_cvl_advanced_rss_gtpu.py
@@ -43,7 +43,6 @@ mac_ipv4_gtpu_ipv4_basic = {
     'ipv4-frag': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/IP(dst="192.168.0.1",src="192.168.0.2", frag=6)/("X"*480)',
     'ipv4-icmp': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/IP(dst="192.168.0.1",src="192.168.0.2")/ICMP()/("X"*480)',
     'ipv4-udp': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/IP(dst="192.168.0.1",src="192.168.0.2")/UDP()/("X"*480)',
-    'gtpogre-ipv4-nonfrag': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/IP(dst="192.168.0.1",src="192.168.0.2")/("X"*480)',
 }
 
 mac_ipv4_gtpu_ipv4_l3src_changed_pkt = eval(str(mac_ipv4_gtpu_ipv4_basic).replace('192.168.0.2', '192.168.1.2'))
@@ -106,18 +105,6 @@ mac_ipv4_gtpu_ipv4_l3dst_only = {
             'send_packet': mac_ipv4_gtpu_ipv4_l3src_changed_pkt['ipv4-udp'],
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv4_basic['gtpogre-ipv4-nonfrag'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv4_l3dst_changed_pkt['gtpogre-ipv4-nonfrag'],
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv4_l3src_changed_pkt['gtpogre-ipv4-nonfrag'],
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': mac_ipv4_gtpu_ipv4_unmatched_pkt,
             'action': 'check_no_hash',
@@ -130,7 +117,6 @@ mac_ipv4_gtpu_ipv4_l3dst_only = {
                 mac_ipv4_gtpu_ipv4_basic['ipv4-frag'],
                 mac_ipv4_gtpu_ipv4_basic['ipv4-icmp'],
                 mac_ipv4_gtpu_ipv4_basic['ipv4-udp'],
-                mac_ipv4_gtpu_ipv4_basic['gtpogre-ipv4-nonfrag'],
             ],
             'action': 'check_no_hash',
         },
@@ -212,22 +198,6 @@ mac_ipv4_gtpu_ipv4_all = {
             'send_packet': mac_ipv4_gtpu_ipv4_basic['ipv4-udp'].replace('192.168.0.', '192.168.1.'),
             'action': 'check_hash_different',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv4_basic['gtpogre-ipv4-nonfrag'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv4_l3dst_changed_pkt['gtpogre-ipv4-nonfrag'],
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv4_l3src_changed_pkt['gtpogre-ipv4-nonfrag'],
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv4_basic['gtpogre-ipv4-nonfrag'].replace('192.168.0.', '192.168.1.'),
-            'action': 'check_hash_different',
-        },
         {
             'send_packet': mac_ipv4_gtpu_ipv4_unmatched_pkt,
             'action': 'check_no_hash',
@@ -240,7 +210,6 @@ mac_ipv4_gtpu_ipv4_all = {
                 mac_ipv4_gtpu_ipv4_basic['ipv4-frag'],
                 mac_ipv4_gtpu_ipv4_basic['ipv4-icmp'],
                 mac_ipv4_gtpu_ipv4_basic['ipv4-udp'],
-                mac_ipv4_gtpu_ipv4_basic['gtpogre-ipv4-nonfrag'],
             ],
             'action': 'check_no_hash',
         },
@@ -300,18 +269,6 @@ mac_ipv4_gtpu_ipv4_gtpu = {
             'send_packet': mac_ipv4_gtpu_ipv4_basic['ipv4-udp'].replace('192.168.0.', '192.168.1.'),
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv4_basic['gtpogre-ipv4-nonfrag'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv4_basic['gtpogre-ipv4-nonfrag'].replace('teid=0x123456', 'teid=0x12345'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv4_basic['gtpogre-ipv4-nonfrag'].replace('192.168.0.', '192.168.1.'),
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': mac_ipv4_gtpu_ipv4_unmatched_pkt,
             'action': 'check_no_hash',
@@ -324,7 +281,6 @@ mac_ipv4_gtpu_ipv4_gtpu = {
                 mac_ipv4_gtpu_ipv4_basic['ipv4-frag'],
                 mac_ipv4_gtpu_ipv4_basic['ipv4-icmp'],
                 mac_ipv4_gtpu_ipv4_basic['ipv4-udp'],
-                mac_ipv4_gtpu_ipv4_basic['gtpogre-ipv4-nonfrag'],
             ],
             'action': 'check_no_hash',
         },
@@ -363,14 +319,6 @@ mac_ipv4_gtpu_ipv4_symmetric = {
             'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/IP(dst="192.168.0.2",src="192.168.0.1")/ICMP()/("X"*480)',
             'action': 'check_hash_different',
         },
-        {
-            'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/IP(dst="192.168.0.1",src="192.168.0.2")/("X"*480)',
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/IP(dst="192.168.0.2",src="192.168.0.1")/("X"*480)',
-            'action': 'check_hash_different',
-        },
     ],
     'test': [
         {
@@ -397,14 +345,6 @@ mac_ipv4_gtpu_ipv4_symmetric = {
             'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/IP(dst="192.168.0.2",src="192.168.0.1")/ICMP()/("X"*480)',
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/IP(dst="192.168.0.1",src="192.168.0.2")/("X"*480)',
-            'action': {'save_hash': 'gtpogre-ipv4-nonfrag'},
-        },
-        {
-            'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/IP(dst="192.168.0.2",src="192.168.0.1")/("X"*480)',
-            'action': 'check_hash_same',
-        },
         {   # unmatch MAC_IPV4_GTPU_IPV6 nonfrag
             'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/IPv6(dst="ABAB:910B:6666:3457:8295:3333:1800:2929",src="CDCD:910A:2222:5498:8475:1111:3900:2020")/("X"*480)',
             'action': 'save_hash',
@@ -431,14 +371,6 @@ mac_ipv4_gtpu_ipv4_symmetric = {
             'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/IP(dst="192.168.0.2",src="192.168.0.1")/("X"*480)',
             'action': {'check_hash_different': 'nonfrag'},
         },
-        {
-            'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/IP(dst="192.168.0.1",src="192.168.0.2")/("X"*480)',
-            'action': {'save_hash': 'gtpogre-ipv4-nonfrag'},
-        },
-        {
-            'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/IP(dst="192.168.0.2",src="192.168.0.1")/("X"*480)',
-            'action': {'check_hash_different': 'gtpogre-ipv4-nonfrag'},
-        },
         {
             'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/IP(dst="192.168.0.1",src="192.168.0.2", frag=6)/("X"*480)',
             'action': {'save_hash': 'frag'},
@@ -488,22 +420,6 @@ mac_ipv4_gtpu_ipv4_udp_symmetric = {
             'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/IP(dst="192.168.0.2",src="192.168.0.1")/UDP(sport=23, dport=22)/("X"*480)',
             'action': 'check_hash_different',
         },
-        {
-            'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/IP(dst="192.168.0.1",src="192.168.0.2")/UDP(sport=22, dport=23)/("X"*480)',
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/IP(dst="192.168.0.1",src="192.168.0.2")/UDP(sport=23, dport=22)/("X"*480)',
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/IP(dst="192.168.0.2",src="192.168.0.1")/UDP(sport=22, dport=23)/("X"*480)',
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/IP(dst="192.168.0.2",src="192.168.0.1")/UDP(sport=23, dport=22)/("X"*480)',
-            'action': 'check_hash_different',
-        },
     ],
     'test': [
         {
@@ -522,22 +438,6 @@ mac_ipv4_gtpu_ipv4_udp_symmetric = {
             'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/IP(dst="192.168.0.2",src="192.168.0.1")/UDP(sport=23, dport=22)/("X"*480)',
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/IP(dst="192.168.0.1",src="192.168.0.2")/UDP(sport=22, dport=23)/("X"*480)',
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/IP(dst="192.168.0.1",src="192.168.0.2")/UDP(sport=23, dport=22)/("X"*480)',
-            'action': 'check_hash_same',
-        },
-        {
-            'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/IP(dst="192.168.0.2",src="192.168.0.1")/UDP(sport=22, dport=23)/("X"*480)',
-            'action': 'check_hash_same',
-        },
-        {
-            'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/IP(dst="192.168.0.2",src="192.168.0.1")/UDP(sport=23, dport=22)/("X"*480)',
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IP(dst="192.168.0.1",src="192.168.0.2")/UDP(sport=22, dport=23)/("X"*480)',
             'action': 'save_hash',
@@ -641,14 +541,6 @@ mac_ipv4_gtpu_eh_dl_ipv4_symmetric = {
             'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IP(dst="192.168.0.2",src="192.168.0.1")/UDP()/("X"*480)',
             'action': 'check_hash_different',
         },
-        {
-            'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IP(dst="192.168.0.1",src="192.168.0.2")/("X"*480)',
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IP(dst="192.168.0.2",src="192.168.0.1")/("X"*480)',
-            'action': 'check_hash_different',
-        },
     ],
     'test': [
         {
@@ -683,14 +575,6 @@ mac_ipv4_gtpu_eh_dl_ipv4_symmetric = {
             'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IP(dst="192.168.0.2",src="192.168.0.1")/UDP()/("X"*480)',
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IP(dst="192.168.0.1",src="192.168.0.2")/("X"*480)',
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IP(dst="192.168.0.2",src="192.168.0.1")/("X"*480)',
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=1, P=1, QFI=0x34) /IP(dst="192.168.0.1",src="192.168.0.2")/("X"*480)',
             'action': 'save_hash',
@@ -723,14 +607,6 @@ mac_ipv4_gtpu_eh_dl_ipv4_symmetric = {
             'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=1, P=1, QFI=0x34) /IP(dst="192.168.0.2",src="192.168.0.1")/UDP()/("X"*480)',
             'action': 'check_hash_different',
         },
-        {
-            'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=1, P=1, QFI=0x34) /IP(dst="192.168.0.1",src="192.168.0.2")/("X"*480)',
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=1, P=1, QFI=0x34) /IP(dst="192.168.0.2",src="192.168.0.1")/("X"*480)',
-            'action': 'check_hash_different',
-        },
     ],
     'post-test': [
         {
@@ -765,14 +641,6 @@ mac_ipv4_gtpu_eh_dl_ipv4_symmetric = {
             'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IP(dst="192.168.0.2",src="192.168.0.1")/UDP()/("X"*480)',
             'action': 'check_hash_different',
         },
-        {
-            'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IP(dst="192.168.0.1",src="192.168.0.2")/("X"*480)',
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IP(dst="192.168.0.2",src="192.168.0.1")/("X"*480)',
-            'action': 'check_hash_different',
-        },
     ],
 }
 mac_ipv4_gtpu_eh_ul_ipv4_symmetric = eval(str(mac_ipv4_gtpu_eh_dl_ipv4_symmetric)
@@ -806,22 +674,6 @@ mac_ipv4_gtpu_eh_dl_ipv4_udp_symmetric = {
             'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IP(dst="192.168.0.2",src="192.168.0.1")/UDP(sport=23, dport=22)/("X"*480)',
             'action': 'check_hash_different',
         },
-        {
-            'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IP(dst="192.168.0.1",src="192.168.0.2")/UDP(sport=22, dport=23)/("X"*480)',
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IP(dst="192.168.0.1",src="192.168.0.2")/UDP(sport=23, dport=22)/("X"*480)',
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IP(dst="192.168.0.2",src="192.168.0.1")/UDP(sport=22, dport=23)/("X"*480)',
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IP(dst="192.168.0.2",src="192.168.0.1")/UDP(sport=23, dport=22)/("X"*480)',
-            'action': 'check_hash_different',
-        },
     ],
     'test': [
         {
@@ -840,22 +692,6 @@ mac_ipv4_gtpu_eh_dl_ipv4_udp_symmetric = {
             'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IP(dst="192.168.0.2",src="192.168.0.1")/UDP(sport=23, dport=22)/("X"*480)',
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IP(dst="192.168.0.1",src="192.168.0.2")/UDP(sport=22, dport=23)/("X"*480)',
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IP(dst="192.168.0.1",src="192.168.0.2")/UDP(sport=23, dport=22)/("X"*480)',
-            'action': 'check_hash_same',
-        },
-        {
-            'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IP(dst="192.168.0.2",src="192.168.0.1")/UDP(sport=22, dport=23)/("X"*480)',
-            'action': 'check_hash_same',
-        },
-        {
-            'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IP(dst="192.168.0.2",src="192.168.0.1")/UDP(sport=23, dport=22)/("X"*480)',
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=1, P=1, QFI=0x34) /IP(dst="192.168.0.1",src="192.168.0.2")/UDP(sport=22, dport=23)/("X"*480)',
             'action': 'save_hash',
@@ -864,14 +700,6 @@ mac_ipv4_gtpu_eh_dl_ipv4_udp_symmetric = {
             'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=1, P=1, QFI=0x34) /IP(dst="192.168.0.2",src="192.168.0.1")/UDP(sport=22, dport=23)/("X"*480)',
             'action': 'check_hash_different',
         },
-        {
-            'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IP(dst="192.168.0.1",src="192.168.0.2")/TCP(sport=22, dport=23)/("X"*480)',
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IP(dst="192.168.0.2",src="192.168.0.1")/TCP(sport=22, dport=23)/("X"*480)',
-            'action': 'check_hash_different',
-        },
         {
             'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/IP(dst="192.168.0.1",src="192.168.0.2")/UDP(sport=22, dport=23)/("X"*480)',
             'action': 'save_hash',
@@ -944,7 +772,6 @@ mac_ipv4_gtpu_eh_ipv6_tcp_symmetric = eval(str(mac_ipv4_gtpu_eh_ipv4_tcp_symmetr
 
 mac_ipv4_gtpu_ipv4_udp_basic = {
         'ipv4-udp': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/IP(dst="192.168.0.1", src="192.168.0.2")/UDP(sport=22,dport=23)/("X"*480)',
-        'gtpogre-ipv4-udp': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/IP(dst="192.168.0.1", src="192.168.0.2")/UDP(sport=22,dport=23)/("X"*480)',
 }
 
 mac_ipv4_gtpu_ipv4_udp_unmatch = [
@@ -969,18 +796,6 @@ mac_ipv4_gtpu_ipv4_udp_l3dst = {
             'send_packet': mac_ipv4_gtpu_ipv4_udp_basic['ipv4-udp'].replace('192.168.0.2', '192.168.1.2'),
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv4_udp_basic['gtpogre-ipv4-udp'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv4_udp_basic['gtpogre-ipv4-udp'].replace('192.168.0.1', '192.168.1.1'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv4_udp_basic['gtpogre-ipv4-udp'].replace('192.168.0.2', '192.168.1.2'),
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': mac_ipv4_gtpu_ipv4_udp_unmatch,
             'action': 'check_no_hash',
@@ -991,10 +806,6 @@ mac_ipv4_gtpu_ipv4_udp_l3dst = {
             'send_packet': mac_ipv4_gtpu_ipv4_udp_basic['ipv4-udp'],
             'action': 'check_no_hash',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv4_udp_basic['gtpogre-ipv4-udp'],
-            'action': 'check_no_hash',
-        },
     ]
 }
 
@@ -1026,22 +837,6 @@ mac_ipv4_gtpu_ipv4_udp_l3src_l4src = {
             'send_packet': mac_ipv4_gtpu_ipv4_udp_basic['ipv4-udp'].replace('dport=23', 'dport=33').replace('192.168.0.1', '192.168.1.1'),
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv4_udp_basic['gtpogre-ipv4-udp'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv4_udp_basic['gtpogre-ipv4-udp'].replace('192.168.0.2', '192.168.1.2'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv4_udp_basic['gtpogre-ipv4-udp'].replace('sport=22', 'sport=33'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv4_udp_basic['gtpogre-ipv4-udp'].replace('dport=23', 'dport=33').replace('192.168.0.1', '192.168.1.1'),
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': mac_ipv4_gtpu_ipv4_udp_unmatch,
             'action': 'check_no_hash',
@@ -1076,22 +871,6 @@ mac_ipv4_gtpu_ipv4_udp_l3src_l4dst = {
             'send_packet': mac_ipv4_gtpu_ipv4_udp_basic['ipv4-udp'].replace('sport=22', 'sport=32').replace('192.168.0.1', '192.168.1.1'),
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv4_udp_basic['gtpogre-ipv4-udp'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv4_udp_basic['gtpogre-ipv4-udp'].replace('192.168.0.2', '192.168.1.2'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv4_udp_basic['gtpogre-ipv4-udp'].replace('dport=23', 'dport=33'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv4_udp_basic['gtpogre-ipv4-udp'].replace('sport=22', 'sport=32').replace('192.168.0.1', '192.168.1.1'),
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': mac_ipv4_gtpu_ipv4_udp_unmatch,
             'action': 'check_no_hash',
@@ -1126,22 +905,6 @@ mac_ipv4_gtpu_ipv4_udp_l3dst_l4src = {
             'send_packet': mac_ipv4_gtpu_ipv4_udp_basic['ipv4-udp'].replace('dport=23', 'dport=33').replace('192.168.0.2', '192.168.1.2'),
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv4_udp_basic['gtpogre-ipv4-udp'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv4_udp_basic['gtpogre-ipv4-udp'].replace('192.168.0.1', '192.168.1.1'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv4_udp_basic['gtpogre-ipv4-udp'].replace('sport=22', 'sport=33'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv4_udp_basic['gtpogre-ipv4-udp'].replace('dport=23', 'dport=33').replace('192.168.0.2', '192.168.1.2'),
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': mac_ipv4_gtpu_ipv4_udp_unmatch,
             'action': 'check_no_hash',
@@ -1176,22 +939,6 @@ mac_ipv4_gtpu_ipv4_udp_l3dst_l4dst = {
             'send_packet': mac_ipv4_gtpu_ipv4_udp_basic['ipv4-udp'].replace('sport=22', 'sport=32').replace('192.168.0.2', '192.168.1.2'),
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv4_udp_basic['gtpogre-ipv4-udp'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv4_udp_basic['gtpogre-ipv4-udp'].replace('192.168.0.1', '192.168.1.1'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv4_udp_basic['gtpogre-ipv4-udp'].replace('dport=23', 'dport=33'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv4_udp_basic['gtpogre-ipv4-udp'].replace('sport=22', 'sport=32').replace('192.168.0.2', '192.168.1.2'),
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': mac_ipv4_gtpu_ipv4_udp_unmatch,
             'action': 'check_no_hash',
@@ -1222,19 +969,6 @@ mac_ipv4_gtpu_ipv4_udp_l4dst = {
                                                        .replace('192.168.0', '192.168.1'),
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv4_udp_basic['gtpogre-ipv4-udp'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv4_udp_basic['gtpogre-ipv4-udp'].replace('dport=23', 'dport=33'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv4_udp_basic['gtpogre-ipv4-udp'].replace('sport=22', 'sport=32')
-                                                       .replace('192.168.0', '192.168.1'),
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': mac_ipv4_gtpu_ipv4_udp_unmatch,
             'action': 'check_no_hash',
@@ -1245,10 +979,6 @@ mac_ipv4_gtpu_ipv4_udp_l4dst = {
             'send_packet': mac_ipv4_gtpu_ipv4_udp_basic['ipv4-udp'],
             'action': 'check_no_hash',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv4_udp_basic['gtpogre-ipv4-udp'],
-            'action': 'check_no_hash',
-        },
     ]
 }
 mac_ipv4_gtpu_ipv4_udp_l4src = {
@@ -1269,19 +999,6 @@ mac_ipv4_gtpu_ipv4_udp_l4src = {
                                                        .replace('192.168.0', '192.168.1'),
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv4_udp_basic['gtpogre-ipv4-udp'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv4_udp_basic['gtpogre-ipv4-udp'].replace('sport=22', 'sport=32'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv4_udp_basic['gtpogre-ipv4-udp'].replace('dport=23', 'dport=32')
-                                                       .replace('192.168.0', '192.168.1'),
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': mac_ipv4_gtpu_ipv4_udp_unmatch,
             'action': 'check_no_hash',
@@ -1324,30 +1041,6 @@ mac_ipv4_gtpu_ipv4_udp_all = {
             'send_packet': mac_ipv4_gtpu_ipv4_udp_basic['ipv4-udp'].replace('teid=0x123456', 'teid=0x12345'),
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv4_udp_basic['gtpogre-ipv4-udp'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv4_udp_basic['gtpogre-ipv4-udp'].replace('sport=22', 'sport=32'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv4_udp_basic['gtpogre-ipv4-udp'].replace('dport=23', 'dport=33'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv4_udp_basic['gtpogre-ipv4-udp'].replace('192.168.0.1', '192.168.1.1'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv4_udp_basic['gtpogre-ipv4-udp'].replace('192.168.0.2', '192.168.1.2'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv4_udp_basic['gtpogre-ipv4-udp'].replace('teid=0x123456', 'teid=0x12345'),
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': mac_ipv4_gtpu_ipv4_udp_unmatch,
             'action': 'check_no_hash',
@@ -1358,10 +1051,6 @@ mac_ipv4_gtpu_ipv4_udp_all = {
             'send_packet': mac_ipv4_gtpu_ipv4_udp_basic['ipv4-udp'],
             'action': 'check_no_hash',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv4_udp_basic['gtpogre-ipv4-udp'],
-            'action': 'check_no_hash',
-        },
     ]
 }
 
@@ -1384,20 +1073,6 @@ mac_ipv4_gtpu_ipv4_udp_gtpu = {
             'send_packet': mac_ipv4_gtpu_ipv4_udp_basic['ipv4-udp'].replace('teid=0x123456', 'teid=0x12345'),
             'action': 'check_hash_different',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv4_udp_basic['gtpogre-ipv4-udp'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv4_udp_basic['gtpogre-ipv4-udp'].replace('192.168.0', '192.168.1')
-                                                       .replace('sport=22', 'sport=32')
-                                                       .replace('dport=23', 'dport=33'),
-            'action': 'check_hash_same',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv4_udp_basic['gtpogre-ipv4-udp'].replace('teid=0x123456', 'teid=0x12345'),
-            'action': 'check_hash_different',
-        },
         {
             'send_packet': mac_ipv4_gtpu_ipv4_udp_unmatch,
             'action': 'check_no_hash',
@@ -1459,7 +1134,6 @@ mac_ipv4_gtpu_ipv6_basic = {
     'ipv6-frag': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/IPv6(src="ABAB:910B:6666:3457:8295:3333:1800:2929",dst="CDCD:910A:2222:5498:8475:1111:3900:2020")/IPv6ExtHdrFragment()/("X"*480)',
     'ipv6-icmp': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/IPv6(src="ABAB:910B:6666:3457:8295:3333:1800:2929",dst="CDCD:910A:2222:5498:8475:1111:3900:2020")/ICMP()/("X"*480)',
     'ipv6-udp': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/IPv6(src="ABAB:910B:6666:3457:8295:3333:1800:2929",dst="CDCD:910A:2222:5498:8475:1111:3900:2020")/UDP()/("X"*480)',
-    'gtpogre-ipv6-nonfrag': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/IPv6(src="ABAB:910B:6666:3457:8295:3333:1800:2929",dst="CDCD:910A:2222:5498:8475:1111:3900:2020")/("X"*480)',
 }
 
 mac_ipv4_gtpu_ipv6_l3src_changed_pkt = eval(str(mac_ipv4_gtpu_ipv6_basic).replace('ABAB', '1212'))
@@ -1521,18 +1195,6 @@ mac_ipv4_gtpu_ipv6_l3dst_only = {
             'send_packet': mac_ipv4_gtpu_ipv6_l3src_changed_pkt['ipv6-udp'],
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv6_basic['gtpogre-ipv6-nonfrag'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv6_l3dst_changed_pkt['gtpogre-ipv6-nonfrag'],
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv6_l3src_changed_pkt['gtpogre-ipv6-nonfrag'],
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': mac_ipv4_gtpu_ipv6_unmatched_pkt,
             'action': 'check_no_hash',
@@ -1545,7 +1207,6 @@ mac_ipv4_gtpu_ipv6_l3dst_only = {
                 mac_ipv4_gtpu_ipv6_basic['ipv6-frag'],
                 mac_ipv4_gtpu_ipv6_basic['ipv6-icmp'],
                 mac_ipv4_gtpu_ipv6_basic['ipv6-udp'],
-                mac_ipv4_gtpu_ipv6_basic['gtpogre-ipv6-nonfrag'],
             ],
             'action': 'check_no_hash',
         },
@@ -1611,22 +1272,6 @@ mac_ipv4_gtpu_ipv6_all = {
             'send_packet': mac_ipv4_gtpu_ipv6_basic['ipv6-icmp'].replace('ABAB', '1212').replace('CDCD', '3434'),
             'action': 'check_hash_different',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv6_basic['gtpogre-ipv6-nonfrag'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv6_l3dst_changed_pkt['gtpogre-ipv6-nonfrag'],
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv6_l3src_changed_pkt['gtpogre-ipv6-nonfrag'],
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv6_basic['gtpogre-ipv6-nonfrag'].replace('ABAB', '1212').replace('CDCD', '3434'),
-            'action': 'check_hash_different',
-        },
         {
             'send_packet': mac_ipv4_gtpu_ipv6_basic['ipv6-udp'],
             'action': 'save_hash',
@@ -1655,7 +1300,6 @@ mac_ipv4_gtpu_ipv6_all = {
                 mac_ipv4_gtpu_ipv6_basic['ipv6-frag'],
                 mac_ipv4_gtpu_ipv6_basic['ipv6-icmp'],
                 mac_ipv4_gtpu_ipv6_basic['ipv6-udp'],
-                mac_ipv4_gtpu_ipv6_basic['gtpogre-ipv6-nonfrag'],
             ],
             'action': 'check_no_hash',
         },
@@ -1715,18 +1359,6 @@ mac_ipv4_gtpu_ipv6_gtpu = {
             'send_packet': mac_ipv4_gtpu_ipv6_basic['ipv6-udp'].replace('ABAB', '1212').replace('CDCD', '3434'),
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv6_basic['gtpogre-ipv6-nonfrag'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv6_basic['gtpogre-ipv6-nonfrag'].replace('teid=0x123456', 'teid=0x12345'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv6_basic['gtpogre-ipv6-nonfrag'].replace('ABAB', '1212').replace('CDCD', '3434'),
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': mac_ipv4_gtpu_ipv6_unmatched_pkt,
             'action': 'check_no_hash',
@@ -1739,7 +1371,6 @@ mac_ipv4_gtpu_ipv6_gtpu = {
                 mac_ipv4_gtpu_ipv6_basic['ipv6-frag'],
                 mac_ipv4_gtpu_ipv6_basic['ipv6-icmp'],
                 mac_ipv4_gtpu_ipv6_basic['ipv6-udp'],
-                mac_ipv4_gtpu_ipv6_basic['gtpogre-ipv6-nonfrag'],
             ],
             'action': 'check_no_hash',
         },
@@ -1751,7 +1382,6 @@ mac_ipv4_gtpu_ipv6_toeplitz = [mac_ipv4_gtpu_ipv6_l3dst_only, mac_ipv4_gtpu_ipv6
 
 mac_ipv4_gtpu_ipv6_udp_basic = {
         'ipv6-udp': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/IPv6(src="ABAB:910B:6666:3457:8295:3333:1800:2929",dst="CDCD:910A:2222:5498:8475:1111:3900:2020")/UDP(sport=22,dport=23)/("X"*480)',
-        'gtpogre-ipv6-udp': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/IPv6(src="ABAB:910B:6666:3457:8295:3333:1800:2929",dst="CDCD:910A:2222:5498:8475:1111:3900:2020")/UDP(sport=22,dport=23)/("X"*480)',
 }
 mac_ipv4_gtpu_ipv6_udp_unmatch = [
     'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IPv6(src="ABAB:910B:6666:3457:8295:3333:1800:2929",dst="CDCD:910A:2222:5498:8475:1111:3900:2020")/UDP(sport=22, dport=23)/("X"*480)',
@@ -1775,18 +1405,6 @@ mac_ipv4_gtpu_ipv6_udp_l3dst = {
             'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['ipv6-udp'].replace('ABAB', '1212'),
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['gtpogre-ipv6-udp'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['gtpogre-ipv6-udp'].replace('CDCD', '3434'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['gtpogre-ipv6-udp'].replace('ABAB', '1212'),
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': mac_ipv4_gtpu_ipv6_udp_unmatch,
             'action': 'check_no_hash',
@@ -1797,10 +1415,6 @@ mac_ipv4_gtpu_ipv6_udp_l3dst = {
             'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['ipv6-udp'],
             'action': 'check_no_hash',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['gtpogre-ipv6-udp'],
-            'action': 'check_no_hash',
-        },
     ]
 }
 
@@ -1832,22 +1446,6 @@ mac_ipv4_gtpu_ipv6_udp_l3src_l4src = {
             'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['ipv6-udp'].replace('dport=23', 'dport=33').replace('CDCD', '3434'),
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['gtpogre-ipv6-udp'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['gtpogre-ipv6-udp'].replace('ABAB', '1212'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['gtpogre-ipv6-udp'].replace('sport=22', 'sport=33'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['gtpogre-ipv6-udp'].replace('dport=23', 'dport=33').replace('CDCD', '3434'),
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': mac_ipv4_gtpu_ipv6_udp_unmatch,
             'action': 'check_no_hash',
@@ -1858,10 +1456,6 @@ mac_ipv4_gtpu_ipv6_udp_l3src_l4src = {
             'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['ipv6-udp'],
             'action': 'check_no_hash',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['gtpogre-ipv6-udp'],
-            'action': 'check_no_hash',
-        },
     ]
 }
 
@@ -1886,22 +1480,6 @@ mac_ipv4_gtpu_ipv6_udp_l3src_l4dst = {
             'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['ipv6-udp'].replace('sport=22', 'sport=32').replace('CDCD', '3434'),
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['gtpogre-ipv6-udp'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['gtpogre-ipv6-udp'].replace('ABAB', '1212'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['gtpogre-ipv6-udp'].replace('dport=23', 'dport=33'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['gtpogre-ipv6-udp'].replace('sport=22', 'sport=32').replace('CDCD', '3434'),
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': mac_ipv4_gtpu_ipv6_udp_unmatch,
             'action': 'check_no_hash',
@@ -1912,10 +1490,6 @@ mac_ipv4_gtpu_ipv6_udp_l3src_l4dst = {
             'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['ipv6-udp'],
             'action': 'check_no_hash',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['gtpogre-ipv6-udp'],
-            'action': 'check_no_hash',
-        },
     ]
 }
 
@@ -1940,22 +1514,6 @@ mac_ipv4_gtpu_ipv6_udp_l3dst_l4src = {
             'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['ipv6-udp'].replace('dport=23', 'dport=33').replace('ABAB', '1212'),
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['gtpogre-ipv6-udp'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['gtpogre-ipv6-udp'].replace('CDCD', '3434'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['gtpogre-ipv6-udp'].replace('sport=22', 'sport=33'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['gtpogre-ipv6-udp'].replace('dport=23', 'dport=33').replace('ABAB', '1212'),
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': mac_ipv4_gtpu_ipv6_udp_unmatch,
             'action': 'check_no_hash',
@@ -1966,10 +1524,6 @@ mac_ipv4_gtpu_ipv6_udp_l3dst_l4src = {
             'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['ipv6-udp'],
             'action': 'check_no_hash',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['gtpogre-ipv6-udp'],
-            'action': 'check_no_hash',
-        },
     ]
 }
 
@@ -1994,22 +1548,6 @@ mac_ipv4_gtpu_ipv6_udp_l3dst_l4dst = {
             'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['ipv6-udp'].replace('sport=22', 'sport=32').replace('ABAB', '1212'),
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['gtpogre-ipv6-udp'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['gtpogre-ipv6-udp'].replace('CDCD', '3434'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['gtpogre-ipv6-udp'].replace('dport=23', 'dport=33'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['gtpogre-ipv6-udp'].replace('sport=22', 'sport=32').replace('ABAB', '1212'),
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': mac_ipv4_gtpu_ipv6_udp_unmatch,
             'action': 'check_no_hash',
@@ -2020,40 +1558,23 @@ mac_ipv4_gtpu_ipv6_udp_l3dst_l4dst = {
             'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['ipv6-udp'],
             'action': 'check_no_hash',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['gtpogre-ipv6-udp'],
-            'action': 'check_no_hash',
-        },
     ]
 }
 mac_ipv4_gtpu_ipv6_udp_l4dst = {
     'sub_casename': 'mac_ipv4_gtpu_ipv6_udp_l4dst',
     'port_id': 0,
-    'rule': 'flow create 0 ingress pattern eth / ipv4 / udp / gtpu / ipv6 / udp / end actions rss types ipv6-udp l4-dst-only end key_len 0 queues end / end',
-    'test': [
-        {
-            'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['ipv6-udp'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['ipv6-udp'].replace('dport=23', 'dport=33'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['ipv6-udp'].replace('sport=22', 'sport=32')
-                                                       .replace('ABAB', '1212').replace('CDCD', '3434'),
-            'action': 'check_hash_same',
-        },
+    'rule': 'flow create 0 ingress pattern eth / ipv4 / udp / gtpu / ipv6 / udp / end actions rss types ipv6-udp l4-dst-only end key_len 0 queues end / end',
+    'test': [
         {
-            'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['gtpogre-ipv6-udp'],
+            'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['ipv6-udp'],
             'action': 'save_hash',
         },
         {
-            'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['gtpogre-ipv6-udp'].replace('dport=23', 'dport=33'),
+            'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['ipv6-udp'].replace('dport=23', 'dport=33'),
             'action': 'check_hash_different',
         },
         {
-            'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['gtpogre-ipv6-udp'].replace('sport=22', 'sport=32')
+            'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['ipv6-udp'].replace('sport=22', 'sport=32')
                                                        .replace('ABAB', '1212').replace('CDCD', '3434'),
             'action': 'check_hash_same',
         },
@@ -2067,10 +1588,6 @@ mac_ipv4_gtpu_ipv6_udp_l4dst = {
             'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['ipv6-udp'],
             'action': 'check_no_hash',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['gtpogre-ipv6-udp'],
-            'action': 'check_no_hash',
-        },
     ]
 }
 mac_ipv4_gtpu_ipv6_udp_l4src = {
@@ -2091,19 +1608,6 @@ mac_ipv4_gtpu_ipv6_udp_l4src = {
                                                        .replace('ABAB', '1212').replace('CDCD', '3434'),
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['gtpogre-ipv6-udp'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['gtpogre-ipv6-udp'].replace('sport=22', 'sport=32'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['gtpogre-ipv6-udp'].replace('dport=23', 'dport=32')
-                                                       .replace('ABAB', '1212').replace('CDCD', '3434'),
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': mac_ipv4_gtpu_ipv6_udp_unmatch,
             'action': 'check_no_hash',
@@ -2114,10 +1618,6 @@ mac_ipv4_gtpu_ipv6_udp_l4src = {
             'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['ipv6-udp'],
             'action': 'check_no_hash',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['gtpogre-ipv6-udp'],
-            'action': 'check_no_hash',
-        },
     ]
 }
 
@@ -2150,30 +1650,6 @@ mac_ipv4_gtpu_ipv6_udp_all = {
             'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['ipv6-udp'].replace('teid=0x123456', 'teid=0x12345'),
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['gtpogre-ipv6-udp'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['gtpogre-ipv6-udp'].replace('sport=22', 'sport=32'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['gtpogre-ipv6-udp'].replace('dport=23', 'dport=33'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['gtpogre-ipv6-udp'].replace('CDCD', '3434'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['gtpogre-ipv6-udp'].replace('ABAB', '1212'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['gtpogre-ipv6-udp'].replace('teid=0x123456', 'teid=0x12345'),
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': mac_ipv4_gtpu_ipv6_udp_unmatch,
             'action': 'check_no_hash',
@@ -2184,10 +1660,6 @@ mac_ipv4_gtpu_ipv6_udp_all = {
             'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['ipv6-udp'],
             'action': 'check_no_hash',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['gtpogre-ipv6-udp'],
-            'action': 'check_no_hash',
-        },
     ]
 }
 
@@ -2210,20 +1682,6 @@ mac_ipv4_gtpu_ipv6_udp_gtpu = {
             'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['ipv6-udp'].replace('teid=0x123456', 'teid=0x12345'),
             'action': 'check_hash_different',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['gtpogre-ipv6-udp'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['gtpogre-ipv6-udp'].replace('ABAB', '1212').replace('CDCD', '3434')
-                                                       .replace('sport=22', 'sport=32')
-                                                       .replace('dport=23', 'dport=33'),
-            'action': 'check_hash_same',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['gtpogre-ipv6-udp'].replace('teid=0x123456', 'teid=0x12345'),
-            'action': 'check_hash_different',
-        },
         {
             'send_packet': mac_ipv4_gtpu_ipv6_udp_unmatch,
             'action': 'check_no_hash',
@@ -2233,10 +1691,6 @@ mac_ipv4_gtpu_ipv6_udp_gtpu = {
         {
             'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['ipv6-udp'],
             'action': 'check_no_hash',
-        },
-		{
-            'send_packet': mac_ipv4_gtpu_ipv6_udp_basic['gtpogre-ipv6-udp'],
-			'action': 'check_no_hash',
         },
     ]
 }
@@ -2289,7 +1743,6 @@ mac_ipv4_gtpu_eh_dl_ipv4_basic = {
     'ipv4-icmp': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IP(dst="192.168.0.1",src="192.168.0.2")/ICMP()/("X"*480)',
     'ipv4-udp': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IP(dst="192.168.0.1",src="192.168.0.2")/UDP()/("X"*480)',
     'ipv4-tcp': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IP(dst="192.168.0.1",src="192.168.0.2")/TCP()/("X"*480)',
-    'gtpogre-ipv4-nonfrag': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IP(dst="192.168.0.1",src="192.168.0.2")/("X"*480)',
 }
 
 mac_ipv4_gtpu_eh_ipv4_l3src_changed_pkt = eval(str(mac_ipv4_gtpu_eh_dl_ipv4_basic).replace('192.168.0.2', '192.168.1.2'))
@@ -2316,18 +1769,6 @@ mac_ipv4_gtpu_eh_dl_ipv4_l3dst_only = {
             'send_packet': mac_ipv4_gtpu_eh_ipv4_l3src_changed_pkt['ipv4-nonfrag'],
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_basic['gtpogre-ipv4-nonfrag'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_ipv4_l3dst_changed_pkt['gtpogre-ipv4-nonfrag'],
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_ipv4_l3src_changed_pkt['gtpogre-ipv4-nonfrag'],
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_basic['ipv4-frag'],
             'action': 'save_hash',
@@ -2389,7 +1830,6 @@ mac_ipv4_gtpu_eh_dl_ipv4_l3dst_only = {
                 mac_ipv4_gtpu_eh_dl_ipv4_basic['ipv4-icmp'],
                 mac_ipv4_gtpu_eh_dl_ipv4_basic['ipv4-udp'],
                 mac_ipv4_gtpu_eh_dl_ipv4_basic['ipv4-tcp'],
-                mac_ipv4_gtpu_eh_dl_ipv4_basic['gtpogre-ipv4-nonfrag'],
             ],
             'action': 'check_no_hash',
         },
@@ -2427,26 +1867,6 @@ mac_ipv4_gtpu_eh_dl_ipv4_all = {
             'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_basic['ipv4-nonfrag'].replace('0x123456', '0x12345'),
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_basic['gtpogre-ipv4-nonfrag'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_ipv4_l3dst_changed_pkt['gtpogre-ipv4-nonfrag'],
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_ipv4_l3src_changed_pkt['gtpogre-ipv4-nonfrag'],
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_basic['gtpogre-ipv4-nonfrag'].replace('192.168.0.', '192.168.1.'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_basic['gtpogre-ipv4-nonfrag'].replace('0x123456', '0x12345'),
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_basic['ipv4-frag'],
             'action': 'save_hash',
@@ -2540,7 +1960,6 @@ mac_ipv4_gtpu_eh_dl_ipv4_all = {
                 mac_ipv4_gtpu_eh_dl_ipv4_basic['ipv4-icmp'],
                 mac_ipv4_gtpu_eh_dl_ipv4_basic['ipv4-udp'],
                 mac_ipv4_gtpu_eh_dl_ipv4_basic['ipv4-tcp'],
-                mac_ipv4_gtpu_eh_dl_ipv4_basic['gtpogre-ipv4-nonfrag'],
             ],
             'action': 'check_no_hash',
         },
@@ -2564,18 +1983,6 @@ mac_ipv4_gtpu_eh_dl_ipv4_gtpu = {
             'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_basic['ipv4-nonfrag'].replace('192.168.0.', '192.168.1.'),
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_basic['gtpogre-ipv4-nonfrag'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_basic['gtpogre-ipv4-nonfrag'].replace('teid=0x123456', 'teid=0x12345'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_basic['gtpogre-ipv4-nonfrag'].replace('192.168.0.', '192.168.1.'),
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_basic['ipv4-frag'],
             'action': 'save_hash',
@@ -2637,7 +2044,6 @@ mac_ipv4_gtpu_eh_dl_ipv4_gtpu = {
                 mac_ipv4_gtpu_eh_dl_ipv4_basic['ipv4-icmp'],
                 mac_ipv4_gtpu_eh_dl_ipv4_basic['ipv4-udp'],
                 mac_ipv4_gtpu_eh_dl_ipv4_basic['ipv4-tcp'],
-                mac_ipv4_gtpu_eh_dl_ipv4_basic['gtpogre-ipv4-nonfrag'],
             ],
             'action': 'check_no_hash',
         },
@@ -2661,7 +2067,6 @@ mac_ipv4_gtpu_eh_without_ul_dl_ipv4_basic = {
     'ipv4-frag': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IP(dst="192.168.0.1",src="192.168.0.2", frag=6)/("X"*480)',
     'ipv4-icmp': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=1, P=1, QFI=0x34) /IP(dst="192.168.0.1",src="192.168.0.2")/ICMP()/("X"*480)',
     'ipv4-udp': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IP(dst="192.168.0.1",src="192.168.0.2")/UDP()/("X"*480)',
-    'gtpogre-ipv4-nonfrag': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IP(dst="192.168.0.1",src="192.168.0.2")/("X"*480)',
 }
 
 mac_ipv4_gtpu_eh_without_ul_dl_ipv4_l3src_changed_pkt = eval(str(mac_ipv4_gtpu_eh_without_ul_dl_ipv4_basic).replace('192.168.0.2', '192.168.1.2'))
@@ -2689,18 +2094,6 @@ mac_ipv4_gtpu_eh_without_ul_dl_ipv4_l3dst_only = {
             'send_packet': mac_ipv4_gtpu_eh_without_ul_dl_ipv4_l3src_changed_pkt['ipv4-nonfrag'].replace('0x123456', '0x12345'),
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_without_ul_dl_ipv4_basic['gtpogre-ipv4-nonfrag'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_without_ul_dl_ipv4_l3dst_changed_pkt['gtpogre-ipv4-nonfrag'],
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_without_ul_dl_ipv4_l3src_changed_pkt['gtpogre-ipv4-nonfrag'].replace('0x123456', '0x12345'),
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': mac_ipv4_gtpu_eh_without_ul_dl_ipv4_basic['ipv4-nonfrag_ul'],
             'action': 'save_hash',
@@ -2762,7 +2155,6 @@ mac_ipv4_gtpu_eh_without_ul_dl_ipv4_l3dst_only = {
                 mac_ipv4_gtpu_eh_without_ul_dl_ipv4_basic['ipv4-frag'],
                 mac_ipv4_gtpu_eh_without_ul_dl_ipv4_basic['ipv4-icmp'],
                 mac_ipv4_gtpu_eh_without_ul_dl_ipv4_basic['ipv4-udp'],
-                mac_ipv4_gtpu_eh_without_ul_dl_ipv4_basic['gtpogre-ipv4-nonfrag'],
             ],
             'action': 'check_no_hash',
         },
@@ -2801,26 +2193,6 @@ mac_ipv4_gtpu_eh_without_ul_dl_ipv4_all = {
             'send_packet': mac_ipv4_gtpu_eh_without_ul_dl_ipv4_basic['ipv4-nonfrag'].replace('0x123456', '0x12345'),
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_without_ul_dl_ipv4_basic['gtpogre-ipv4-nonfrag'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_without_ul_dl_ipv4_l3dst_changed_pkt['gtpogre-ipv4-nonfrag'],
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_without_ul_dl_ipv4_l3src_changed_pkt['gtpogre-ipv4-nonfrag'],
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_without_ul_dl_ipv4_basic['gtpogre-ipv4-nonfrag'].replace('192.168.0.', '192.168.1.'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_without_ul_dl_ipv4_basic['gtpogre-ipv4-nonfrag'].replace('0x123456', '0x12345'),
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': mac_ipv4_gtpu_eh_without_ul_dl_ipv4_basic['ipv4-nonfrag_ul'],
             'action': 'save_hash',
@@ -2914,7 +2286,6 @@ mac_ipv4_gtpu_eh_without_ul_dl_ipv4_all = {
                 mac_ipv4_gtpu_eh_without_ul_dl_ipv4_basic['ipv4-frag'],
                 mac_ipv4_gtpu_eh_without_ul_dl_ipv4_basic['ipv4-icmp'],
                 mac_ipv4_gtpu_eh_without_ul_dl_ipv4_basic['ipv4-udp'],
-                mac_ipv4_gtpu_eh_without_ul_dl_ipv4_basic['gtpogre-ipv4-nonfrag'],
             ],
             'action': 'check_no_hash',
         },
@@ -2938,18 +2309,6 @@ mac_ipv4_gtpu_eh_without_ul_dl_ipv4_gtpu = {
             'send_packet': mac_ipv4_gtpu_eh_without_ul_dl_ipv4_basic['ipv4-nonfrag'].replace('192.168.0.', '192.168.1.'),
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_without_ul_dl_ipv4_basic['gtpogre-ipv4-nonfrag'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_without_ul_dl_ipv4_basic['gtpogre-ipv4-nonfrag'].replace('0x123456', '0x12345'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_without_ul_dl_ipv4_basic['gtpogre-ipv4-nonfrag'].replace('192.168.0.', '192.168.1.'),
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': mac_ipv4_gtpu_eh_without_ul_dl_ipv4_basic['ipv4-nonfrag_ul'],
             'action': 'save_hash',
@@ -3011,7 +2370,6 @@ mac_ipv4_gtpu_eh_without_ul_dl_ipv4_gtpu = {
                 mac_ipv4_gtpu_eh_without_ul_dl_ipv4_basic['ipv4-frag'],
                 mac_ipv4_gtpu_eh_without_ul_dl_ipv4_basic['ipv4-icmp'],
                 mac_ipv4_gtpu_eh_without_ul_dl_ipv4_basic['ipv4-udp'],
-                mac_ipv4_gtpu_eh_without_ul_dl_ipv4_basic['gtpogre-ipv4-nonfrag'],
             ],
             'action': 'check_no_hash',
         },
@@ -3026,8 +2384,6 @@ mac_ipv4_gtpu_eh_without_ul_dl_ipv4_toeplitz = [mac_ipv4_gtpu_eh_without_ul_dl_i
 mac_ipv4_gtpu_eh_without_ul_dl_ipv4_udp_basic = {
     'dl': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IP(dst="192.168.0.1",src="192.168.0.2")/UDP(sport=22, dport=23)/("X"*480)',
     'ul': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=1, P=1, QFI=0x34) /IP(dst="192.168.0.1",src="192.168.0.2")/UDP(sport=22, dport=23)/("X"*480)',
-    'gtpogre-dl': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IP(dst="192.168.0.1",src="192.168.0.2")/UDP(sport=22, dport=23)/("X"*480)',
-    'gtpogre-ul': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=1, P=1, QFI=0x34) /IP(dst="192.168.0.1",src="192.168.0.2")/UDP(sport=22, dport=23)/("X"*480)',
 }
 
 mac_ipv4_gtpu_eh_without_ul_dl_ipv4_udp_unmatched_pkt = [
@@ -3058,24 +2414,6 @@ mac_ipv4_gtpu_eh_without_ul_dl_ipv4_udp_l3dst_only = {
                                                                               .replace('0x123456', '0x12345'),
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_without_ul_dl_ipv4_udp_basic['gtpogre-dl'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_without_ul_dl_ipv4_udp_basic['gtpogre-ul'],
-            'action': 'check_hash_same',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_without_ul_dl_ipv4_udp_basic['gtpogre-dl'].replace('192.168.0.1', '192.168.1.1'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_without_ul_dl_ipv4_udp_basic['gtpogre-dl'].replace('192.168.0.2', '192.168.1.2')
-                                                                              .replace('sport=22, dport=23', 'sport=32, dport=33')
-                                                                              .replace('0x123456', '0x12345'),
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': mac_ipv4_gtpu_eh_without_ul_dl_ipv4_udp_unmatched_pkt,
             'action': 'check_no_hash',
@@ -3127,30 +2465,6 @@ mac_ipv4_gtpu_eh_without_ul_dl_ipv4_udp_l3src_l4src = {
                 .replace('0x123456', '0x12345'),
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_without_ul_dl_ipv4_udp_basic['gtpogre-dl'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_without_ul_dl_ipv4_udp_basic['gtpogre-ul'].replace('sport=22', 'sport=32'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_without_ul_dl_ipv4_udp_basic['gtpogre-dl'].replace('192.168.0.2', '192.168.1.2'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_without_ul_dl_ipv4_udp_basic['gtpogre-dl'].replace('192.168.0.1', '192.168.1.1')
-                .replace('dport=23', 'dport=33')
-                .replace('0x123456', '0x12345'),
-            'action': 'check_hash_same',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_without_ul_dl_ipv4_udp_basic['gtpogre-ul'].replace('192.168.0.1', '192.168.1.1')
-                .replace('dport=23', 'dport=33')
-                .replace('0x123456', '0x12345'),
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': mac_ipv4_gtpu_eh_without_ul_dl_ipv4_udp_unmatched_pkt,
             'action': 'check_no_hash',
@@ -3211,26 +2525,6 @@ mac_ipv4_gtpu_eh_without_ul_dl_ipv4_udp_l4src_only = {
             .replace('0x123456', '0x12345'),
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_without_ul_dl_ipv4_udp_basic['gtpogre-dl'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_without_ul_dl_ipv4_udp_basic['gtpogre-ul'].replace('sport=22', 'sport=32'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_without_ul_dl_ipv4_udp_basic['gtpogre-dl'].replace('192.168.0', '192.168.1')
-            .replace('dport=23', 'dport=33')
-            .replace('0x123456', '0x12345'),
-            'action': 'check_hash_same',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_without_ul_dl_ipv4_udp_basic['gtpogre-ul'].replace('192.168.0', '192.168.1')
-            .replace('dport=23', 'dport=33')
-            .replace('0x123456', '0x12345'),
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': mac_ipv4_gtpu_eh_without_ul_dl_ipv4_udp_unmatched_pkt,
             'action': 'check_no_hash',
@@ -3282,30 +2576,6 @@ mac_ipv4_gtpu_eh_without_ul_dl_ipv4_udp = {
             'send_packet': mac_ipv4_gtpu_eh_without_ul_dl_ipv4_udp_basic['dl'].replace('0x123456', '0x12345'),
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_without_ul_dl_ipv4_udp_basic['gtpogre-dl'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_without_ul_dl_ipv4_udp_basic['gtpogre-dl'].replace('sport=22', 'sport=32'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_without_ul_dl_ipv4_udp_basic['gtpogre-dl'].replace('dport=23', 'dport=33'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_without_ul_dl_ipv4_udp_basic['gtpogre-dl'].replace('192.168.0.1', '192.168.1.1'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_without_ul_dl_ipv4_udp_basic['gtpogre-dl'].replace('192.168.0.2', '192.168.1.2'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_without_ul_dl_ipv4_udp_basic['gtpogre-dl'].replace('0x123456', '0x12345'),
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': mac_ipv4_gtpu_eh_without_ul_dl_ipv4_udp_unmatched_pkt,
             'action': 'check_no_hash',
@@ -3346,26 +2616,6 @@ mac_ipv4_gtpu_eh_without_ul_dl_ipv4_udp_gtpu = {
             'send_packet': mac_ipv4_gtpu_eh_without_ul_dl_ipv4_udp_basic['dl'].replace('0x123456', '0x12345'),
             'action': 'check_hash_different',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_without_ul_dl_ipv4_udp_basic['gtpogre-dl'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_without_ul_dl_ipv4_udp_basic['gtpogre-dl']
-            .replace('192.168.0.', '192.168.1.')
-            .replace('sport=22, dport=23', 'sport=32, dport=33'),
-            'action': 'check_hash_same',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_without_ul_dl_ipv4_udp_basic['gtpogre-ul']
-            .replace('192.168.0.', '192.168.1.')
-            .replace('sport=22, dport=23', 'sport=32, dport=33'),
-            'action': 'check_hash_same',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_without_ul_dl_ipv4_udp_basic['gtpogre-dl'].replace('0x123456', '0x12345'),
-            'action': 'check_hash_different',
-        },
         {
             'send_packet': mac_ipv4_gtpu_eh_without_ul_dl_ipv4_udp_unmatched_pkt,
             'action': 'check_no_hash',
@@ -3474,7 +2724,6 @@ mac_ipv4_gtpu_eh_without_ul_dl_ipv6_tcp_toeplitz = [eval(str(element).replace('g
 
 mac_ipv4_gtpu_eh_dl_ipv4_udp_basic = {
         'ipv4-udp': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IP(dst="192.168.0.1", src="192.168.0.2")/UDP(sport=22,dport=23)/("X"*480)',
-        'gtpogre-ipv4-udp': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IP(dst="192.168.0.1", src="192.168.0.2")/UDP(sport=22,dport=23)/("X"*480)'
 }
 mac_ipv4_gtpu_eh_dl_ipv4_udp_unmatch = [
     'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=1, P=1, QFI=0x34) /IP(dst="192.168.0.1", src="192.168.0.2")/UDP(sport=22, dport=23)/("X"*480)',
@@ -3497,18 +2746,6 @@ mac_ipv4_gtpu_eh_dl_ipv4_udp_l3dst = {
             'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_basic['ipv4-udp'].replace('192.168.0.2', '192.168.1.2'),
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_basic['gtpogre-ipv4-udp'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_basic['gtpogre-ipv4-udp'].replace('192.168.0.1', '192.168.1.1'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_basic['gtpogre-ipv4-udp'].replace('192.168.0.2', '192.168.1.2'),
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_unmatch,
             'action': 'check_no_hash',
@@ -3550,22 +2787,6 @@ mac_ipv4_gtpu_eh_dl_ipv4_udp_l3src_l4src = {
             'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_basic['ipv4-udp'].replace('dport=23', 'dport=33').replace('192.168.0.1', '192.168.1.1'),
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_basic['gtpogre-ipv4-udp'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_basic['gtpogre-ipv4-udp'].replace('192.168.0.2', '192.168.1.2'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_basic['gtpogre-ipv4-udp'].replace('sport=22', 'sport=33'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_basic['gtpogre-ipv4-udp'].replace('dport=23', 'dport=33').replace('192.168.0.1', '192.168.1.1'),
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_unmatch,
             'action': 'check_no_hash',
@@ -3600,22 +2821,6 @@ mac_ipv4_gtpu_eh_dl_ipv4_udp_l3src_l4dst = {
             'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_basic['ipv4-udp'].replace('sport=22', 'sport=32').replace('192.168.0.1', '192.168.1.1'),
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_basic['gtpogre-ipv4-udp'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_basic['gtpogre-ipv4-udp'].replace('192.168.0.2', '192.168.1.2'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_basic['gtpogre-ipv4-udp'].replace('dport=23', 'dport=33'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_basic['gtpogre-ipv4-udp'].replace('sport=22', 'sport=32').replace('192.168.0.1', '192.168.1.1'),
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_unmatch,
             'action': 'check_no_hash',
@@ -3630,40 +2835,24 @@ mac_ipv4_gtpu_eh_dl_ipv4_udp_l3src_l4dst = {
 }
 
 mac_ipv4_gtpu_eh_dl_ipv4_udp_l3dst_l4src = {
-    'sub_casename': 'mac_ipv4_gtpu_eh_dl_ipv4_udp_l3dst_l4src',
-    'port_id': 0,
-    'rule': 'flow create 0 ingress pattern eth / ipv4 / udp / gtpu / gtp_psc pdu_t is 0 / ipv4 / udp / end actions rss types ipv4-udp l3-dst-only l4-src-only end key_len 0 queues end / end',
-    'test': [
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_basic['ipv4-udp'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_basic['ipv4-udp'].replace('192.168.0.1', '192.168.1.1'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_basic['ipv4-udp'].replace('sport=22', 'sport=32'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_basic['ipv4-udp'].replace('dport=23', 'dport=33').replace('192.168.0.2', '192.168.1.2'),
-            'action': 'check_hash_same',
-        },
+    'sub_casename': 'mac_ipv4_gtpu_eh_dl_ipv4_udp_l3dst_l4src',
+    'port_id': 0,
+    'rule': 'flow create 0 ingress pattern eth / ipv4 / udp / gtpu / gtp_psc pdu_t is 0 / ipv4 / udp / end actions rss types ipv4-udp l3-dst-only l4-src-only end key_len 0 queues end / end',
+    'test': [
         {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_basic['gtpogre-ipv4-udp'],
+            'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_basic['ipv4-udp'],
             'action': 'save_hash',
         },
         {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_basic['gtpogre-ipv4-udp'].replace('192.168.0.1', '192.168.1.1'),
+            'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_basic['ipv4-udp'].replace('192.168.0.1', '192.168.1.1'),
             'action': 'check_hash_different',
         },
         {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_basic['gtpogre-ipv4-udp'].replace('sport=22', 'sport=32'),
+            'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_basic['ipv4-udp'].replace('sport=22', 'sport=32'),
             'action': 'check_hash_different',
         },
         {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_basic['gtpogre-ipv4-udp'].replace('dport=23', 'dport=33').replace('192.168.0.2', '192.168.1.2'),
+            'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_basic['ipv4-udp'].replace('dport=23', 'dport=33').replace('192.168.0.2', '192.168.1.2'),
             'action': 'check_hash_same',
         },
         {
@@ -3701,23 +2890,6 @@ mac_ipv4_gtpu_eh_dl_ipv4_udp_l3dst_l4dst = {
                                                                          .replace('192.168.0.2', '192.168.1.2'),
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_basic['gtpogre-ipv4-udp'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_basic['gtpogre-ipv4-udp'].replace('192.168.0.1', '192.168.1.1'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_basic['gtpogre-ipv4-udp'].replace('dport=23', 'dport=33'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_basic['gtpogre-ipv4-udp'].replace('sport=22', 'sport=32')
-                                                                                 .replace('192.168.0.2', '192.168.1.2'),
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_unmatch,
             'action': 'check_no_hash',
@@ -3748,19 +2920,6 @@ mac_ipv4_gtpu_eh_dl_ipv4_udp_l4dst = {
                                                                          .replace('192.168.0', '192.168.1'),
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_basic['gtpogre-ipv4-udp'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_basic['gtpogre-ipv4-udp'].replace('dport=23', 'dport=33'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_basic['gtpogre-ipv4-udp'].replace('sport=22', 'sport=32')
-                                                                                 .replace('192.168.0', '192.168.1'),
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_unmatch,
             'action': 'check_no_hash',
@@ -3791,19 +2950,6 @@ mac_ipv4_gtpu_eh_dl_ipv4_udp_l4src = {
                                                                          .replace('192.168.0', '192.168.1'),
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_basic['gtpogre-ipv4-udp'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_basic['gtpogre-ipv4-udp'].replace('sport=22', 'sport=32'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_basic['gtpogre-ipv4-udp'].replace('dport=23', 'dport=32')
-                                                                         .replace('192.168.0', '192.168.1'),
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_unmatch,
             'action': 'check_no_hash',
@@ -3846,30 +2992,6 @@ mac_ipv4_gtpu_eh_dl_ipv4_udp_all = {
             'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_basic['ipv4-udp'].replace('teid=0x123456', 'teid=0x12345'),
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_basic['gtpogre-ipv4-udp'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_basic['gtpogre-ipv4-udp'].replace('sport=22', 'sport=32'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_basic['gtpogre-ipv4-udp'].replace('dport=23', 'dport=33'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_basic['gtpogre-ipv4-udp'].replace('192.168.0.1', '192.168.1.1'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_basic['gtpogre-ipv4-udp'].replace('192.168.0.2', '192.168.1.2'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_basic['gtpogre-ipv4-udp'].replace('teid=0x123456', 'teid=0x12345'),
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_unmatch,
             'action': 'check_no_hash',
@@ -3902,20 +3024,6 @@ mac_ipv4_gtpu_eh_dl_ipv4_udp_gtpu = {
             'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_basic['ipv4-udp'].replace('teid=0x123456', 'teid=0x12345'),
             'action': 'check_hash_different',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_basic['gtpogre-ipv4-udp'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_basic['gtpogre-ipv4-udp'].replace('192.168.0', '192.168.1')
-                                                                                 .replace('sport=22', 'sport=32')
-                                                                                 .replace('dport=23', 'dport=33'),
-            'action': 'check_hash_same',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_basic['gtpogre-ipv4-udp'].replace('teid=0x123456', 'teid=0x12345'),
-            'action': 'check_hash_different',
-        },
         {
             'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_unmatch,
             'action': 'check_no_hash',
@@ -3985,7 +3093,6 @@ mac_ipv4_gtpu_eh_dl_ipv6_basic = {
     'ipv6-icmp': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IPv6(src="ABAB:910B:6666:3457:8295:3333:1800:2929",dst="CDCD:910A:2222:5498:8475:1111:3900:2020")/ICMP()/("X"*480)',
     'ipv6-udp': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IPv6(src="ABAB:910B:6666:3457:8295:3333:1800:2929",dst="CDCD:910A:2222:5498:8475:1111:3900:2020")/UDP()/("X"*480)',
     'ipv6-tcp': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IPv6(src="ABAB:910B:6666:3457:8295:3333:1800:2929",dst="CDCD:910A:2222:5498:8475:1111:3900:2020")/TCP()/("X"*480)',
-    'gtpogre-ipv6-nonfrag': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IPv6(src="ABAB:910B:6666:3457:8295:3333:1800:2929",dst="CDCD:910A:2222:5498:8475:1111:3900:2020")/("X"*480)',
 }
 
 mac_ipv4_gtpu_eh_dl_ipv6_l3src_changed_pkt = eval(str(mac_ipv4_gtpu_eh_dl_ipv6_basic).replace('ABAB', '1212'))
@@ -4011,18 +3118,6 @@ mac_ipv4_gtpu_eh_dl_ipv6_l3dst_only = {
             'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_l3src_changed_pkt['ipv6-nonfrag'],
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_basic['gtpogre-ipv6-nonfrag'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_l3dst_changed_pkt['gtpogre-ipv6-nonfrag'],
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_l3src_changed_pkt['gtpogre-ipv6-nonfrag'],
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_basic['ipv6-frag'],
             'action': 'save_hash',
@@ -4084,7 +3179,6 @@ mac_ipv4_gtpu_eh_dl_ipv6_l3dst_only = {
                 mac_ipv4_gtpu_eh_dl_ipv6_basic['ipv6-icmp'],
                 mac_ipv4_gtpu_eh_dl_ipv6_basic['ipv6-udp'],
                 mac_ipv4_gtpu_eh_dl_ipv6_basic['ipv6-tcp'],
-                mac_ipv4_gtpu_eh_dl_ipv6_basic['gtpogre-ipv6-nonfrag'],
             ],
             'action': 'check_no_hash',
         },
@@ -4122,26 +3216,6 @@ mac_ipv4_gtpu_eh_dl_ipv6_all = {
             'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_basic['ipv6-nonfrag'].replace('0x123456', '0x12345'),
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_basic['gtpogre-ipv6-nonfrag'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_l3dst_changed_pkt['gtpogre-ipv6-nonfrag'],
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_l3src_changed_pkt['gtpogre-ipv6-nonfrag'],
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_basic['gtpogre-ipv6-nonfrag'].replace('ABAB', '1212').replace('CDCD', '3434'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_basic['gtpogre-ipv6-nonfrag'].replace('0x123456', '0x12345'),
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_basic['ipv6-frag'],
             'action': 'save_hash',
@@ -4235,7 +3309,6 @@ mac_ipv4_gtpu_eh_dl_ipv6_all = {
                 mac_ipv4_gtpu_eh_dl_ipv6_basic['ipv6-icmp'],
                 mac_ipv4_gtpu_eh_dl_ipv6_basic['ipv6-udp'],
                 mac_ipv4_gtpu_eh_dl_ipv6_basic['ipv6-tcp'],
-                mac_ipv4_gtpu_eh_dl_ipv6_basic['gtpogre-ipv6-nonfrag'],
             ],
             'action': 'check_no_hash',
         },
@@ -4259,18 +3332,6 @@ mac_ipv4_gtpu_eh_dl_ipv6_gtpu = {
             'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_basic['ipv6-nonfrag'].replace('ABAB', '1212').replace('CDCD', '3434'),
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_basic['gtpogre-ipv6-nonfrag'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_basic['gtpogre-ipv6-nonfrag'].replace('teid=0x123456', 'teid=0x12345'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_basic['gtpogre-ipv6-nonfrag'].replace('ABAB', '1212').replace('CDCD', '3434'),
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_basic['ipv6-frag'],
             'action': 'save_hash',
@@ -4332,7 +3393,6 @@ mac_ipv4_gtpu_eh_dl_ipv6_gtpu = {
                 mac_ipv4_gtpu_eh_dl_ipv6_basic['ipv6-icmp'],
                 mac_ipv4_gtpu_eh_dl_ipv6_basic['ipv6-udp'],
                 mac_ipv4_gtpu_eh_dl_ipv6_basic['ipv6-tcp'],
-                mac_ipv4_gtpu_eh_dl_ipv6_basic['gtpogre-ipv6-nonfrag'],
             ],
             'action': 'check_no_hash',
         },
@@ -4352,7 +3412,6 @@ mac_ipv4_gtpu_eh_ipv6_toeplitz = mac_ipv4_gtpu_eh_dl_ipv6_toeplitz + mac_ipv4_gt
 
 mac_ipv4_gtpu_eh_dl_ipv6_udp_basic = {
         'ipv6-udp': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IPv6(src="ABAB:910B:6666:3457:8295:3333:1800:2929",dst="CDCD:910A:2222:5498:8475:1111:3900:2020")/UDP(sport=22,dport=23)/("X"*480)',
-        'gtpogre-ipv6-udp': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IPv6(src="ABAB:910B:6666:3457:8295:3333:1800:2929",dst="CDCD:910A:2222:5498:8475:1111:3900:2020")/UDP(sport=22,dport=23)/("X"*480)'
 }
 mac_ipv4_gtpu_eh_dl_ipv6_udp_unmatch = [
     'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=1, P=1, QFI=0x34) /IPv6(src="ABAB:910B:6666:3457:8295:3333:1800:2929",dst="CDCD:910A:2222:5498:8475:1111:3900:2020")/UDP(sport=22, dport=23)/("X"*480)',
@@ -4375,18 +3434,6 @@ mac_ipv4_gtpu_eh_dl_ipv6_udp_l3dst = {
             'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_udp_basic['ipv6-udp'].replace('ABAB', '1212'),
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_udp_basic['gtpogre-ipv6-udp'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_udp_basic['gtpogre-ipv6-udp'].replace('CDCD', '3434'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_udp_basic['gtpogre-ipv6-udp'].replace('ABAB', '1212'),
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_udp_unmatch,
             'action': 'check_no_hash',
@@ -4428,22 +3475,6 @@ mac_ipv4_gtpu_eh_dl_ipv6_udp_l3src_l4src = {
             'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_udp_basic['ipv6-udp'].replace('dport=23', 'dport=33').replace('CDCD', '3434'),
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_udp_basic['gtpogre-ipv6-udp'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_udp_basic['gtpogre-ipv6-udp'].replace('ABAB', '1212'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_udp_basic['gtpogre-ipv6-udp'].replace('sport=22', 'sport=33'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_udp_basic['gtpogre-ipv6-udp'].replace('dport=23', 'dport=33').replace('CDCD', '3434'),
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_udp_unmatch,
             'action': 'check_no_hash',
@@ -4478,22 +3509,6 @@ mac_ipv4_gtpu_eh_dl_ipv6_udp_l3src_l4dst = {
             'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_udp_basic['ipv6-udp'].replace('sport=22', 'sport=32').replace('CDCD', '3434'),
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_udp_basic['gtpogre-ipv6-udp'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_udp_basic['gtpogre-ipv6-udp'].replace('ABAB', '1212'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_udp_basic['gtpogre-ipv6-udp'].replace('dport=23', 'dport=33'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_udp_basic['gtpogre-ipv6-udp'].replace('sport=22', 'sport=32').replace('CDCD', '3434'),
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_udp_unmatch,
             'action': 'check_no_hash',
@@ -4528,22 +3543,6 @@ mac_ipv4_gtpu_eh_dl_ipv6_udp_l3dst_l4src = {
             'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_udp_basic['ipv6-udp'].replace('dport=23', 'dport=33').replace('ABAB', '1212'),
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_udp_basic['gtpogre-ipv6-udp'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_udp_basic['gtpogre-ipv6-udp'].replace('CDCD', '3434'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_udp_basic['gtpogre-ipv6-udp'].replace('sport=22', 'sport=33'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_udp_basic['gtpogre-ipv6-udp'].replace('dport=23', 'dport=33').replace('ABAB', '1212'),
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_udp_unmatch,
             'action': 'check_no_hash',
@@ -4578,22 +3577,6 @@ mac_ipv4_gtpu_eh_dl_ipv6_udp_l3dst_l4dst = {
             'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_udp_basic['ipv6-udp'].replace('sport=22', 'sport=32').replace('ABAB', '1212'),
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_udp_basic['gtpogre-ipv6-udp'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_udp_basic['gtpogre-ipv6-udp'].replace('CDCD', '3434'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_udp_basic['gtpogre-ipv6-udp'].replace('dport=23', 'dport=33'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_udp_basic['gtpogre-ipv6-udp'].replace('sport=22', 'sport=32').replace('ABAB', '1212'),
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_udp_unmatch,
             'action': 'check_no_hash',
@@ -4624,19 +3607,6 @@ mac_ipv4_gtpu_eh_dl_ipv6_udp_l4dst = {
                                                        .replace('ABAB', '1212').replace('CDCD', '3434'),
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_udp_basic['gtpogre-ipv6-udp'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_udp_basic['gtpogre-ipv6-udp'].replace('dport=23', 'dport=33'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_udp_basic['gtpogre-ipv6-udp'].replace('sport=22', 'sport=32')
-                                                       .replace('ABAB', '1212').replace('CDCD', '3434'),
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_udp_unmatch,
             'action': 'check_no_hash',
@@ -4667,19 +3637,6 @@ mac_ipv4_gtpu_eh_dl_ipv6_udp_l4src = {
                                                        .replace('ABAB', '1212').replace('CDCD', '3434'),
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_udp_basic['gtpogre-ipv6-udp'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_udp_basic['gtpogre-ipv6-udp'].replace('sport=22', 'sport=32'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_udp_basic['gtpogre-ipv6-udp'].replace('dport=23', 'dport=32')
-                                                       .replace('ABAB', '1212').replace('CDCD', '3434'),
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_udp_unmatch,
             'action': 'check_no_hash',
@@ -4722,30 +3679,6 @@ mac_ipv4_gtpu_eh_dl_ipv6_udp_all = {
             'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_udp_basic['ipv6-udp'].replace('teid=0x123456', 'teid=0x12345'),
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_udp_basic['gtpogre-ipv6-udp'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_udp_basic['gtpogre-ipv6-udp'].replace('sport=22', 'sport=32'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_udp_basic['gtpogre-ipv6-udp'].replace('dport=23', 'dport=33'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_udp_basic['gtpogre-ipv6-udp'].replace('CDCD', '3434'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_udp_basic['gtpogre-ipv6-udp'].replace('ABAB', '1212'),
-            'action': 'check_hash_different',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_udp_basic['gtpogre-ipv6-udp'].replace('teid=0x123456', 'teid=0x12345'),
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_udp_unmatch,
             'action': 'check_no_hash',
@@ -4778,20 +3711,6 @@ mac_ipv4_gtpu_eh_dl_ipv6_udp_gtpu = {
             'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_udp_basic['ipv6-udp'].replace('teid=0x123456', 'teid=0x12345'),
             'action': 'check_hash_different',
         },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_udp_basic['gtpogre-ipv6-udp'],
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_udp_basic['gtpogre-ipv6-udp'].replace('ABAB', '1212').replace('CDCD', '3434')
-                                                       .replace('sport=22', 'sport=32')
-                                                       .replace('dport=23', 'dport=33'),
-            'action': 'check_hash_same',
-        },
-        {
-            'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_udp_basic['gtpogre-ipv6-udp'].replace('teid=0x123456', 'teid=0x12345'),
-            'action': 'check_hash_different',
-        },
         {
             'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_udp_unmatch,
             'action': 'check_no_hash',
@@ -5061,14 +3980,6 @@ inner_l4_mac_ipv4_gtpu_ipv4_udp_tcp = {
             'send_packet': 'Ether(dst="68:05:ca:a3:28:94")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/IP(dst="192.168.0.1",src="192.168.0.2")/UDP(sport=22,dport=23)/("X"*480)',
             'action': 'check_hash_different',
         },
-        {
-            'send_packet': 'Ether(dst="68:05:ca:a3:28:94")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/IP(dst="192.168.0.1",src="192.168.0.2")/TCP(sport=22,dport=23)/("X"*480)',
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': 'Ether(dst="68:05:ca:a3:28:94")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/IP(dst="192.168.0.1",src="192.168.0.2")/UDP(sport=22,dport=23)/("X"*480)',
-            'action': 'check_hash_different',
-        },
     ],
     'post-test': [
         {
@@ -5086,8 +3997,7 @@ inner_l4_mac_ipv6_gtpu_ipv4_udp_tcp = eval(str(inner_l4_mac_ipv4_gtpu_ipv4_udp_t
                                            .replace('gtpu / ipv4', 'gtpu / gtp_psc / ipv4')
                                            .replace('IP()', 'IPv6()')
                                            .replace('teid=0x123456)', 'teid=0x123456)/GTPPDUSessionContainer(type=1, P=1, QFI=0x34) ')
-                                           .replace('mac_ipv4', 'mac_ipv6')
-                                           .replace('IP(proto=0x2F)/GRE(proto=0x0800', 'IPv6(nh=0x2F)/GRE(proto=0x86DD'))
+                                           .replace('mac_ipv4', 'mac_ipv6'))
 inner_l4_mac_ipv4_gtpu_eh_ipv6_udp_tcp = {
     'sub_casename': 'mac_ipv4_gtpu_eh_ipv6_udp_tcp',
     'port_id': 0,
@@ -5104,14 +4014,6 @@ inner_l4_mac_ipv4_gtpu_eh_ipv6_udp_tcp = {
             'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IPv6(src="ABAB:910B:6666:3457:8295:3333:1800:2929",dst="CDCD:910A:2222:5498:8475:1111:3900:2020")/TCP(sport=22,dport=23)/("X"*480)',
             'action': 'check_hash_different',
         },
-        {
-            'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IPv6(src="ABAB:910B:6666:3457:8295:3333:1800:2929",dst="CDCD:910A:2222:5498:8475:1111:3900:2020")/UDP(sport=22,dport=23)/("X"*480)',
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IPv6(src="ABAB:910B:6666:3457:8295:3333:1800:2929",dst="CDCD:910A:2222:5498:8475:1111:3900:2020")/TCP(sport=22,dport=23)/("X"*480)',
-            'action': 'check_hash_different',
-        },
     ],
     'post-test': [
         {
@@ -5130,7 +4032,6 @@ inner_l4_mac_ipv6_gtpu_eh_ipv6_udp_tcp = eval(str(inner_l4_mac_ipv4_gtpu_eh_ipv6
                                               .replace('(type=0', '(type=1')
                                               .replace('IP()', 'IPv6()')
                                               .replace('mac_ipv4', 'mac_ipv6')
-                                              .replace('IP(proto=0x2F)/GRE(proto=0x0800', 'IPv6(nh=0x2F)/GRE(proto=0x86DD')
                                               .replace('GTP_PDUSession_ExtensionHeader(pdu_type=0', 'GTP_PDUSession_ExtensionHeader(pdu_type=1'))
 inner_l4_protocal_hash = [inner_l4_mac_ipv4_gtpu_ipv4_udp_tcp, inner_l4_mac_ipv6_gtpu_ipv4_udp_tcp,
                           inner_l4_mac_ipv4_gtpu_eh_ipv6_udp_tcp, inner_l4_mac_ipv6_gtpu_eh_ipv6_udp_tcp]
@@ -5164,14 +4065,6 @@ mac_ipv4_gtpu_eh_ipv4_without_ul_dl_symmetric = {
             'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IP(dst="192.168.0.2",src="192.168.0.1")/ICMP()/("X"*480)',
             'action': 'check_hash_different',
         },
-        {
-            'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IP(dst="192.168.0.1",src="192.168.0.2")/("X"*480)',
-            'action': 'save_hash',
-        },
-        {
-            'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IP(dst="192.168.0.2",src="192.168.0.1")/("X"*480)',
-            'action': 'check_hash_different',
-        },
     ],
     'test': [
         {
@@ -5198,14 +4091,6 @@ mac_ipv4_gtpu_eh_ipv4_without_ul_dl_symmetric = {
             'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IP(dst="192.168.0.2",src="192.168.0.1")/ICMP()/("X"*480)',
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IP(dst="192.168.0.1",src="192.168.0.2")/("X"*480)',
-            'action': {'save_hash': 'gtpogre-ipv4-nonfrag'},
-        },
-        {
-            'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IP(dst="192.168.0.2",src="192.168.0.1")/("X"*480)',
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=1, P=1, QFI=0x34) /IPv6(dst="ABAB:910B:6666:3457:8295:3333:1800:2929",src="CDCD:910A:2222:5498:8475:1111:3900:2020")/("X"*480)',
             'action': 'save_hash',
@@ -5247,14 +4132,6 @@ mac_ipv4_gtpu_eh_ipv4_without_ul_dl_symmetric = {
         {
             'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IP(dst="192.168.0.2",src="192.168.0.1")/ICMP()/("X"*480)',
             'action': 'check_hash_different',
-        },
-		{
-            'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IP(dst="192.168.0.1",src="192.168.0.2")/("X"*480)',
-            'action': 'save_hash',
-        },
-		{
-            'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IP(dst="192.168.0.2",src="192.168.0.1")/("X"*480)',
-            'action': 'check_hash_different',
         },
     ],
 }
@@ -5291,10 +4168,6 @@ mac_ipv4_gtpu_eh_ipv4_udp_without_ul_dl_symmetric = {
             'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IP(dst="192.168.0.2",src="192.168.0.1")/UDP(sport=23, dport=22)/("X"*480)',
             'action': 'check_hash_different',
         },
-        {
-            'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IP(dst="192.168.0.2",src="192.168.0.1")/UDP(sport=23, dport=22)/("X"*480)',
-            'action': 'check_hash_different',
-        },
         {
             'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=1, P=1, QFI=0x34) /IP(dst="192.168.0.1",src="192.168.0.2")/UDP(sport=22, dport=23)/("X"*480)',
             'action': {'save_hash', 'udp-ul'},
@@ -5311,10 +4184,6 @@ mac_ipv4_gtpu_eh_ipv4_udp_without_ul_dl_symmetric = {
             'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=1, P=1, QFI=0x34) /IP(dst="192.168.0.2",src="192.168.0.1")/UDP(sport=23, dport=22)/("X"*480)',
             'action': 'check_hash_different',
         },
-        {
-            'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=1, P=1, QFI=0x34) /IP(dst="192.168.0.2",src="192.168.0.1")/UDP(sport=23, dport=22)/("X"*480)',
-            'action': 'check_hash_different',
-        },
     ],
     'test': [
         {
@@ -5333,10 +4202,6 @@ mac_ipv4_gtpu_eh_ipv4_udp_without_ul_dl_symmetric = {
             'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IP(dst="192.168.0.2",src="192.168.0.1")/UDP(sport=23, dport=22)/("X"*480)',
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IP(dst="192.168.0.2",src="192.168.0.1")/UDP(sport=23, dport=22)/("X"*480)',
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=1, P=1, QFI=0x34) /IP(dst="192.168.0.1",src="192.168.0.2")/UDP(sport=22, dport=23)/("X"*480)',
             'action': 'save_hash',
@@ -5353,10 +4218,6 @@ mac_ipv4_gtpu_eh_ipv4_udp_without_ul_dl_symmetric = {
             'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=1, P=1, QFI=0x34) /IP(dst="192.168.0.2",src="192.168.0.1")/UDP(sport=23, dport=22)/("X"*480)',
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=1, P=1, QFI=0x34) /IP(dst="192.168.0.2",src="192.168.0.1")/UDP(sport=23, dport=22)/("X"*480)',
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IP(dst="192.168.0.1",src="192.168.0.2")/TCP(sport=22, dport=23)/("X"*480)',
             'action': 'save_hash',
@@ -5432,10 +4293,6 @@ mac_ipv4_gtpu_eh_ipv4_tcp_without_ul_dl_symmetric = {
             'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IP(dst="192.168.0.2",src="192.168.0.1")/TCP(sport=23, dport=22)/("X"*480)',
             'action': 'check_hash_different',
         },
-        {
-            'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IP(dst="192.168.0.1",src="192.168.0.2")/TCP(sport=23, dport=22)/("X"*480)',
-            'action': 'check_hash_different',
-        },
         {
             'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=1, P=1, QFI=0x34) /IP(dst="192.168.0.1",src="192.168.0.2")/TCP(sport=22, dport=23)/("X"*480)',
             'action': {'save_hash', 'udp-ul'},
@@ -5452,10 +4309,6 @@ mac_ipv4_gtpu_eh_ipv4_tcp_without_ul_dl_symmetric = {
             'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=1, P=1, QFI=0x34) /IP(dst="192.168.0.2",src="192.168.0.1")/TCP(sport=23, dport=22)/("X"*480)',
             'action': 'check_hash_different',
         },
-        {
-            'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=1, P=1, QFI=0x34) /IP(dst="192.168.0.2",src="192.168.0.1")/TCP(sport=22, dport=23)/("X"*480)',
-            'action': 'check_hash_different',
-        },
     ],
     'test': [
         {
@@ -5474,10 +4327,6 @@ mac_ipv4_gtpu_eh_ipv4_tcp_without_ul_dl_symmetric = {
             'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IP(dst="192.168.0.2",src="192.168.0.1")/TCP(sport=23, dport=22)/("X"*480)',
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IP(dst="192.168.0.1",src="192.168.0.2")/TCP(sport=23, dport=22)/("X"*480)',
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=1, P=1, QFI=0x34) /IP(dst="192.168.0.1",src="192.168.0.2")/TCP(sport=22, dport=23)/("X"*480)',
             'action': 'save_hash',
@@ -5494,10 +4343,6 @@ mac_ipv4_gtpu_eh_ipv4_tcp_without_ul_dl_symmetric = {
             'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=1, P=1, QFI=0x34) /IP(dst="192.168.0.2",src="192.168.0.1")/TCP(sport=23, dport=22)/("X"*480)',
             'action': 'check_hash_same',
         },
-        {
-            'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=1, P=1, QFI=0x34) /IP(dst="192.168.0.2",src="192.168.0.1")/TCP(sport=22, dport=23)/("X"*480)',
-            'action': 'check_hash_same',
-        },
         {
             'send_packet': 'Ether(dst="68:05:CA:BB:26:E0")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/GTPPDUSessionContainer(type=0, P=1, QFI=0x34) /IP(dst="192.168.0.1",src="192.168.0.2")/UDP(sport=22, dport=23)/("X"*480)',
             'action': 'save_hash',
