From patchwork Fri Jan 29 09:25:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xie, WeiX" X-Patchwork-Id: 87525 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id A5CDBA09E4; Fri, 29 Jan 2021 10:21:24 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 85AA424011B; Fri, 29 Jan 2021 10:21:24 +0100 (CET) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mails.dpdk.org (Postfix) with ESMTP id 1489E40694 for ; Fri, 29 Jan 2021 10:21:21 +0100 (CET) IronPort-SDR: KrHaoKjOuccKcBd7RDBH6E1bz0oblW6wxXaZS99dRkGEttkaUKNXdYmI6UU34xUPWpLAg+d0T1 RQa677LCWZ7w== X-IronPort-AV: E=McAfee;i="6000,8403,9878"; a="180534684" X-IronPort-AV: E=Sophos;i="5.79,385,1602572400"; d="scan'208";a="180534684" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Jan 2021 01:21:20 -0800 IronPort-SDR: 19iWfXreGJpV4pPHQmEz2qIJ0KfNge6NpRPXLHYU5eUHydVvcH/+n3ASgLwYAZ+RoPDj6f+0t/ TW8f2TocK0Qg== X-IronPort-AV: E=Sophos;i="5.79,385,1602572400"; d="scan'208";a="389228440" Received: from unknown (HELO localhost.localdomain) ([10.240.183.80]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Jan 2021 01:21:18 -0800 From: Xie wei To: dts@dpdk.org Cc: Xie wei Date: Fri, 29 Jan 2021 17:25:18 +0800 Message-Id: <20210129092518.28963-1-weix.xie@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [dts] [PATCH V1] tests/cvl_advanced_iavf_rss: remove the steps after destroying rss rules 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" a)according to test plan, delete the steps after destroying rss rules for toeplitz cases. b)according to test plan, remove the code of nvgre packet for symmetric_mac_ipv6_tcp. c)according to test plan, modify check point for symmetric cases which check different hash value after destroying rss rule. d)the behavior after destroying rss rules are not unified, it need to launch testpmd separately for each case. Signed-off-by: Xie wei Tested-by: Xie,WeiX < weix.xie@intel.com> --- tests/TestSuite_cvl_advanced_iavf_rss.py | 1034 +--------------------- 1 file changed, 39 insertions(+), 995 deletions(-) diff --git a/tests/TestSuite_cvl_advanced_iavf_rss.py b/tests/TestSuite_cvl_advanced_iavf_rss.py index cca520b4..a7003b38 100644 --- a/tests/TestSuite_cvl_advanced_iavf_rss.py +++ b/tests/TestSuite_cvl_advanced_iavf_rss.py @@ -185,24 +185,6 @@ mac_ipv4_l2_src = { 'action': {'check_hash_same': 'ipv4-tcp'}, }, ], - 'post-test': [ - { - 'send_packet': mac_ipv4_toeplitz_basic_pkt['ipv4-nonfrag'][0], - 'action': {'check_hash_different': 'ipv4-nonfrag'}, - }, - { - 'send_packet': mac_ipv4_toeplitz_basic_pkt['ipv4-frag'][0], - 'action': {'check_hash_different': 'ipv4-frag'}, - }, - { - 'send_packet': mac_ipv4_toeplitz_basic_pkt['ipv4-icmp'][0], - 'action': {'check_hash_different': 'ipv4-icmp'}, - }, - { - 'send_packet': mac_ipv4_toeplitz_basic_pkt['ipv4-tcp'][0], - 'action': {'check_hash_different': 'ipv4-tcp'}, - }, - ], } mac_ipv4_l2_dst = { @@ -243,24 +225,6 @@ mac_ipv4_l2_dst = { 'action': {'check_hash_same': 'ipv4-tcp'}, }, ], - 'post-test': [ - { - 'send_packet': mac_ipv4_toeplitz_basic_pkt['ipv4-nonfrag'][0], - 'action': {'check_hash_different': 'ipv4-nonfrag'}, - }, - { - 'send_packet': mac_ipv4_toeplitz_basic_pkt['ipv4-frag'][0], - 'action': {'check_hash_different': 'ipv4-frag'}, - }, - { - 'send_packet': mac_ipv4_toeplitz_basic_pkt['ipv4-icmp'][0], - 'action': {'check_hash_different': 'ipv4-icmp'}, - }, - { - 'send_packet': mac_ipv4_toeplitz_basic_pkt['ipv4-tcp'][0], - 'action': {'check_hash_different': 'ipv4-tcp'}, - }, - ], } mac_ipv4_l2src_l2dst = { @@ -317,24 +281,6 @@ mac_ipv4_l2src_l2dst = { 'action': {'check_hash_same': 'ipv4-tcp'}, }, ], - 'post-test': [ - { - 'send_packet': mac_ipv4_toeplitz_basic_pkt['ipv4-nonfrag'][0], - 'action': {'check_hash_different': 'ipv4-nonfrag'}, - }, - { - 'send_packet': mac_ipv4_toeplitz_basic_pkt['ipv4-frag'][0], - 'action': {'check_hash_different': 'ipv4-frag'}, - }, - { - 'send_packet': mac_ipv4_toeplitz_basic_pkt['ipv4-icmp'][0], - 'action': {'check_hash_different': 'ipv4-icmp'}, - }, - { - 'send_packet': mac_ipv4_toeplitz_basic_pkt['ipv4-tcp'][0], - 'action': {'check_hash_different': 'ipv4-tcp'}, - }, - ], } mac_ipv4_l3_src = { @@ -403,28 +349,6 @@ mac_ipv4_l3_src = { # 'action': {'check_hash_same': 'ipv4-udp-vxlan'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv4_toeplitz_basic_pkt['ipv4-nonfrag'][0], - 'action': {'check_hash_different': 'ipv4-nonfrag'}, - }, - { - 'send_packet': mac_ipv4_toeplitz_basic_pkt['ipv4-frag'][0], - 'action': {'check_hash_different': 'ipv4-frag'}, - }, - { - 'send_packet': mac_ipv4_toeplitz_basic_pkt['ipv4-icmp'][0], - 'action': {'check_hash_different': 'ipv4-icmp'}, - }, - { - 'send_packet': mac_ipv4_toeplitz_basic_pkt['ipv4-tcp'][0], - 'action': {'check_hash_different': 'ipv4-tcp'}, - }, - # { - # 'send_packet': mac_ipv4_toeplitz_basic_pkt['ipv4-udp-vxlan'][0], - # 'action': {'check_hash_different': 'ipv4-udp-vxlan'}, - # }, - ], } mac_ipv4_l3_dst = { @@ -493,28 +417,6 @@ mac_ipv4_l3_dst = { # 'action': {'check_hash_same': 'ipv4-udp-vxlan'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv4_toeplitz_basic_pkt['ipv4-nonfrag'][0], - 'action': {'check_hash_different': 'ipv4-nonfrag'}, - }, - { - 'send_packet': mac_ipv4_toeplitz_basic_pkt['ipv4-frag'][0], - 'action': {'check_hash_different': 'ipv4-frag'}, - }, - { - 'send_packet': mac_ipv4_toeplitz_basic_pkt['ipv4-icmp'][0], - 'action': {'check_hash_different': 'ipv4-icmp'}, - }, - { - 'send_packet': mac_ipv4_toeplitz_basic_pkt['ipv4-tcp'][0], - 'action': {'check_hash_different': 'ipv4-tcp'}, - }, - # { - # 'send_packet': mac_ipv4_toeplitz_basic_pkt['ipv4-udp-vxlan'][0], - # 'action': {'check_hash_different': 'ipv4-udp-vxlan'}, - # }, - ], } mac_ipv4_all = { @@ -599,28 +501,6 @@ mac_ipv4_all = { # 'action': {'check_hash_different': 'ipv4-udp-vxlan'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv4_toeplitz_basic_pkt['ipv4-nonfrag'][0], - 'action': {'check_hash_different': 'ipv4-nonfrag'}, - }, - { - 'send_packet': mac_ipv4_toeplitz_basic_pkt['ipv4-frag'][0], - 'action': {'check_hash_different': 'ipv4-frag'}, - }, - { - 'send_packet': mac_ipv4_toeplitz_basic_pkt['ipv4-icmp'][0], - 'action': {'check_hash_different': 'ipv4-icmp'}, - }, - { - 'send_packet': mac_ipv4_toeplitz_basic_pkt['ipv4-tcp'][0], - 'action': {'check_hash_different': 'ipv4-tcp'}, - }, - # { - # 'send_packet': mac_ipv4_toeplitz_basic_pkt['ipv4-udp-vxlan'][0], - # 'action': {'check_hash_different': 'ipv4-udp-vxlan'}, - # }, - ], } # mac ipv4_udp @@ -642,12 +522,6 @@ mac_ipv4_udp_l2_src = { 'action': {'check_hash_same': 'ipv4-udp'}, }, ], - 'post-test': [ - { - 'send_packet': mac_ipv4_udp_toeplitz_basic_pkt['ipv4-udp'], - 'action': {'check_hash_different': 'ipv4-udp'}, - }, - ], } mac_ipv4_udp_l2_dst = { @@ -664,12 +538,6 @@ mac_ipv4_udp_l2_dst = { 'action': {'check_hash_same': 'ipv4-udp'}, }, ], - 'post-test': [ - { - 'send_packet': mac_ipv4_udp_toeplitz_basic_pkt['ipv4-udp'], - 'action': {'check_hash_different': 'ipv4-udp'}, - }, - ], } mac_ipv4_udp_l2src_l2dst = { @@ -690,12 +558,6 @@ mac_ipv4_udp_l2src_l2dst = { 'action': {'check_hash_same': 'ipv4-udp'}, }, ], - 'post-test': [ - { - 'send_packet': mac_ipv4_udp_toeplitz_basic_pkt['ipv4-udp'], - 'action': {'check_hash_different': 'ipv4-udp'}, - }, - ], } mac_ipv4_udp_l3_src = { @@ -728,16 +590,6 @@ mac_ipv4_udp_l3_src = { # 'action': {'check_hash_same': 'nvgre'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv4_udp_toeplitz_basic_pkt['ipv4-udp'], - 'action': {'check_hash_different': 'ipv4-udp'}, - }, - # { - # 'send_packet': mac_ipv4_udp_toeplitz_basic_pkt['nvgre'], - # 'action': {'check_hash_different': 'nvgre'}, - # }, - ], } mac_ipv4_udp_l3_dst = { @@ -770,16 +622,6 @@ mac_ipv4_udp_l3_dst = { # 'action': {'check_hash_same': 'nvgre'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv4_udp_toeplitz_basic_pkt['ipv4-udp'], - 'action': {'check_hash_different': 'ipv4-udp'}, - }, - # { - # 'send_packet': mac_ipv4_udp_toeplitz_basic_pkt['nvgre'], - # 'action': {'check_hash_different': 'nvgre'}, - # }, - ], } mac_ipv4_udp_l3src_l4src = { @@ -820,16 +662,6 @@ mac_ipv4_udp_l3src_l4src = { # 'action': {'check_hash_same': 'nvgre'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv4_udp_toeplitz_basic_pkt['ipv4-udp'], - 'action': {'check_hash_different': 'ipv4-udp'}, - }, - # { - # 'send_packet': mac_ipv4_udp_toeplitz_basic_pkt['nvgre'], - # 'action': {'check_hash_different': 'nvgre'}, - # }, - ], } mac_ipv4_udp_l3src_l4dst = { @@ -870,16 +702,6 @@ mac_ipv4_udp_l3src_l4dst = { # 'action': {'check_hash_same': 'nvgre'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv4_udp_toeplitz_basic_pkt['ipv4-udp'], - 'action': {'check_hash_different': 'ipv4-udp'}, - }, - # { - # 'send_packet': mac_ipv4_udp_toeplitz_basic_pkt['nvgre'], - # 'action': {'check_hash_different': 'nvgre'}, - # }, - ], } mac_ipv4_udp_l3dst_l4src = { @@ -920,16 +742,6 @@ mac_ipv4_udp_l3dst_l4src = { # 'action': {'check_hash_same': 'nvgre'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv4_udp_toeplitz_basic_pkt['ipv4-udp'], - 'action': {'check_hash_different': 'ipv4-udp'}, - }, - # { - # 'send_packet': mac_ipv4_udp_toeplitz_basic_pkt['nvgre'], - # 'action': {'check_hash_different': 'nvgre'}, - # }, - ], } mac_ipv4_udp_l3dst_l4dst = { @@ -970,16 +782,6 @@ mac_ipv4_udp_l3dst_l4dst = { # 'action': {'check_hash_same': 'nvgre'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv4_udp_toeplitz_basic_pkt['ipv4-udp'], - 'action': {'check_hash_different': 'ipv4-udp'}, - }, - # { - # 'send_packet': mac_ipv4_udp_toeplitz_basic_pkt['nvgre'], - # 'action': {'check_hash_different': 'nvgre'}, - # }, - ], } mac_ipv4_udp_l4_src = { @@ -1012,16 +814,6 @@ mac_ipv4_udp_l4_src = { # 'action': {'check_hash_same': 'nvgre'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv4_udp_toeplitz_basic_pkt['ipv4-udp'], - 'action': {'check_hash_different': 'ipv4-udp'}, - }, - # { - # 'send_packet': mac_ipv4_udp_toeplitz_basic_pkt['nvgre'], - # 'action': {'check_hash_different': 'nvgre'}, - # }, - ], } mac_ipv4_udp_l4_dst = { @@ -1054,16 +846,6 @@ mac_ipv4_udp_l4_dst = { # 'action': {'check_hash_same': 'nvgre'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv4_udp_toeplitz_basic_pkt['ipv4-udp'], - 'action': {'check_hash_different': 'ipv4-udp'}, - }, - # { - # 'send_packet': mac_ipv4_udp_toeplitz_basic_pkt['nvgre'], - # 'action': {'check_hash_different': 'nvgre'}, - # }, - ], } mac_ipv4_udp_all = { @@ -1116,16 +898,6 @@ mac_ipv4_udp_all = { # 'action': {'check_hash_different': 'nvgre'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv4_udp_toeplitz_basic_pkt['ipv4-udp'], - 'action': {'check_hash_different': 'ipv4-udp'}, - }, - # { - # 'send_packet': mac_ipv4_udp_toeplitz_basic_pkt['nvgre'], - # 'action': {'check_hash_different': 'nvgre'}, - # }, - ], } # mac ipv4_tcp @@ -1147,12 +919,6 @@ mac_ipv4_tcp_l2_src = { 'action': {'check_hash_same': 'ipv4-tcp'}, }, ], - 'post-test': [ - { - 'send_packet': mac_ipv4_tcp_toeplitz_basic_pkt['ipv4-tcp'], - 'action': {'check_hash_different': 'ipv4-tcp'}, - }, - ], } mac_ipv4_tcp_l2_dst = { @@ -1169,12 +935,6 @@ mac_ipv4_tcp_l2_dst = { 'action': {'check_hash_same': 'ipv4-tcp'}, }, ], - 'post-test': [ - { - 'send_packet': mac_ipv4_tcp_toeplitz_basic_pkt['ipv4-tcp'], - 'action': {'check_hash_different': 'ipv4-tcp'}, - }, - ], } mac_ipv4_tcp_l2src_l2dst = { @@ -1195,12 +955,6 @@ mac_ipv4_tcp_l2src_l2dst = { 'action': {'check_hash_same': 'ipv4-tcp'}, }, ], - 'post-test': [ - { - 'send_packet': mac_ipv4_tcp_toeplitz_basic_pkt['ipv4-tcp'], - 'action': {'check_hash_different': 'ipv4-tcp'}, - }, - ], } mac_ipv4_tcp_l3_src = { @@ -1233,16 +987,6 @@ mac_ipv4_tcp_l3_src = { # 'action': {'check_hash_same': 'nvgre'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv4_tcp_toeplitz_basic_pkt['ipv4-tcp'], - 'action': {'check_hash_different': 'ipv4-tcp'}, - }, - # { - # 'send_packet': mac_ipv4_tcp_toeplitz_basic_pkt['nvgre'], - # 'action': {'check_hash_different': 'nvgre'}, - # }, - ], } mac_ipv4_tcp_l3_dst = { @@ -1275,16 +1019,6 @@ mac_ipv4_tcp_l3_dst = { # 'action': {'check_hash_same': 'nvgre'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv4_tcp_toeplitz_basic_pkt['ipv4-tcp'], - 'action': {'check_hash_different': 'ipv4-tcp'}, - }, - # { - # 'send_packet': mac_ipv4_tcp_toeplitz_basic_pkt['nvgre'], - # 'action': {'check_hash_different': 'nvgre'}, - # }, - ], } mac_ipv4_tcp_l3src_l4src = { @@ -1325,16 +1059,6 @@ mac_ipv4_tcp_l3src_l4src = { # 'action': {'check_hash_same': 'nvgre'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv4_tcp_toeplitz_basic_pkt['ipv4-tcp'], - 'action': {'check_hash_different': 'ipv4-tcp'}, - }, - # { - # 'send_packet': mac_ipv4_tcp_toeplitz_basic_pkt['nvgre'], - # 'action': {'check_hash_different': 'nvgre'}, - # }, - ], } mac_ipv4_tcp_l3src_l4dst = { @@ -1375,16 +1099,6 @@ mac_ipv4_tcp_l3src_l4dst = { # 'action': {'check_hash_same': 'nvgre'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv4_tcp_toeplitz_basic_pkt['ipv4-tcp'], - 'action': {'check_hash_different': 'ipv4-tcp'}, - }, - # { - # 'send_packet': mac_ipv4_tcp_toeplitz_basic_pkt['nvgre'], - # 'action': {'check_hash_different': 'nvgre'}, - # }, - ], } mac_ipv4_tcp_l3dst_l4src = { @@ -1425,16 +1139,6 @@ mac_ipv4_tcp_l3dst_l4src = { # 'action': {'check_hash_same': 'nvgre'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv4_tcp_toeplitz_basic_pkt['ipv4-tcp'], - 'action': {'check_hash_different': 'ipv4-tcp'}, - }, - # { - # 'send_packet': mac_ipv4_tcp_toeplitz_basic_pkt['nvgre'], - # 'action': {'check_hash_different': 'nvgre'}, - # }, - ], } mac_ipv4_tcp_l3dst_l4dst = { @@ -1475,16 +1179,6 @@ mac_ipv4_tcp_l3dst_l4dst = { # 'action': {'check_hash_same': 'nvgre'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv4_tcp_toeplitz_basic_pkt['ipv4-tcp'], - 'action': {'check_hash_different': 'ipv4-tcp'}, - }, - # { - # 'send_packet': mac_ipv4_tcp_toeplitz_basic_pkt['nvgre'], - # 'action': {'check_hash_different': 'nvgre'}, - # }, - ], } mac_ipv4_tcp_l4_src = { @@ -1517,16 +1211,6 @@ mac_ipv4_tcp_l4_src = { # 'action': {'check_hash_same': 'nvgre'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv4_tcp_toeplitz_basic_pkt['ipv4-tcp'], - 'action': {'check_hash_different': 'ipv4-tcp'}, - }, - # { - # 'send_packet': mac_ipv4_tcp_toeplitz_basic_pkt['nvgre'], - # 'action': {'check_hash_different': 'nvgre'}, - # }, - ], } mac_ipv4_tcp_l4_dst = { @@ -1559,16 +1243,6 @@ mac_ipv4_tcp_l4_dst = { # 'action': {'check_hash_same': 'nvgre'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv4_tcp_toeplitz_basic_pkt['ipv4-tcp'], - 'action': {'check_hash_different': 'ipv4-tcp'}, - }, - # { - # 'send_packet': mac_ipv4_tcp_toeplitz_basic_pkt['nvgre'], - # 'action': {'check_hash_different': 'nvgre'}, - # }, - ], } mac_ipv4_tcp_all = { @@ -1621,16 +1295,6 @@ mac_ipv4_tcp_all = { # 'action': {'check_hash_different': 'nvgre'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv4_tcp_toeplitz_basic_pkt['ipv4-tcp'], - 'action': {'check_hash_different': 'ipv4-tcp'}, - }, - # { - # 'send_packet': mac_ipv4_tcp_toeplitz_basic_pkt['nvgre'], - # 'action': {'check_hash_different': 'nvgre'}, - # }, - ], } # mac ipv4_sctp @@ -1652,12 +1316,6 @@ mac_ipv4_sctp_l2_src = { 'action': {'check_hash_same': 'ipv4-sctp'}, }, ], - 'post-test': [ - { - 'send_packet': mac_ipv4_sctp_toeplitz_basic_pkt['ipv4-sctp'], - 'action': {'check_hash_different': 'ipv4-sctp'}, - }, - ], } mac_ipv4_sctp_l2_dst = { @@ -1674,12 +1332,6 @@ mac_ipv4_sctp_l2_dst = { 'action': {'check_hash_same': 'ipv4-sctp'}, }, ], - 'post-test': [ - { - 'send_packet': mac_ipv4_sctp_toeplitz_basic_pkt['ipv4-sctp'], - 'action': {'check_hash_different': 'ipv4-sctp'}, - }, - ], } mac_ipv4_sctp_l2src_l2dst = { @@ -1700,12 +1352,6 @@ mac_ipv4_sctp_l2src_l2dst = { 'action': {'check_hash_same': 'ipv4-sctp'}, }, ], - 'post-test': [ - { - 'send_packet': mac_ipv4_sctp_toeplitz_basic_pkt['ipv4-sctp'], - 'action': {'check_hash_different': 'ipv4-sctp'}, - }, - ], } mac_ipv4_sctp_l3_src = { @@ -1738,16 +1384,6 @@ mac_ipv4_sctp_l3_src = { # 'action': {'check_hash_same': 'nvgre'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv4_sctp_toeplitz_basic_pkt['ipv4-sctp'], - 'action': {'check_hash_different': 'ipv4-sctp'}, - }, - # { - # 'send_packet': mac_ipv4_sctp_toeplitz_basic_pkt['nvgre'], - # 'action': {'check_hash_different': 'nvgre'}, - # }, - ], } mac_ipv4_sctp_l3_dst = { @@ -1780,16 +1416,6 @@ mac_ipv4_sctp_l3_dst = { # 'action': {'check_hash_same': 'nvgre'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv4_sctp_toeplitz_basic_pkt['ipv4-sctp'], - 'action': {'check_hash_different': 'ipv4-sctp'}, - }, - # { - # 'send_packet': mac_ipv4_sctp_toeplitz_basic_pkt['nvgre'], - # 'action': {'check_hash_different': 'nvgre'}, - # }, - ], } mac_ipv4_sctp_l3src_l4src = { @@ -1830,16 +1456,6 @@ mac_ipv4_sctp_l3src_l4src = { # 'action': {'check_hash_same': 'nvgre'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv4_sctp_toeplitz_basic_pkt['ipv4-sctp'], - 'action': {'check_hash_different': 'ipv4-sctp'}, - }, - # { - # 'send_packet': mac_ipv4_sctp_toeplitz_basic_pkt['nvgre'], - # 'action': {'check_hash_different': 'nvgre'}, - # }, - ], } mac_ipv4_sctp_l3src_l4dst = { @@ -1880,16 +1496,6 @@ mac_ipv4_sctp_l3src_l4dst = { # 'action': {'check_hash_same': 'nvgre'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv4_sctp_toeplitz_basic_pkt['ipv4-sctp'], - 'action': {'check_hash_different': 'ipv4-sctp'}, - }, - # { - # 'send_packet': mac_ipv4_sctp_toeplitz_basic_pkt['nvgre'], - # 'action': {'check_hash_different': 'nvgre'}, - # }, - ], } mac_ipv4_sctp_l3dst_l4src = { @@ -1930,16 +1536,6 @@ mac_ipv4_sctp_l3dst_l4src = { # 'action': {'check_hash_same': 'nvgre'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv4_sctp_toeplitz_basic_pkt['ipv4-sctp'], - 'action': {'check_hash_different': 'ipv4-sctp'}, - }, - # { - # 'send_packet': mac_ipv4_sctp_toeplitz_basic_pkt['nvgre'], - # 'action': {'check_hash_different': 'nvgre'}, - # }, - ], } mac_ipv4_sctp_l3dst_l4dst = { @@ -1980,16 +1576,6 @@ mac_ipv4_sctp_l3dst_l4dst = { # 'action': {'check_hash_same': 'nvgre'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv4_sctp_toeplitz_basic_pkt['ipv4-sctp'], - 'action': {'check_hash_different': 'ipv4-sctp'}, - }, - # { - # 'send_packet': mac_ipv4_sctp_toeplitz_basic_pkt['nvgre'], - # 'action': {'check_hash_different': 'nvgre'}, - # }, - ], } mac_ipv4_sctp_l4_src = { @@ -2012,25 +1598,15 @@ mac_ipv4_sctp_l4_src = { # { # 'send_packet': mac_ipv4_sctp_toeplitz_basic_pkt['nvgre'], # 'action': {'save_hash': 'nvgre'}, - # }, - # { - # 'send_packet': 'Ether(dst="%s", src="68:05:CA:BB:26:E0")/IP()/NVGRE()/Ether()/IP(dst="192.168.0.1", src="192.168.0.2")/SCTP(sport=32,dport=23)/("X"*480)' % vf0_mac, - # 'action': {'check_hash_different': 'nvgre'}, - # }, - # { - # 'send_packet': 'Ether(dst="%s", src="68:05:CA:BB:26:E1")/IP()/NVGRE()/Ether()/IP(dst="192.168.1.1", src="192.168.1.2")/SCTP(sport=22,dport=33)/("X"*480)' % vf0_mac, - # 'action': {'check_hash_same': 'nvgre'}, - # }, - ], - 'post-test': [ - { - 'send_packet': mac_ipv4_sctp_toeplitz_basic_pkt['ipv4-sctp'], - 'action': {'check_hash_different': 'ipv4-sctp'}, - }, + # }, # { - # 'send_packet': mac_ipv4_sctp_toeplitz_basic_pkt['nvgre'], + # 'send_packet': 'Ether(dst="%s", src="68:05:CA:BB:26:E0")/IP()/NVGRE()/Ether()/IP(dst="192.168.0.1", src="192.168.0.2")/SCTP(sport=32,dport=23)/("X"*480)' % vf0_mac, # 'action': {'check_hash_different': 'nvgre'}, # }, + # { + # 'send_packet': 'Ether(dst="%s", src="68:05:CA:BB:26:E1")/IP()/NVGRE()/Ether()/IP(dst="192.168.1.1", src="192.168.1.2")/SCTP(sport=22,dport=33)/("X"*480)' % vf0_mac, + # 'action': {'check_hash_same': 'nvgre'}, + # }, ], } @@ -2064,16 +1640,6 @@ mac_ipv4_sctp_l4_dst = { # 'action': {'check_hash_same': 'nvgre'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv4_sctp_toeplitz_basic_pkt['ipv4-sctp'], - 'action': {'check_hash_different': 'ipv4-sctp'}, - }, - # { - # 'send_packet': mac_ipv4_sctp_toeplitz_basic_pkt['nvgre'], - # 'action': {'check_hash_different': 'nvgre'}, - # }, - ], } mac_ipv4_sctp_all = { @@ -2126,16 +1692,6 @@ mac_ipv4_sctp_all = { # 'action': {'check_hash_different': 'nvgre'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv4_sctp_toeplitz_basic_pkt['ipv4-sctp'], - 'action': {'check_hash_different': 'ipv4-sctp'}, - }, - # { - # 'send_packet': mac_ipv4_sctp_toeplitz_basic_pkt['nvgre'], - # 'action': {'check_hash_different': 'nvgre'}, - # }, - ], } # mac_ipv6 @@ -2193,24 +1749,6 @@ mac_ipv6_l2_src = { 'action': {'check_hash_same': 'ipv6-udp'}, }, ], - 'post-test': [ - { - 'send_packet': mac_ipv6_toeplitz_basic_pkt['ipv6-nonfrag'][0], - 'action': {'check_hash_different': 'ipv6-nonfrag'}, - }, - { - 'send_packet': mac_ipv6_toeplitz_basic_pkt['ipv6-frag'][0], - 'action': {'check_hash_different': 'ipv6-frag'}, - }, - { - 'send_packet': mac_ipv6_toeplitz_basic_pkt['ipv6-icmp'][0], - 'action': {'check_hash_different': 'ipv6-icmp'}, - }, - { - 'send_packet': mac_ipv6_toeplitz_basic_pkt['ipv6-udp'][0], - 'action': {'check_hash_different': 'ipv6-udp'}, - }, - ], } mac_ipv6_l2_dst = { @@ -2251,24 +1789,6 @@ mac_ipv6_l2_dst = { 'action': {'check_hash_same': 'ipv6-udp'}, }, ], - 'post-test': [ - { - 'send_packet': mac_ipv6_toeplitz_basic_pkt['ipv6-nonfrag'][0], - 'action': {'check_hash_different': 'ipv6-nonfrag'}, - }, - { - 'send_packet': mac_ipv6_toeplitz_basic_pkt['ipv6-frag'][0], - 'action': {'check_hash_different': 'ipv6-frag'}, - }, - { - 'send_packet': mac_ipv6_toeplitz_basic_pkt['ipv6-icmp'][0], - 'action': {'check_hash_different': 'ipv6-icmp'}, - }, - { - 'send_packet': mac_ipv6_toeplitz_basic_pkt['ipv6-udp'][0], - 'action': {'check_hash_different': 'ipv6-udp'}, - }, - ], } mac_ipv6_l2src_l2dst = { @@ -2325,24 +1845,6 @@ mac_ipv6_l2src_l2dst = { 'action': {'check_hash_same': 'ipv6-udp'}, }, ], - 'post-test': [ - { - 'send_packet': mac_ipv6_toeplitz_basic_pkt['ipv6-nonfrag'][0], - 'action': {'check_hash_different': 'ipv6-nonfrag'}, - }, - { - 'send_packet': mac_ipv6_toeplitz_basic_pkt['ipv6-frag'][0], - 'action': {'check_hash_different': 'ipv6-frag'}, - }, - { - 'send_packet': mac_ipv6_toeplitz_basic_pkt['ipv6-icmp'][0], - 'action': {'check_hash_different': 'ipv6-icmp'}, - }, - { - 'send_packet': mac_ipv6_toeplitz_basic_pkt['ipv6-udp'][0], - 'action': {'check_hash_different': 'ipv6-udp'}, - }, - ], } mac_ipv6_l3_src = { @@ -2411,28 +1913,6 @@ mac_ipv6_l3_src = { # 'action': {'check_hash_same': 'nvgre'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv6_toeplitz_basic_pkt['ipv6-nonfrag'][0], - 'action': {'check_hash_different': 'ipv6-nonfrag'}, - }, - { - 'send_packet': mac_ipv6_toeplitz_basic_pkt['ipv6-frag'][0], - 'action': {'check_hash_different': 'ipv6-frag'}, - }, - { - 'send_packet': mac_ipv6_toeplitz_basic_pkt['ipv6-icmp'][0], - 'action': {'check_hash_different': 'ipv6-icmp'}, - }, - { - 'send_packet': mac_ipv6_toeplitz_basic_pkt['ipv6-udp'][0], - 'action': {'check_hash_different': 'ipv6-udp'}, - }, - # { - # 'send_packet': mac_ipv6_toeplitz_basic_pkt['nvgre'][0], - # 'action': {'check_hash_different': 'nvgre'}, - # }, - ], } mac_ipv6_l3_dst = { @@ -2501,28 +1981,6 @@ mac_ipv6_l3_dst = { # 'action': {'check_hash_same': 'nvgre'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv6_toeplitz_basic_pkt['ipv6-nonfrag'][0], - 'action': {'check_hash_different': 'ipv6-nonfrag'}, - }, - { - 'send_packet': mac_ipv6_toeplitz_basic_pkt['ipv6-frag'][0], - 'action': {'check_hash_different': 'ipv6-frag'}, - }, - { - 'send_packet': mac_ipv6_toeplitz_basic_pkt['ipv6-icmp'][0], - 'action': {'check_hash_different': 'ipv6-icmp'}, - }, - { - 'send_packet': mac_ipv6_toeplitz_basic_pkt['ipv6-udp'][0], - 'action': {'check_hash_different': 'ipv6-udp'}, - }, - # { - # 'send_packet': mac_ipv6_toeplitz_basic_pkt['nvgre'][0], - # 'action': {'check_hash_different': 'nvgre'}, - # }, - ], } mac_ipv6_all = { @@ -2611,28 +2069,6 @@ mac_ipv6_all = { # 'action': {'check_hash_same': 'nvgre'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv6_toeplitz_basic_pkt['ipv6-nonfrag'][0], - 'action': {'check_hash_different': 'ipv6-nonfrag'}, - }, - { - 'send_packet': mac_ipv6_toeplitz_basic_pkt['ipv6-frag'][0], - 'action': {'check_hash_different': 'ipv6-frag'}, - }, - { - 'send_packet': mac_ipv6_toeplitz_basic_pkt['ipv6-icmp'][0], - 'action': {'check_hash_different': 'ipv6-icmp'}, - }, - { - 'send_packet': mac_ipv6_toeplitz_basic_pkt['ipv6-udp'][0], - 'action': {'check_hash_different': 'ipv6-udp'}, - }, - # { - # 'send_packet': mac_ipv6_toeplitz_basic_pkt['nvgre'][0], - # 'action': {'check_hash_different': 'nvgre'}, - # }, - ], } # mac_ipv6_udp mac_ipv6_udp_l2_src = { @@ -2653,12 +2089,6 @@ mac_ipv6_udp_l2_src = { 'action': {'check_hash_same': 'ipv6-udp'}, }, ], - 'post-test': [ - { - 'send_packet': mac_ipv6_udp_toeplitz_basic_pkt['ipv6-udp'], - 'action': {'check_hash_different': 'ipv6-udp'}, - }, - ], } mac_ipv6_udp_l2_dst = { @@ -2675,12 +2105,6 @@ mac_ipv6_udp_l2_dst = { 'action': {'check_hash_same': 'ipv6-udp'}, }, ], - 'post-test': [ - { - 'send_packet': mac_ipv6_udp_toeplitz_basic_pkt['ipv6-udp'], - 'action': {'check_hash_different': 'ipv6-udp'}, - }, - ], } mac_ipv6_udp_l2src_l2dst = { @@ -2701,12 +2125,6 @@ mac_ipv6_udp_l2src_l2dst = { 'action': {'check_hash_same': 'ipv6-udp'}, }, ], - 'post-test': [ - { - 'send_packet': mac_ipv6_udp_toeplitz_basic_pkt['ipv6-udp'], - 'action': {'check_hash_different': 'ipv6-udp'}, - }, - ], } mac_ipv6_udp_l3_src = { @@ -2739,16 +2157,6 @@ mac_ipv6_udp_l3_src = { # 'action': {'check_hash_same': 'ipv4_udp_vxlan_ipv6_udp'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv6_udp_toeplitz_basic_pkt['ipv6-udp'], - 'action': {'check_hash_different': 'ipv6-udp'}, - }, - # { - # 'send_packet': mac_ipv6_udp_toeplitz_basic_pkt['ipv4_udp_vxlan_ipv6_udp'], - # 'action': {'check_hash_different': 'ipv4_udp_vxlan_ipv6_udp'}, - # }, - ], } mac_ipv6_udp_l3_dst = { @@ -2781,16 +2189,6 @@ mac_ipv6_udp_l3_dst = { # 'action': {'check_hash_same': 'ipv4_udp_vxlan_ipv6_udp'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv6_udp_toeplitz_basic_pkt['ipv6-udp'], - 'action': {'check_hash_different': 'ipv6-udp'}, - }, - # { - # 'send_packet': mac_ipv6_udp_toeplitz_basic_pkt['ipv4_udp_vxlan_ipv6_udp'], - # 'action': {'check_hash_different': 'ipv4_udp_vxlan_ipv6_udp'}, - # }, - ], } mac_ipv6_udp_l3src_l4src = { @@ -2823,16 +2221,6 @@ mac_ipv6_udp_l3src_l4src = { # 'action': {'check_hash_same': 'ipv4_udp_vxlan_ipv6_udp'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv6_udp_toeplitz_basic_pkt['ipv6-udp'], - 'action': {'check_hash_different': 'ipv6-udp'}, - }, - # { - # 'send_packet': mac_ipv6_udp_toeplitz_basic_pkt['ipv4_udp_vxlan_ipv6_udp'], - # 'action': {'check_hash_different': 'ipv4_udp_vxlan_ipv6_udp'}, - # }, - ], } mac_ipv6_udp_l3src_l4dst = { @@ -2865,16 +2253,6 @@ mac_ipv6_udp_l3src_l4dst = { # 'action': {'check_hash_same': 'ipv4_udp_vxlan_ipv6_udp'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv6_udp_toeplitz_basic_pkt['ipv6-udp'], - 'action': {'check_hash_different': 'ipv6-udp'}, - }, - # { - # 'send_packet': mac_ipv6_udp_toeplitz_basic_pkt['ipv4_udp_vxlan_ipv6_udp'], - # 'action': {'check_hash_different': 'ipv4_udp_vxlan_ipv6_udp'}, - # }, - ], } mac_ipv6_udp_l3dst_l4src = { @@ -2907,16 +2285,6 @@ mac_ipv6_udp_l3dst_l4src = { # 'action': {'check_hash_same': 'ipv4_udp_vxlan_ipv6_udp'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv6_udp_toeplitz_basic_pkt['ipv6-udp'], - 'action': {'check_hash_different': 'ipv6-udp'}, - }, - # { - # 'send_packet': mac_ipv6_udp_toeplitz_basic_pkt['ipv4_udp_vxlan_ipv6_udp'], - # 'action': {'check_hash_different': 'ipv4_udp_vxlan_ipv6_udp'}, - # }, - ], } mac_ipv6_udp_l3dst_l4dst = { @@ -2949,16 +2317,6 @@ mac_ipv6_udp_l3dst_l4dst = { # 'action': {'check_hash_same': 'ipv4_udp_vxlan_ipv6_udp'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv6_udp_toeplitz_basic_pkt['ipv6-udp'], - 'action': {'check_hash_different': 'ipv6-udp'}, - }, - # { - # 'send_packet': mac_ipv6_udp_toeplitz_basic_pkt['ipv4_udp_vxlan_ipv6_udp'], - # 'action': {'check_hash_different': 'ipv4_udp_vxlan_ipv6_udp'}, - # }, - ], } mac_ipv6_udp_l4_src = { @@ -2991,16 +2349,6 @@ mac_ipv6_udp_l4_src = { # 'action': {'check_hash_same': 'ipv4_udp_vxlan_ipv6_udp'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv6_udp_toeplitz_basic_pkt['ipv6-udp'], - 'action': {'check_hash_different': 'ipv6-udp'}, - }, - # { - # 'send_packet': mac_ipv6_udp_toeplitz_basic_pkt['ipv4_udp_vxlan_ipv6_udp'], - # 'action': {'check_hash_different': 'ipv4_udp_vxlan_ipv6_udp'}, - # }, - ], } mac_ipv6_udp_l4_dst = { @@ -3033,16 +2381,6 @@ mac_ipv6_udp_l4_dst = { # 'action': {'check_hash_same': 'ipv4_udp_vxlan_ipv6_udp'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv6_udp_toeplitz_basic_pkt['ipv6-udp'], - 'action': {'check_hash_different': 'ipv6-udp'}, - }, - # { - # 'send_packet': mac_ipv6_udp_toeplitz_basic_pkt['ipv4_udp_vxlan_ipv6_udp'], - # 'action': {'check_hash_different': 'ipv4_udp_vxlan_ipv6_udp'}, - # }, - ], } mac_ipv6_udp_all = { @@ -3095,16 +2433,6 @@ mac_ipv6_udp_all = { # 'action': {'check_hash_different': 'ipv4_udp_vxlan_ipv6_udp'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv6_udp_toeplitz_basic_pkt['ipv6-udp'], - 'action': {'check_hash_different': 'ipv6-udp'}, - }, - # { - # 'send_packet': mac_ipv6_udp_toeplitz_basic_pkt['ipv4_udp_vxlan_ipv6_udp'], - # 'action': {'check_hash_different': 'ipv4_udp_vxlan_ipv6_udp'}, - # }, - ], } # mac_ipv6_tcp mac_ipv6_tcp_l2_src = { @@ -3125,12 +2453,6 @@ mac_ipv6_tcp_l2_src = { 'action': {'check_hash_same': 'ipv6-tcp'}, }, ], - 'post-test': [ - { - 'send_packet': mac_ipv6_tcp_toeplitz_basic_pkt['ipv6-tcp'], - 'action': {'check_hash_different': 'ipv6-tcp'}, - }, - ], } mac_ipv6_tcp_l2_dst = { @@ -3147,12 +2469,6 @@ mac_ipv6_tcp_l2_dst = { 'action': {'check_hash_same': 'ipv6-tcp'}, }, ], - 'post-test': [ - { - 'send_packet': mac_ipv6_tcp_toeplitz_basic_pkt['ipv6-tcp'], - 'action': {'check_hash_different': 'ipv6-tcp'}, - }, - ], } mac_ipv6_tcp_l2src_l2dst = { @@ -3173,12 +2489,6 @@ mac_ipv6_tcp_l2src_l2dst = { 'action': {'check_hash_same': 'ipv6-tcp'}, }, ], - 'post-test': [ - { - 'send_packet': mac_ipv6_tcp_toeplitz_basic_pkt['ipv6-tcp'], - 'action': {'check_hash_different': 'ipv6-tcp'}, - }, - ], } mac_ipv6_tcp_l3_src = { @@ -3211,16 +2521,6 @@ mac_ipv6_tcp_l3_src = { # 'action': {'check_hash_same': 'ipv4_tcp_vxlan_ipv6_tcp'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv6_tcp_toeplitz_basic_pkt['ipv6-tcp'], - 'action': {'check_hash_different': 'ipv6-tcp'}, - }, - # { - # 'send_packet': mac_ipv6_tcp_toeplitz_basic_pkt['ipv4_tcp_vxlan_ipv6_tcp'], - # 'action': {'check_hash_different': 'ipv4_tcp_vxlan_ipv6_tcp'}, - # }, - ], } mac_ipv6_tcp_l3_dst = { @@ -3253,16 +2553,6 @@ mac_ipv6_tcp_l3_dst = { # 'action': {'check_hash_same': 'ipv4_tcp_vxlan_ipv6_tcp'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv6_tcp_toeplitz_basic_pkt['ipv6-tcp'], - 'action': {'check_hash_different': 'ipv6-tcp'}, - }, - # { - # 'send_packet': mac_ipv6_tcp_toeplitz_basic_pkt['ipv4_tcp_vxlan_ipv6_tcp'], - # 'action': {'check_hash_different': 'ipv4_tcp_vxlan_ipv6_tcp'}, - # }, - ], } mac_ipv6_tcp_l3src_l4src = { @@ -3295,16 +2585,6 @@ mac_ipv6_tcp_l3src_l4src = { # 'action': {'check_hash_same': 'ipv4_tcp_vxlan_ipv6_tcp'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv6_tcp_toeplitz_basic_pkt['ipv6-tcp'], - 'action': {'check_hash_different': 'ipv6-tcp'}, - }, - # { - # 'send_packet': mac_ipv6_tcp_toeplitz_basic_pkt['ipv4_tcp_vxlan_ipv6_tcp'], - # 'action': {'check_hash_different': 'ipv4_tcp_vxlan_ipv6_tcp'}, - # }, - ], } mac_ipv6_tcp_l3src_l4dst = { @@ -3337,16 +2617,6 @@ mac_ipv6_tcp_l3src_l4dst = { # 'action': {'check_hash_same': 'ipv4_tcp_vxlan_ipv6_tcp'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv6_tcp_toeplitz_basic_pkt['ipv6-tcp'], - 'action': {'check_hash_different': 'ipv6-tcp'}, - }, - # { - # 'send_packet': mac_ipv6_tcp_toeplitz_basic_pkt['ipv4_tcp_vxlan_ipv6_tcp'], - # 'action': {'check_hash_different': 'ipv4_tcp_vxlan_ipv6_tcp'}, - # }, - ], } mac_ipv6_tcp_l3dst_l4src = { @@ -3379,16 +2649,6 @@ mac_ipv6_tcp_l3dst_l4src = { # 'action': {'check_hash_same': 'ipv4_tcp_vxlan_ipv6_tcp'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv6_tcp_toeplitz_basic_pkt['ipv6-tcp'], - 'action': {'check_hash_different': 'ipv6-tcp'}, - }, - # { - # 'send_packet': mac_ipv6_tcp_toeplitz_basic_pkt['ipv4_tcp_vxlan_ipv6_tcp'], - # 'action': {'check_hash_different': 'ipv4_tcp_vxlan_ipv6_tcp'}, - # }, - ], } mac_ipv6_tcp_l3dst_l4dst = { @@ -3421,16 +2681,6 @@ mac_ipv6_tcp_l3dst_l4dst = { # 'action': {'check_hash_same': 'ipv4_tcp_vxlan_ipv6_tcp'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv6_tcp_toeplitz_basic_pkt['ipv6-tcp'], - 'action': {'check_hash_different': 'ipv6-tcp'}, - }, - # { - # 'send_packet': mac_ipv6_tcp_toeplitz_basic_pkt['ipv4_tcp_vxlan_ipv6_tcp'], - # 'action': {'check_hash_different': 'ipv4_tcp_vxlan_ipv6_tcp'}, - # }, - ], } mac_ipv6_tcp_l4_src = { @@ -3463,16 +2713,6 @@ mac_ipv6_tcp_l4_src = { # 'action': {'check_hash_same': 'ipv4_tcp_vxlan_ipv6_tcp'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv6_tcp_toeplitz_basic_pkt['ipv6-tcp'], - 'action': {'check_hash_different': 'ipv6-tcp'}, - }, - # { - # 'send_packet': mac_ipv6_tcp_toeplitz_basic_pkt['ipv4_tcp_vxlan_ipv6_tcp'], - # 'action': {'check_hash_different': 'ipv4_tcp_vxlan_ipv6_tcp'}, - # }, - ], } mac_ipv6_tcp_l4_dst = { @@ -3505,16 +2745,6 @@ mac_ipv6_tcp_l4_dst = { # 'action': {'check_hash_same': 'ipv4_tcp_vxlan_ipv6_tcp'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv6_tcp_toeplitz_basic_pkt['ipv6-tcp'], - 'action': {'check_hash_different': 'ipv6-tcp'}, - }, - # { - # 'send_packet': mac_ipv6_tcp_toeplitz_basic_pkt['ipv4_tcp_vxlan_ipv6_tcp'], - # 'action': {'check_hash_different': 'ipv4_tcp_vxlan_ipv6_tcp'}, - # }, - ], } mac_ipv6_tcp_all = { @@ -3567,16 +2797,6 @@ mac_ipv6_tcp_all = { # 'action': {'check_hash_different': 'ipv4_tcp_vxlan_ipv6_tcp'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv6_tcp_toeplitz_basic_pkt['ipv6-tcp'], - 'action': {'check_hash_different': 'ipv6-tcp'}, - }, - # { - # 'send_packet': mac_ipv6_tcp_toeplitz_basic_pkt['ipv4_tcp_vxlan_ipv6_tcp'], - # 'action': {'check_hash_different': 'ipv4_tcp_vxlan_ipv6_tcp'}, - # }, - ], } # mac_ipv6_sctp mac_ipv6_sctp_l2_src = { @@ -3597,12 +2817,6 @@ mac_ipv6_sctp_l2_src = { 'action': {'check_hash_same': 'ipv6-sctp'}, }, ], - 'post-test': [ - { - 'send_packet': mac_ipv6_sctp_toeplitz_basic_pkt['ipv6-sctp'], - 'action': {'check_hash_different': 'ipv6-sctp'}, - }, - ], } mac_ipv6_sctp_l2_dst = { @@ -3619,12 +2833,6 @@ mac_ipv6_sctp_l2_dst = { 'action': {'check_hash_same': 'ipv6-sctp'}, }, ], - 'post-test': [ - { - 'send_packet': mac_ipv6_sctp_toeplitz_basic_pkt['ipv6-sctp'], - 'action': {'check_hash_different': 'ipv6-sctp'}, - }, - ], } mac_ipv6_sctp_l2src_l2dst = { @@ -3645,12 +2853,6 @@ mac_ipv6_sctp_l2src_l2dst = { 'action': {'check_hash_same': 'ipv6-sctp'}, }, ], - 'post-test': [ - { - 'send_packet': mac_ipv6_sctp_toeplitz_basic_pkt['ipv6-sctp'], - 'action': {'check_hash_different': 'ipv6-sctp'}, - }, - ], } mac_ipv6_sctp_l3_src = { @@ -3683,16 +2885,6 @@ mac_ipv6_sctp_l3_src = { # 'action': {'check_hash_same': 'ipv4_sctp_vxlan_ipv6_sctp'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv6_sctp_toeplitz_basic_pkt['ipv6-sctp'], - 'action': {'check_hash_different': 'ipv6-sctp'}, - }, - # { - # 'send_packet': mac_ipv6_sctp_toeplitz_basic_pkt['ipv4_sctp_vxlan_ipv6_sctp'], - # 'action': {'check_hash_different': 'ipv4_sctp_vxlan_ipv6_sctp'}, - # }, - ], } mac_ipv6_sctp_l3_dst = { @@ -3725,16 +2917,6 @@ mac_ipv6_sctp_l3_dst = { # 'action': {'check_hash_same': 'ipv4_sctp_vxlan_ipv6_sctp'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv6_sctp_toeplitz_basic_pkt['ipv6-sctp'], - 'action': {'check_hash_different': 'ipv6-sctp'}, - }, - # { - # 'send_packet': mac_ipv6_sctp_toeplitz_basic_pkt['ipv4_sctp_vxlan_ipv6_sctp'], - # 'action': {'check_hash_different': 'ipv4_sctp_vxlan_ipv6_sctp'}, - # }, - ], } mac_ipv6_sctp_l3src_l4src = { @@ -3767,16 +2949,6 @@ mac_ipv6_sctp_l3src_l4src = { # 'action': {'check_hash_same': 'ipv4_sctp_vxlan_ipv6_sctp'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv6_sctp_toeplitz_basic_pkt['ipv6-sctp'], - 'action': {'check_hash_different': 'ipv6-sctp'}, - }, - # { - # 'send_packet': mac_ipv6_sctp_toeplitz_basic_pkt['ipv4_sctp_vxlan_ipv6_sctp'], - # 'action': {'check_hash_different': 'ipv4_sctp_vxlan_ipv6_sctp'}, - # }, - ], } mac_ipv6_sctp_l3src_l4dst = { @@ -3809,16 +2981,6 @@ mac_ipv6_sctp_l3src_l4dst = { # 'action': {'check_hash_same': 'ipv4_sctp_vxlan_ipv6_sctp'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv6_sctp_toeplitz_basic_pkt['ipv6-sctp'], - 'action': {'check_hash_different': 'ipv6-sctp'}, - }, - # { - # 'send_packet': mac_ipv6_sctp_toeplitz_basic_pkt['ipv4_sctp_vxlan_ipv6_sctp'], - # 'action': {'check_hash_different': 'ipv4_sctp_vxlan_ipv6_sctp'}, - # }, - ], } mac_ipv6_sctp_l3dst_l4src = { @@ -3851,16 +3013,6 @@ mac_ipv6_sctp_l3dst_l4src = { # 'action': {'check_hash_same': 'ipv4_sctp_vxlan_ipv6_sctp'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv6_sctp_toeplitz_basic_pkt['ipv6-sctp'], - 'action': {'check_hash_different': 'ipv6-sctp'}, - }, - # { - # 'send_packet': mac_ipv6_sctp_toeplitz_basic_pkt['ipv4_sctp_vxlan_ipv6_sctp'], - # 'action': {'check_hash_different': 'ipv4_sctp_vxlan_ipv6_sctp'}, - # }, - ], } mac_ipv6_sctp_l3dst_l4dst = { @@ -3893,16 +3045,6 @@ mac_ipv6_sctp_l3dst_l4dst = { # 'action': {'check_hash_same': 'ipv4_sctp_vxlan_ipv6_sctp'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv6_sctp_toeplitz_basic_pkt['ipv6-sctp'], - 'action': {'check_hash_different': 'ipv6-sctp'}, - }, - # { - # 'send_packet': mac_ipv6_sctp_toeplitz_basic_pkt['ipv4_sctp_vxlan_ipv6_sctp'], - # 'action': {'check_hash_different': 'ipv4_sctp_vxlan_ipv6_sctp'}, - # }, - ], } mac_ipv6_sctp_l4_src = { @@ -3935,16 +3077,6 @@ mac_ipv6_sctp_l4_src = { # 'action': {'check_hash_same': 'ipv4_sctp_vxlan_ipv6_sctp'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv6_sctp_toeplitz_basic_pkt['ipv6-sctp'], - 'action': {'check_hash_different': 'ipv6-sctp'}, - }, - # { - # 'send_packet': mac_ipv6_sctp_toeplitz_basic_pkt['ipv4_sctp_vxlan_ipv6_sctp'], - # 'action': {'check_hash_different': 'ipv4_sctp_vxlan_ipv6_sctp'}, - # }, - ], } mac_ipv6_sctp_l4_dst = { @@ -3977,16 +3109,6 @@ mac_ipv6_sctp_l4_dst = { # 'action': {'check_hash_same': 'ipv4_sctp_vxlan_ipv6_sctp'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv6_sctp_toeplitz_basic_pkt['ipv6-sctp'], - 'action': {'check_hash_different': 'ipv6-sctp'}, - }, - # { - # 'send_packet': mac_ipv6_sctp_toeplitz_basic_pkt['ipv4_sctp_vxlan_ipv6_sctp'], - # 'action': {'check_hash_different': 'ipv4_sctp_vxlan_ipv6_sctp'}, - # }, - ], } mac_ipv6_sctp_all = { @@ -4039,16 +3161,6 @@ mac_ipv6_sctp_all = { # 'action': {'check_hash_different': 'ipv4_sctp_vxlan_ipv6_sctp'}, # }, ], - 'post-test': [ - { - 'send_packet': mac_ipv6_sctp_toeplitz_basic_pkt['ipv6-sctp'], - 'action': {'check_hash_different': 'ipv6-sctp'}, - }, - # { - # 'send_packet': mac_ipv6_sctp_toeplitz_basic_pkt['ipv4_sctp_vxlan_ipv6_sctp'], - # 'action': {'check_hash_different': 'ipv4_sctp_vxlan_ipv6_sctp'}, - # }, - ], } # toeplitz related data end @@ -4190,7 +3302,7 @@ mac_ipv4_symmetric = { }, { 'send_packet': 'Ether(dst="%s", src="68:05:CA:BB:26:E0")/IP(dst="192.168.0.2", src="192.168.0.1")/("X"*480)' % vf0_mac, - 'action': {'check_no_hash_or_different': 'ipv4-nonfrag-post'}, + 'action': {'check_hash_different': 'ipv4-nonfrag-post'}, }, { 'send_packet': 'Ether(dst="%s", src="68:05:CA:BB:26:E0")/IP(dst="192.168.0.1", src="192.168.0.2",frag=6)/("X"*480)' % vf0_mac, @@ -4198,7 +3310,7 @@ mac_ipv4_symmetric = { }, { 'send_packet': 'Ether(dst="%s", src="68:05:CA:BB:26:E0")/IP(dst="192.168.0.2", src="192.168.0.1",frag=6)/("X"*480)' % vf0_mac, - 'action': {'check_no_hash_or_different': 'ipv4-frag-post'}, + 'action': {'check_hash_different': 'ipv4-frag-post'}, }, { 'send_packet': 'Ether(dst="%s", src="68:05:CA:BB:26:E0")/IP(dst="192.168.0.1", src="192.168.0.2")/ICMP()/("X"*480)' % vf0_mac, @@ -4206,7 +3318,7 @@ mac_ipv4_symmetric = { }, { 'send_packet': 'Ether(dst="%s", src="68:05:CA:BB:26:E0")/IP(dst="192.168.0.2", src="192.168.0.1")/ICMP()/("X"*480)' % vf0_mac, - 'action': {'check_no_hash_or_different': 'ipv4-icmp-post'}, + 'action': {'check_hash_different': 'ipv4-icmp-post'}, }, { 'send_packet': 'Ether(dst="%s", src="68:05:CA:BB:26:E0")/IP(dst="192.168.0.1", src="192.168.0.2")/TCP(sport=22,dport=23)/("X"*480)' % vf0_mac, @@ -4214,7 +3326,7 @@ mac_ipv4_symmetric = { }, { 'send_packet': 'Ether(dst="%s", src="68:05:CA:BB:26:E0")/IP(dst="192.168.0.2", src="192.168.0.1")/TCP(sport=22,dport=23)/("X"*480)' % vf0_mac, - 'action': {'check_no_hash_or_different': 'ipv4-tcp-post'}, + 'action': {'check_hash_different': 'ipv4-tcp-post'}, }, # { # 'send_packet': 'Ether(dst="%s", src="68:05:CA:BB:26:E0")/IP()/UDP()/VXLAN()/Ether()/IP(dst="192.168.0.1", src="192.168.0.2")/UDP(sport=22,dport=23)/("X"*480)' % vf0_mac, @@ -4322,15 +3434,15 @@ mac_ipv4_udp_symmetric = { }, { 'send_packet': 'Ether(dst="%s", src="68:05:CA:BB:26:E0")/IP(dst="192.168.0.2", src="192.168.0.1")/UDP(sport=22,dport=23)/("X"*480)' % vf0_mac, - 'action': {'check_no_hash_or_different': 'ipv4-udp-post'}, + 'action': {'check_hash_different': 'ipv4-udp-post'}, }, { 'send_packet': 'Ether(dst="%s", src="68:05:CA:BB:26:E0")/IP(dst="192.168.0.1", src="192.168.0.2")/UDP(sport=23,dport=22)/("X"*480)' % vf0_mac, - 'action': {'check_no_hash_or_different': 'ipv4-udp-post'}, + 'action': {'check_hash_different': 'ipv4-udp-post'}, }, { 'send_packet': 'Ether(dst="%s", src="68:05:CA:BB:26:E0")/IP(dst="192.168.0.2", src="192.168.0.1")/UDP(sport=23,dport=22)/("X"*480)' % vf0_mac, - 'action': {'check_no_hash_or_different': 'ipv4-udp-post'}, + 'action': {'check_hash_different': 'ipv4-udp-post'}, }, # { # 'send_packet': 'Ether(dst="%s", src="68:05:CA:BB:26:E0")/IP()/NVGRE()/Ether()/IP(dst="192.168.0.1", src="192.168.0.2")/UDP(sport=22,dport=23)/("X"*480)' % vf0_mac, @@ -4446,15 +3558,15 @@ mac_ipv4_tcp_symmetric = { }, { 'send_packet': 'Ether(dst="%s", src="68:05:CA:BB:26:E0")/IP(dst="192.168.0.2", src="192.168.0.1")/TCP(sport=22,dport=23)/("X"*480)' % vf0_mac, - 'action': {'check_no_hash_or_different': 'ipv4-tcp-post'}, + 'action': {'check_hash_different': 'ipv4-tcp-post'}, }, { 'send_packet': 'Ether(dst="%s", src="68:05:CA:BB:26:E0")/IP(dst="192.168.0.1", src="192.168.0.2")/TCP(sport=23,dport=22)/("X"*480)' % vf0_mac, - 'action': {'check_no_hash_or_different': 'ipv4-tcp-post'}, + 'action': {'check_hash_different': 'ipv4-tcp-post'}, }, { 'send_packet': 'Ether(dst="%s", src="68:05:CA:BB:26:E0")/IP(dst="192.168.0.2", src="192.168.0.1")/TCP(sport=23,dport=22)/("X"*480)' % vf0_mac, - 'action': {'check_no_hash_or_different': 'ipv4-tcp-post'}, + 'action': {'check_hash_different': 'ipv4-tcp-post'}, }, # { # 'send_packet': 'Ether(dst="%s", src="68:05:CA:BB:26:E0")/IP()/NVGRE()/Ether()/IP(dst="192.168.0.1", src="192.168.0.2")/TCP(sport=22,dport=23)/("X"*480)' % vf0_mac, @@ -4562,15 +3674,15 @@ mac_ipv4_sctp_symmetric = { }, { 'send_packet': 'Ether(dst="%s", src="68:05:CA:BB:26:E0")/IP(dst="192.168.0.2", src="192.168.0.1")/SCTP(sport=22,dport=23)/("X"*480)' % vf0_mac, - 'action': {'check_no_hash_or_different': 'ipv4-sctp-post'}, + 'action': {'check_hash_different': 'ipv4-sctp-post'}, }, { 'send_packet': 'Ether(dst="%s", src="68:05:CA:BB:26:E0")/IP(dst="192.168.0.1", src="192.168.0.2")/SCTP(sport=23,dport=22)/("X"*480)' % vf0_mac, - 'action': {'check_no_hash_or_different': 'ipv4-sctp-post'}, + 'action': {'check_hash_different': 'ipv4-sctp-post'}, }, { 'send_packet': 'Ether(dst="%s", src="68:05:CA:BB:26:E0")/IP(dst="192.168.0.2", src="192.168.0.1")/SCTP(sport=23,dport=22)/("X"*480)' % vf0_mac, - 'action': {'check_no_hash_or_different': 'ipv4-sctp-post'}, + 'action': {'check_hash_different': 'ipv4-sctp-post'}, }, # { # 'send_packet': 'Ether(dst="%s", src="68:05:CA:BB:26:E0")/IP()/NVGRE()/Ether()/IP(dst="192.168.0.1", src="192.168.0.2")/SCTP(sport=22,dport=23)/("X"*480)' % vf0_mac, @@ -4694,7 +3806,7 @@ mac_ipv6_symmetric = { }, { 'send_packet': 'Ether(dst="%s", src="68:05:CA:BB:26:E0")/IPv6(dst="ABAB:910B:6666:3457:8295:3333:1800:2929",src="CDCD:910A:2222:5498:8475:1111:3900:2020")/("X"*480)' % vf0_mac, - 'action': {'check_no_hash_or_different': 'ipv6-nonfrag-post'}, + 'action': {'check_hash_different': 'ipv6-nonfrag-post'}, }, { 'send_packet': 'Ether(dst="%s", src="68:05:CA:BB:26:E0")/IPv6(src="ABAB:910B:6666:3457:8295:3333:1800:2929",dst="CDCD:910A:2222:5498:8475:1111:3900:2020")/IPv6ExtHdrFragment()/("X"*480)' % vf0_mac, @@ -4702,7 +3814,7 @@ mac_ipv6_symmetric = { }, { 'send_packet': 'Ether(dst="%s", src="68:05:CA:BB:26:E0")/IPv6(dst="ABAB:910B:6666:3457:8295:3333:1800:2929",src="CDCD:910A:2222:5498:8475:1111:3900:2020")/IPv6ExtHdrFragment()/("X"*480)' % vf0_mac, - 'action': {'check_no_hash_or_different': 'ipv6-frag-post'}, + 'action': {'check_hash_different': 'ipv6-frag-post'}, }, { 'send_packet': 'Ether(dst="%s", src="68:05:CA:BB:26:E0")/IPv6(src="ABAB:910B:6666:3457:8295:3333:1800:2929",dst="CDCD:910A:2222:5498:8475:1111:3900:2020")/ICMP()/("X"*480)' % vf0_mac, @@ -4710,7 +3822,7 @@ mac_ipv6_symmetric = { }, { 'send_packet': 'Ether(dst="%s", src="68:05:CA:BB:26:E0")/IPv6(dst="ABAB:910B:6666:3457:8295:3333:1800:2929",src="CDCD:910A:2222:5498:8475:1111:3900:2020")/ICMP()/("X"*480)' % vf0_mac, - 'action': {'check_no_hash_or_different': 'ipv6-icmp-post'}, + 'action': {'check_hash_different': 'ipv6-icmp-post'}, }, { 'send_packet': 'Ether(dst="%s", src="68:05:CA:BB:26:E0")/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)' % vf0_mac, @@ -4718,7 +3830,7 @@ mac_ipv6_symmetric = { }, { 'send_packet': 'Ether(dst="%s", src="68:05:CA:BB:26:E0")/IPv6(dst="ABAB:910B:6666:3457:8295:3333:1800:2929",src="CDCD:910A:2222:5498:8475:1111:3900:2020")/UDP(sport=22,dport=23)/("X"*480)' % vf0_mac, - 'action': {'check_no_hash_or_different': 'ipv6-udp-post'}, + 'action': {'check_hash_different': 'ipv6-udp-post'}, }, # { # 'send_packet': 'Ether(dst="%s", src="68:05:CA:BB:26:E0")/IP()/UDP()/VXLAN()/Ether()/IPv6(src="ABAB:910B:6666:3457:8295:3333:1800:2929",dst="CDCD:910A:2222:5498:8475:1111:3900:2020")/("X"*480)' % vf0_mac, @@ -4794,7 +3906,7 @@ mac_ipv6_udp_symmetric = { }, { 'send_packet': 'Ether(dst="%s", src="68:05:CA:BB:26:E0")/IPv6(dst="ABAB:910B:6666:3457:8295:3333:1800:2929",src="CDCD:910A:2222:5498:8475:1111:3900:2020")/UDP(sport=22,dport=23)/("X"*480)' % vf0_mac, - 'action': {'check_no_hash_or_different': 'ipv6-udp-post'}, + 'action': {'check_hash_different': 'ipv6-udp-post'}, }, # { # 'send_packet': 'Ether(dst="%s", src="68:05:CA:BB:26:E0")/IP()/NVGRE()/Ether()/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)' % vf0_mac, @@ -4854,14 +3966,14 @@ mac_ipv6_tcp_symmetric = { 'send_packet': 'Ether(dst="%s", src="68:05:CA:BB:26:E0")/IPv6(dst="ABAB:910B:6666:3457:8295:3333:1800:2929",src="CDCD:910A:2222:5498:8475:1111:3900:2020")/UDP(sport=22,dport=23)/("X"*480)' % vf0_mac, 'action': {'check_hash_different': 'ipv6-udp'}, }, - { - 'send_packet': 'Ether(dst="%s", src="68:05:CA:BB:26:E0")/IP()/NVGRE()/Ether()/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)' % vf0_mac, - 'action': {'save_hash': 'nvgre-eth-ipv6-udp'}, - }, - { - 'send_packet': 'Ether(dst="%s", src="68:05:CA:BB:26:E0")/IP()/NVGRE()/Ether()/IPv6(dst="ABAB:910B:6666:3457:8295:3333:1800:2929",src="CDCD:910A:2222:5498:8475:1111:3900:2020")/UDP(sport=22,dport=23)/("X"*480)' % vf0_mac, - 'action': {'check_hash_different': 'nvgre-eth-ipv6-udp'}, - }, + # { + # 'send_packet': 'Ether(dst="%s", src="68:05:CA:BB:26:E0")/IP()/NVGRE()/Ether()/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)' % vf0_mac, + # 'action': {'save_hash': 'nvgre-eth-ipv6-udp'}, + # }, + # { + # 'send_packet': 'Ether(dst="%s", src="68:05:CA:BB:26:E0")/IP()/NVGRE()/Ether()/IPv6(dst="ABAB:910B:6666:3457:8295:3333:1800:2929",src="CDCD:910A:2222:5498:8475:1111:3900:2020")/UDP(sport=22,dport=23)/("X"*480)' % vf0_mac, + # 'action': {'check_hash_different': 'nvgre-eth-ipv6-udp'}, + # }, ], 'post-test': [ { @@ -4870,7 +3982,7 @@ mac_ipv6_tcp_symmetric = { }, { 'send_packet': 'Ether(dst="%s", src="68:05:CA:BB:26:E0")/IPv6(dst="ABAB:910B:6666:3457:8295:3333:1800:2929",src="CDCD:910A:2222:5498:8475:1111:3900:2020")/TCP(sport=22,dport=23)/("X"*480)' % vf0_mac, - 'action': {'check_no_hash_or_different': 'ipv6-tcp-post'}, + 'action': {'check_hash_different': 'ipv6-tcp-post'}, }, # { # 'send_packet': 'Ether(dst="%s", src="68:05:CA:BB:26:E0")/IP()/NVGRE()/Ether()/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)' % vf0_mac, @@ -4938,7 +4050,7 @@ mac_ipv6_sctp_symmetric = { }, { 'send_packet': 'Ether(dst="%s", src="68:05:CA:BB:26:E0")/IPv6(dst="ABAB:910B:6666:3457:8295:3333:1800:2929",src="CDCD:910A:2222:5498:8475:1111:3900:2020")/SCTP(sport=22,dport=23)/("X"*480)' % vf0_mac, - 'action': {'check_no_hash_or_different': 'ipv6-sctp-post'}, + 'action': {'check_hash_different': 'ipv6-sctp-post'}, }, # { # 'send_packet': 'Ether(dst="%s", src="68:05:CA:BB:26:E0")/IP()/NVGRE()/Ether()/IPv6(src="ABAB:910B:6666:3457:8295:3333:1800:2929",dst="CDCD:910A:2222:5498:8475:1111:3900:2020")/SCTP(sport=22,dport=23)/("X"*480)' % vf0_mac, @@ -4978,12 +4090,6 @@ ipv6_64bit_prefix_l3_src_only = { 'action': {'check_hash_same': 'ipv6-64bit'}, }, ], - 'post-test': [ - { - 'send_packet': 'Ether(dst="%s")/IPv6(src="fe81:1:a6bf:1ff:fe1c::806", dst="fe82:1:a6bf:1ff:fe1c::806")/Raw("x"*64)' % vf0_mac, - 'action': {'check_no_hash_or_different': 'ipv6-64bit'}, - }, - ], } ipv6_64bit_prefix_l3_dst_only = { @@ -5012,12 +4118,6 @@ ipv6_64bit_prefix_l3_dst_only = { 'action': {'check_hash_same': 'ipv6-64bit'}, }, ], - 'post-test': [ - { - 'send_packet': 'Ether(dst="%s")/IPv6(src="fe81:1:a6bf:1ff:fe1c::806", dst="fe82:1:a6bf:1ff:fe1c::806")/Raw("x"*64)' % vf0_mac, - 'action': {'check_no_hash_or_different': 'ipv6-64bit'}, - }, - ], } ipv6_64bit_prefix_l3_src_dst_only = { @@ -5046,12 +4146,6 @@ ipv6_64bit_prefix_l3_src_dst_only = { 'action': {'check_hash_same': 'ipv6-64bit'}, }, ], - 'post-test': [ - { - 'send_packet': 'Ether(dst="%s")/IPv6(src="fe81:1:a6bf:1ff:fe1c::806", dst="fe82:1:a6bf:1ff:fe1c::806")/Raw("x"*64)' % vf0_mac, - 'action': {'check_no_hash_or_different': 'ipv6-64bit'}, - }, - ], } ipv6_64bit_prefix = [ipv6_64bit_prefix_l3_src_only, ipv6_64bit_prefix_l3_dst_only, ipv6_64bit_prefix_l3_src_dst_only] @@ -5080,8 +4174,10 @@ class AdvancedIavfRSSTest(TestCase): self.vf_flag = False self.create_iavf() - self.pass_flag = 'passed' - self.fail_flag = 'failed' + def set_up(self): + """ + Run before each test case. + """ self.pkt = Packet() self.pmd_output = PmdOutput(self.dut) self.launch_testpmd() @@ -5090,10 +4186,6 @@ class AdvancedIavfRSSTest(TestCase): self.logger.info('rssprocess.tester_ifaces: {}'.format(self.rssprocess.tester_ifaces)) self.logger.info('rssprocess.test_case: {}'.format(self.rssprocess.test_case)) - def set_up(self): - """ - Run before each test case. - """ self.pmd_output.execute_cmd("start") def create_iavf(self): @@ -5231,25 +4323,6 @@ class AdvancedIavfRSSTest(TestCase): }, ] self.rssprocess.handle_tests(tests, 0) - self.rssprocess.destroy_rule(port_id=0, rule_id=rule_id_1) - self.rssprocess.check_rule(port_id=0) - tests = [ - { - 'send_packet': 'Ether(dst="%s")/IP(src="192.168.0.3",dst="192.168.0.5")/UDP(dport=45)/Raw("x"*480)' % vf0_mac, - 'action': {'save_hash': 'ipv4-udp'}, - }, - { - 'send_packet': 'Ether(dst="%s")/IP(src="192.168.0.3",dst="192.168.0.9")/UDP(dport=45)/Raw("x"*480)' % vf0_mac, - 'action': {'check_hash_different': 'ipv4-udp'}, - }, - { - 'send_packet': 'Ether(dst="%s")/IP(src="192.168.0.7",dst="192.168.0.9")/UDP(dport=45)/Raw("x"*480)' % vf0_mac, - 'action': {'check_hash_different': 'ipv4-udp'}, - }, - ] - self.rssprocess.handle_tests(tests, 0) - #self.rssprocess.destroy_rule(port_id=0, rule_id=rule_id_0) - self.rssprocess.handle_tests(tests, 0) self.dut.send_command("flow flush 0", timeout=1) # Subcase 2: two rules with same pattern but different hash input set, hit default profile @@ -5292,16 +4365,6 @@ class AdvancedIavfRSSTest(TestCase): }, ] self.rssprocess.handle_tests(tests, 0) - self.rssprocess.destroy_rule(port_id=0, rule_id=rule_id_1) - self.rssprocess.check_rule(port_id=0) - tests = [ - { - 'send_packet': 'Ether(dst="%s")/IP(src="192.168.0.3",dst="192.168.0.5")/Raw("x"*480)' % vf0_mac, - 'action': {'check_no_hash': 'ipv4-pay'}, - }, - ] - self.rssprocess.handle_tests(tests, 0) - #self.rssprocess.destroy_rule(port_id=0, rule_id=rule_id_0) self.dut.send_command("flow flush 0", timeout=1) # Subcase 3: two rules, scope smaller created first, and the larger one created later @@ -5344,16 +4407,6 @@ class AdvancedIavfRSSTest(TestCase): }, ] self.rssprocess.handle_tests(tests, 0) - self.rssprocess.destroy_rule(port_id=0, rule_id=rule_id_1) - self.rssprocess.handle_tests(tests_3, 0) - #self.rssprocess.destroy_rule(port_id=0, rule_id=rule_id_0) - tests = [ - { - 'send_packet': 'Ether(dst="%s")/IP(src="192.168.0.3",dst="192.168.0.5")/UDP(sport=23, dport=45)/Raw("x"*480)' % vf0_mac, - 'action': {'check_no_hash': 'ipv4-udp-pay'}, - }, - ] - self.rssprocess.handle_tests(tests, 0) self.dut.send_command("flow flush 0", timeout=1) # Subcase 4: two rules, scope larger created first, and the smaller one created later @@ -5396,16 +4449,6 @@ class AdvancedIavfRSSTest(TestCase): }, ] self.rssprocess.handle_tests(tests, 0) - self.rssprocess.destroy_rule(port_id=0, rule_id=rule_id_1) - self.rssprocess.handle_tests(tests_4, 0) - #self.rssprocess.destroy_rule(port_id=0, rule_id=rule_id_0) - tests = [ - { - 'send_packet': 'Ether(dst="%s")/IP(src="192.168.0.3",dst="192.168.0.5")/UDP(sport=23, dport=45)/Raw("x"*480)' % vf0_mac, - 'action': {'check_no_hash': 'ipv4-udp-pay'}, - }, - ] - self.rssprocess.handle_tests(tests, 0) self.verify(not self.rssprocess.error_msgs, 'some subcases failed') def tear_down(self): @@ -5413,6 +4456,7 @@ class AdvancedIavfRSSTest(TestCase): self.dut.send_command("flow flush 0", timeout=1) self.dut.send_command("clear port stats all", timeout=1) self.pmd_output.execute_cmd("stop") + self.pmd_output.execute_cmd("quit", "#") def tear_down_all(self): self.dut.kill_all()