From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id CE5B2A034F; Tue, 23 Mar 2021 04:36:12 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C2EED140E23; Tue, 23 Mar 2021 04:36:12 +0100 (CET) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mails.dpdk.org (Postfix) with ESMTP id 720004067E for ; Tue, 23 Mar 2021 04:36:10 +0100 (CET) IronPort-SDR: Fygs3joGYdaFCNazgMpqLNBN0qA5kIC82lankOIUTcWD5It2CzsDLoi5OOw0xfFlM4RZF02wG0 E6wbpfwDYbjA== X-IronPort-AV: E=McAfee;i="6000,8403,9931"; a="177965588" X-IronPort-AV: E=Sophos;i="5.81,270,1610438400"; d="scan'208";a="177965588" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Mar 2021 20:36:03 -0700 IronPort-SDR: dX2Q0E6djtudHD8jWrLjBtWseo8SR8YI5n57ETI4la4mTaJZKy9+U5233/FjkePCsOblN4/YFL ZNeP6ZISIPFQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,270,1610438400"; d="scan'208";a="607570544" Received: from pengyuan-dpdk.sh.intel.com ([10.67.117.236]) by fmsmga005.fm.intel.com with ESMTP; 22 Mar 2021 20:36:01 -0700 From: Peng Yuan To: dts@dpdk.org Cc: Peng Yuan Date: Tue, 23 Mar 2021 11:35:07 +0000 Message-Id: <20210323113507.69505-1-yuan.peng@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [dts] [PATCH v1]tests/cvl_advanced_iavf_rss_gtpu: remove gtpogre from gtpu iavf rss testsuite X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org Sender: "dts" GTPoGRE will have a single TestSuite. So remove GTPoGRE packets check from TestSuite_cvl_advanced_iavf_rss_gtpu.py Signed-off-by: Peng Yuan diff --git a/tests/TestSuite_cvl_advanced_iavf_rss_gtpu.py b/tests/TestSuite_cvl_advanced_iavf_rss_gtpu.py index 6490dcbf..1c6ffabf 100755 --- a/tests/TestSuite_cvl_advanced_iavf_rss_gtpu.py +++ b/tests/TestSuite_cvl_advanced_iavf_rss_gtpu.py @@ -44,7 +44,6 @@ mac_ipv4_gtpu_ipv4_basic = { 'ipv4-icmp': 'Ether(dst="00:11:22:33:44:55")/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-tcp': 'Ether(dst="00:11:22:33:44:55")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/IP(dst="192.168.0.1", src="192.168.0.2")/TCP()/("X"*480)', 'ipv4-udp': 'Ether(dst="00:11:22:33:44:55")/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="00:11:22:33:44:55")/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')) @@ -67,18 +66,6 @@ mac_ipv4_gtpu_ipv4_l3dst_only = { 'send_packet': mac_ipv4_gtpu_ipv4_l3src_changed_pkt['ipv4-nonfrag'], '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_basic['ipv4-frag'], 'action': 'save_hash', @@ -158,22 +145,6 @@ mac_ipv4_gtpu_ipv4_all = { 'send_packet': mac_ipv4_gtpu_ipv4_basic['ipv4-nonfrag'].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_basic['ipv4-frag'], 'action': 'save_hash', @@ -259,18 +230,6 @@ mac_ipv4_gtpu_ipv4_gtpu = { 'send_packet': mac_ipv4_gtpu_ipv4_basic['ipv4-nonfrag'].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_basic['ipv4-frag'], 'action': 'save_hash', @@ -335,14 +294,6 @@ mac_ipv4_gtpu_ipv4_symmetric = { 'send_packet': 'Ether(dst="00:11:22:33:44:55")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/IP(dst="192.168.0.2",src="192.168.0.1", frag=6)/("X"*480)', 'action': 'check_hash_same', }, - { - 'send_packet': 'Ether(dst="00:11:22:33:44:55")/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", frag=6)/("X"*480)', - 'action': {'save_hash': 'ipv4-frag'}, - }, - { - 'send_packet': 'Ether(dst="00:11:22:33:44:55")/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", frag=6)/("X"*480)', - 'action': 'check_hash_same', - }, { 'send_packet': 'Ether(dst="00:11:22:33:44:55")/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)', 'action': {'save_hash': 'ipv4-icmp'}, @@ -369,10 +320,6 @@ mac_ipv4_gtpu_ipv4_symmetric = { 'send_packet': 'Ether(dst="00:11:22:33:44:55")/IP()/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x123456)/IP(dst="192.168.0.2",src="192.168.0.1", frag=6)/("X"*480)', 'action': {'check_no_hash_or_different': 'ipv4-frag'}, }, - { - 'send_packet': 'Ether(dst="00:11:22:33:44:55")/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",frag=6)/("X"*480)', - 'action': {'check_no_hash_or_different': 'ipv4-frag'}, - }, { 'send_packet': 'Ether(dst="00:11:22:33:44:55")/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_no_hash_or_different': 'ipv4-icmp'}, @@ -414,10 +361,6 @@ mac_ipv4_gtpu_ipv4_udp_symmetric = { 'send_packet': 'Ether(dst="00:11:22:33:44:55")/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="00:11:22:33:44:55")/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', - }, ], 'post-test': [ { @@ -432,10 +375,6 @@ mac_ipv4_gtpu_ipv4_udp_symmetric = { 'send_packet': 'Ether(dst="00:11:22:33:44:55")/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_no_hash_or_different', }, - { - 'send_packet': 'Ether(dst="00:11:22:33:44:55")/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_no_hash_or_different', - }, ], } @@ -497,14 +436,6 @@ mac_ipv4_gtpu_eh_dl_ipv4_symmetric = { 'send_packet': 'Ether(dst="00:11:22:33:44:55")/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="00:11:22:33:44:55")/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()/("X"*480)', - 'action': {'save_hash': 'ipv4-udp'}, - }, - { - 'send_packet': 'Ether(dst="00:11:22:33:44:55")/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()/("X"*480)', - 'action': 'check_hash_same', - }, ], 'post-test': [ { @@ -523,10 +454,6 @@ mac_ipv4_gtpu_eh_dl_ipv4_symmetric = { 'send_packet': 'Ether(dst="00:11:22:33:44:55")/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_no_hash_or_different': 'ipv4-udp'}, }, - { - 'send_packet': 'Ether(dst="00:11:22:33:44:55")/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()/("X"*480)', - 'action': {'check_no_hash_or_different': 'ipv4-udp'}, - }, ], } mac_ipv4_gtpu_eh_ul_ipv4_symmetric = eval(str(mac_ipv4_gtpu_eh_dl_ipv4_symmetric) @@ -560,10 +487,6 @@ mac_ipv4_gtpu_eh_dl_ipv4_udp_symmetric = { 'send_packet': 'Ether(dst="00:11:22:33:44:55")/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="00:11:22:33:44:55")/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', - }, ], 'post-test': [ { @@ -578,10 +501,6 @@ mac_ipv4_gtpu_eh_dl_ipv4_udp_symmetric = { 'send_packet': 'Ether(dst="00:11:22:33:44:55")/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_no_hash_or_different', }, - { - 'send_packet': 'Ether(dst="00:11:22:33:44:55")/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_no_hash_or_different', - }, ], } mac_ipv4_gtpu_eh_ul_ipv4_udp_symmetric = eval(str(mac_ipv4_gtpu_eh_dl_ipv4_udp_symmetric) @@ -628,7 +547,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="00:11:22:33:44:55")/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="00:11:22:33:44:55")/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_l3dst = { @@ -648,18 +566,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', - }, ], 'post-test': [] } @@ -693,23 +599,6 @@ mac_ipv4_gtpu_ipv4_udp_l3src_l4src = { '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', - }, ], 'post-test': [] } @@ -735,22 +624,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', - }, ], 'post-test': [] } @@ -776,22 +649,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', - }, ], 'post-test': [] } @@ -817,22 +674,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', - }, ], 'post-test': [] } @@ -854,19 +695,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', - }, ], 'post-test': [] } @@ -888,19 +716,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', - }, ], 'post-test': [] } @@ -934,30 +749,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', - }, ], 'post-test': [] } @@ -983,22 +774,6 @@ mac_ipv4_gtpu_ipv4_udp_l3 = { 'send_packet': mac_ipv4_gtpu_ipv4_udp_basic['ipv4-udp'].replace('sport=22,dport=23', 'sport=12,dport=13'), '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_different', - }, - { - 'send_packet': mac_ipv4_gtpu_ipv4_udp_basic['gtpogre-ipv4-udp'].replace('sport=22,dport=23', 'sport=12,dport=13'), - 'action': 'check_hash_same', - }, ], 'post-test': [] } @@ -1020,7 +795,6 @@ mac_ipv4_gtpu_ipv6_basic = { 'ipv6-icmp': 'Ether(dst="00:11:22:33:44:55")/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-tcp': 'Ether(dst="00:11:22:33:44:55")/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")/TCP()/("X"*480)', 'ipv6-udp': 'Ether(dst="00:11:22:33:44:55")/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="00:11:22:33:44:55")/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')) @@ -1043,18 +817,6 @@ mac_ipv4_gtpu_ipv6_l3dst_only = { 'send_packet': mac_ipv4_gtpu_ipv6_l3src_changed_pkt['ipv6-nonfrag'], 'action': 'check_hash_same', }, - { - 'send_packet': mac_ipv4_gtpu_ipv6_basic['gtpogre-ipv6-nonfrag'], - 'action': {'save_hash', 'ipv6-nonfrag'}, - }, - { - '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_basic['ipv6-frag'], 'action': {'save_hash', 'ipv6-frag'}, @@ -1124,18 +886,6 @@ mac_ipv4_gtpu_ipv6_l3src_only = { 'send_packet': mac_ipv4_gtpu_ipv6_l3dst_changed_pkt['ipv6-nonfrag'], 'action': 'check_hash_same', }, - { - 'send_packet': mac_ipv4_gtpu_ipv6_basic['gtpogre-ipv6-nonfrag'], - 'action': {'save_hash', 'ipv6-nonfrag'}, - }, - { - 'send_packet': mac_ipv4_gtpu_ipv6_l3src_changed_pkt['gtpogre-ipv6-nonfrag'], - 'action': 'check_hash_different', - }, - { - 'send_packet': mac_ipv4_gtpu_ipv6_l3dst_changed_pkt['gtpogre-ipv6-nonfrag'], - 'action': 'check_hash_same', - }, { 'send_packet': mac_ipv4_gtpu_ipv6_basic['ipv6-frag'], 'action': {'save_hash', 'ipv6-frag'}, @@ -1215,22 +965,6 @@ mac_ipv4_gtpu_ipv6_all = { 'send_packet': mac_ipv4_gtpu_ipv6_basic['ipv6-nonfrag'].replace('ABAB', '1212').replace('CDCD', '3434'), 'action': 'check_hash_different', }, - { - 'send_packet': mac_ipv4_gtpu_ipv6_basic['gtpogre-ipv6-nonfrag'], - 'action': {'save_hash', 'ipv6-nonfrag'}, - }, - { - '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-frag'], 'action': {'save_hash', 'ipv6-frag'}, @@ -1316,18 +1050,6 @@ mac_ipv4_gtpu_ipv6_gtpu = { 'send_packet': mac_ipv4_gtpu_ipv6_basic['ipv6-nonfrag'].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_basic['ipv6-frag'], 'action': 'save_hash', @@ -1373,7 +1095,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="00:11:22:33:44:55")/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="00:11:22:33:44:55")/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_l3dst = { 'sub_casename': 'mac_ipv4_gtpu_ipv6_udp_l3dst', @@ -1392,18 +1113,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', - }, ], 'post-test': [] } @@ -1436,22 +1145,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', - }, ], 'post-test': [] } @@ -1477,22 +1170,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', - }, ], 'post-test': [] } @@ -1518,22 +1195,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', - }, ], 'post-test': [] } @@ -1559,22 +1220,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', - }, ], 'post-test': [] } @@ -1596,19 +1241,6 @@ mac_ipv4_gtpu_ipv6_udp_l4dst = { .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('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').replace('CDCD', '3434'), - 'action': 'check_hash_same', - }, ], 'post-test': [] } @@ -1630,19 +1262,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', - }, ], 'post-test': [] } @@ -1676,30 +1295,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', - }, ], 'post-test': [] } @@ -1911,7 +1506,6 @@ mac_ipv4_gtpu_eh_without_ul_dl_ipv4_basic = { 'ipv4-frag': 'Ether(dst="00:11:22:33:44:55")/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="00:11:22:33:44:55")/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="00:11:22:33:44:55")/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="00:11:22:33:44:55")/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')) @@ -1934,18 +1528,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', @@ -2022,18 +1604,6 @@ mac_ipv4_gtpu_eh_without_ul_dl_ipv4_all = { 'send_packet': mac_ipv4_gtpu_eh_without_ul_dl_ipv4_l3src_changed_pkt['ipv4-nonfrag'], 'action': 'check_hash_different', }, - { - '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['ipv4-nonfrag'].replace('192.168.0.', '192.168.1.'), 'action': 'check_hash_different', @@ -2143,18 +1713,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', @@ -2214,8 +1772,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="00:11:22:33:44:55")/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="00:11:22:33:44:55")/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="00:11:22:33:44:55")/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="00:11:22:33:44:55")/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_l3dst_only = { @@ -2251,34 +1807,6 @@ mac_ipv4_gtpu_eh_without_ul_dl_ipv4_udp_l3dst_only = { 'sport=32, dport=33'), '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-ul'].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'), - 'action': 'check_hash_same', - }, - { - 'send_packet': mac_ipv4_gtpu_eh_without_ul_dl_ipv4_udp_basic['gtpogre-ul'].replace('192.168.0.2', '192.168.1.2') - .replace('sport=22, dport=23', - 'sport=32, dport=33'), - 'action': 'check_hash_same', - }, ], 'post-test': [] } @@ -2318,30 +1846,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', - }, ], 'post-test': [] } @@ -2390,26 +1894,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', - }, ], 'post-test': [] } @@ -2449,30 +1933,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', - }, ], 'post-test': [] } @@ -2514,38 +1974,6 @@ mac_ipv4_gtpu_eh_without_ul_dl_ipv4_udp_l3 = { 'send_packet': mac_ipv4_gtpu_eh_without_ul_dl_ipv4_udp_basic['ul'].replace('sport=22, dport=23', 'sport=12, dport=13'), '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'), - 'action': 'check_hash_different', - }, - { - 'send_packet': mac_ipv4_gtpu_eh_without_ul_dl_ipv4_udp_basic['gtpogre-ul'].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-ul'].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('sport=22, dport=23', 'sport=12, dport=13'), - 'action': 'check_hash_same', - }, - { - 'send_packet': mac_ipv4_gtpu_eh_without_ul_dl_ipv4_udp_basic['gtpogre-ul'].replace('sport=22, dport=23', 'sport=12, dport=13'), - 'action': 'check_hash_same', - }, ], 'post-test': [] } @@ -2603,7 +2031,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="00:11:22:33:44:55")/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="00:11:22:33:44:55")/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_l3dst = { 'sub_casename': 'mac_ipv4_gtpu_eh_dl_ipv4_udp_l3dst', @@ -2622,18 +2049,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', - }, ], 'post-test': [] } @@ -2667,22 +2082,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', - }, ], 'post-test': [] } @@ -2708,22 +2107,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', - }, ], 'post-test': [] } @@ -2749,22 +2132,6 @@ mac_ipv4_gtpu_eh_dl_ipv4_udp_l3dst_l4src = { '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', }, - { - '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('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.2', '192.168.1.2'), - 'action': 'check_hash_same', - }, ], 'post-test': [] } @@ -2791,23 +2158,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', - }, ], 'post-test': [] } @@ -2829,19 +2179,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', - }, ], 'post-test': [] } @@ -2863,19 +2200,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', - }, ], 'post-test': [] } @@ -2905,26 +2229,6 @@ mac_ipv4_gtpu_eh_dl_ipv4_udp_all = { 'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_basic['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'], - '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', - }, ], 'post-test': [] } @@ -2950,22 +2254,6 @@ mac_ipv4_gtpu_eh_dl_ipv4_udp_l3 = { 'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_basic['ipv4-udp'].replace('sport=22', 'sport=12').replace('dport=23', 'dport=13'), '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_different', - }, - { - 'send_packet': mac_ipv4_gtpu_eh_dl_ipv4_udp_basic['gtpogre-ipv4-udp'].replace('sport=22', 'sport=12').replace('dport=23', 'dport=13'), - 'action': 'check_hash_same', - }, ], 'post-test': [] } @@ -2997,7 +2285,6 @@ mac_ipv4_gtpu_eh_dl_ipv6_basic = { 'ipv6-icmp': 'Ether(dst="00:11:22:33:44:55")/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="00:11:22:33:44:55")/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="00:11:22:33:44:55")/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="00:11:22:33:44:55")/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')) @@ -3020,18 +2307,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', @@ -3111,22 +2386,6 @@ mac_ipv4_gtpu_eh_dl_ipv6_all = { 'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_basic['ipv6-nonfrag'].replace('ABAB', '1212').replace('CDCD', '3434'), 'action': 'check_hash_different', }, - { - '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['ipv6-frag'], 'action': 'save_hash', @@ -3208,7 +2467,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="00:11:22:33:44:55")/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="00:11:22:33:44:55")/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_l3dst = { 'sub_casename': 'mac_ipv4_gtpu_eh_dl_ipv6_udp_l3dst', @@ -3227,18 +2485,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', - }, ], 'post-test': [] } @@ -3271,22 +2517,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', - }, ], 'post-test': [] } @@ -3312,22 +2542,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', - }, ], 'post-test': [] } @@ -3353,22 +2567,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', - }, ], 'post-test': [] } @@ -3394,22 +2592,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', - }, ], 'post-test': [] } @@ -3431,19 +2613,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', - }, ], 'post-test': [] } @@ -3465,19 +2634,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', - }, ], 'post-test': [] } @@ -3507,26 +2663,6 @@ mac_ipv4_gtpu_eh_dl_ipv6_udp_all = { 'send_packet': mac_ipv4_gtpu_eh_dl_ipv6_udp_basic['ipv6-udp'].replace('ABAB', '1212'), '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('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', - }, ], 'post-test': [] } @@ -3566,14 +2702,6 @@ inner_l4_mac_ipv4_gtpu_ipv4_udp_tcp = { 'send_packet': 'Ether(dst="00:11:22:33:44:55")/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="00:11:22:33:44:55")/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="00:11:22:33:44:55")/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': [ { @@ -3584,14 +2712,6 @@ inner_l4_mac_ipv4_gtpu_ipv4_udp_tcp = { 'send_packet': 'Ether(dst="00:11:22:33:44:55")/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_same_or_no_hash', }, - { - 'send_packet': 'Ether(dst="00:11:22:33:44:55")/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_or_no_hash', - }, - { - 'send_packet': 'Ether(dst="00:11:22:33:44:55")/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_same_or_no_hash', - }, ] } inner_l4_mac_ipv6_gtpu_ipv4_udp_tcp = eval(str(inner_l4_mac_ipv4_gtpu_ipv4_udp_tcp) @@ -3599,8 +2719,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': 'inner_l4_mac_ipv4_gtpu_eh_ipv6_udp_tcp', 'port_id': 0, @@ -3617,14 +2736,6 @@ inner_l4_mac_ipv4_gtpu_eh_ipv6_udp_tcp = { 'send_packet': 'Ether(dst="00:11:22:33:44:55")/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="00:11:22:33:44:55")/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="00:11:22:33:44:55")/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': [ { @@ -3635,14 +2746,6 @@ inner_l4_mac_ipv4_gtpu_eh_ipv6_udp_tcp = { 'send_packet': 'Ether(dst="00:11:22:33:44:55")/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_same_or_no_hash', }, - { - 'send_packet': 'Ether(dst="00:11:22:33:44:55")/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_or_no_hash', - }, - { - 'send_packet': 'Ether(dst="00:11:22:33:44:55")/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_same_or_no_hash', - }, ] } inner_l4_mac_ipv6_gtpu_eh_ipv6_udp_tcp = eval(str(inner_l4_mac_ipv4_gtpu_eh_ipv6_udp_tcp) @@ -3650,8 +2753,7 @@ inner_l4_mac_ipv6_gtpu_eh_ipv6_udp_tcp = eval(str(inner_l4_mac_ipv4_gtpu_eh_ipv6 .replace('pdu_t is 0', 'pdu_t is 1') .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('mac_ipv4', 'mac_ipv6')) 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] -- 2.17.1