From patchwork Mon Jul 23 10:33:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Machata X-Patchwork-Id: 10539867 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E11A7180E for ; Mon, 23 Jul 2018 10:33:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D04DB285C4 for ; Mon, 23 Jul 2018 10:33:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C3DFC285C9; Mon, 23 Jul 2018 10:33:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C7F78285C4 for ; Mon, 23 Jul 2018 10:33:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388038AbeGWLdv (ORCPT ); Mon, 23 Jul 2018 07:33:51 -0400 Received: from mail-db5eur01on0061.outbound.protection.outlook.com ([104.47.2.61]:35713 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2387962AbeGWLdv (ORCPT ); Mon, 23 Jul 2018 07:33:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=j5iIBbzoEPC9BxXbJO0uCM8AnY/7c8sIgUWw3f57iv4=; b=p5iD3SwAGnp7JniMtwUDB6Jg4mBZtV+B7acHArg6n3C6OgSc3TsPegnbBYtqWV1NjdGhHWitdrX0t/MJYY17/OFBWhdRC1aQRbLZg/PAh4ZcRDSSR8BYnWiIXasMndMvZZzvutkMRTGISVc56NzaEEgiSWcnpN8WYhfN/zwagJw= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=petrm@mellanox.com; Received: from t540p (78.45.160.211) by VI1PR05MB4190.eurprd05.prod.outlook.com (2603:10a6:803:4e::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.973.21; Mon, 23 Jul 2018 10:33:12 +0000 From: Petr Machata To: netdev@vger.kernel.org, linux-kselftest@vger.kernel.org Cc: davem@davemloft.net, shuah@kernel.org, idosch@mellanox.com, dsahern@gmail.com Subject: [PATCH net-next] selftests: forwarding: gre_multipath: Drop IPv6 tests Message-Id: Date: Mon, 23 Jul 2018 12:33:08 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 X-Originating-IP: [78.45.160.211] X-ClientProxiedBy: LO2P265CA0164.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:9::32) To VI1PR05MB4190.eurprd05.prod.outlook.com (2603:10a6:803:4e::16) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c85ea4a1-e2ab-4cad-b239-08d5f087b123 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989117)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600073)(711020)(4618075)(2017052603328)(7153060)(7193020);SRVR:VI1PR05MB4190; X-Microsoft-Exchange-Diagnostics: 1;VI1PR05MB4190;3:QO2fZHh6RzDoVnzXYepOd97HIkvATwtDkPf9tpY9rc4Uz5WuM5ngdWvJGlPpmdYzozQvSEMumcHlwd3p1nH/7OhTrdrK+RbP/BKfpo7fzKfLkhsJy8pqPmHR5Lz3+9B0l3FhFV4freLqGyfufvziC8jISKU0E4R1OzP5tsfH0/ojG6s84sHAkkNtOrasIeIg3agtjZcTS09/ofBP9D4+XB2NztqvcbVTIoyC/+VPEmi8mYlmHzQb8jlWrdUbCk/P;25:FOJL5g37TFkRyPKdHptePLB/QLiBM738oa3LL2OIlKeKNCiT9iEqwdPIRwy6IjQUuUomoRqI+jffEvT3cEaQ4nFkwgDwKhxzzax74r2jLnhlg1y7iCJReOo1GhUhTTFA4okkjmqcajGDffmZ+ZWkhcxuJ2wZwUpAaQED+pXExL0dSq5V1hevIzmDi3ASNJwmrbgwWVnmakr72cjEryUnVxcBXWzm5pYY2D/6yErc5DbIGfCl3LMgAJfcQW4PqXUwhLdDIqDBsjn1sHB18XJGMX2ORMA1u3rrtU9VAmKPv1X7Ek1i57VQMbjzd/+VGGJ3o4r+qSNuFl/TkrdrtloAow==;31:uUhHBkrmYTZjRsbYXhnwxbqdT/obiyS5KIA62KYko6VeSORLxTb6/1DcDIiT062Y7+iuSVVXNa2QcRhGu8x/ha27w5vcEOvlKgVvhFvEpFabVxOXBWfFUJip32dLD1duki3MoKWLXDjaT+cDx43uZ59Xz14lHLCIk8qwcEcT7wEPioaKWi1CxEO5qI6ELqpd3R5r3v8eXMfA+yO/Ze9pisStfv+ezLEPpqHfFsI0M8k= X-MS-TrafficTypeDiagnostic: VI1PR05MB4190: X-Microsoft-Exchange-Diagnostics: 1;VI1PR05MB4190;20:fkxBHXPwBzuP3AnEh1UmfAaiHy+iSBei3GmIwuv9ivkxD/NP3Y5T73HcbynWlXPyQzZm8ibCQMPcfTETlV7bwbcd3gkWdhTOUSrXdu0152y73Nm1DtwdEDHA/4UChAFAMR4rJC/Mkxy3jCtOssTWIyaaP97X7GOI+wsP2ioiPhtlYyEZHC1EbOMhW3CFtLUoaX7+9CW5GcNr01zKNz9M6L1kpmqFfu/rq18wWxIwBjRVmqGer06tzif2+eK0ZRvvorO5GukljZQaojJOIKJS2mmVp1RJrkONY19yZOMeh99lOqTHAwiY/U1Fd0c9imwg9mYuCdRY9ZlMwa6Plsv9fupEm1nl6hvS9dvaxzHk0NYH2D988fSHR80pxPWColFt8BMtzvorDgtoJboYA4dskCRmlFIxmsPkhwbxXo9j+VtKX+r6b/FWvB5x8eKHHKGFBpT8U6WHbCPTPEIoPjXTsAt7CcvSE1tw4e0caJ3bPaEq7Smf1wID8HsG37HiAiVS;4:tu6Os/HgcUEWM413XF4oS3V4vhGskwdP6jEUIp8Ixkq36Xljyzt3yT/inAzceujEjNpajamq3kLf4A9loHRfY7fVHlZJ3lzln+VRaIL16NabS6avfvetYPbq89RTf06eZx8ih05S5iwJGwyKXIljYcjD7Asd8gtR7RcQCwH5V6QDFSaIDnj3uvd0wWMjojlWthnJZ3vAqbLyJV1rg7I/96VCQZEVvElmVrtHvLxJZbjqZ9tMynqUDHNNs1l40k8Ap8A0Ub/EA+lIEkx1wN9g470SyD9X2Wrq+/15HHZmS0lrSt1HkJFHrT2e223L/Ten X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231311)(944501410)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(149027)(150027)(6041310)(20161123564045)(20161123562045)(20161123558120)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016);SRVR:VI1PR05MB4190;BCL:0;PCL:0;RULEID:;SRVR:VI1PR05MB4190; X-Forefront-PRVS: 0742443479 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(346002)(366004)(376002)(39860400002)(396003)(136003)(189003)(199004)(6116002)(478600001)(956004)(316002)(25786009)(305945005)(7736002)(3846002)(14444005)(53936002)(52116002)(51416003)(118296001)(386003)(39060400002)(66066001)(6486002)(47776003)(68736007)(5660300001)(36756003)(8936002)(105586002)(106356001)(50466002)(16586007)(8676002)(6666003)(81156014)(81166006)(4326008)(48376002)(58126008)(2906002)(26005)(97736004)(86362001)(186003)(16526019)(486006)(6496006)(476003)(2616005);DIR:OUT;SFP:1101;SCL:1;SRVR:VI1PR05MB4190;H:t540p;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1;VI1PR05MB4190;23:RAps4mdFxPj4ucRVV9HhRKElOpxyb914bj7vLNmrY77/hu1acQ9BX9z7wX50E/Y4K4nzTAkdX/sZO2d7LHRjWaXliqEm+WJn3DLP7ACBUIa2g3lNHfhEOCN0FgBhgElj912J7lay3V3YNo778hYWfQ3auRzSsWnB4dsL9+jegKhhrcdN2z0fYMmbmEmzFAfkVZi9p8VMV2Ay9WSBIpvIwTeNhx0B31WAnoDUARnrFpb/kC43W6tAUdPmXs8Sru04+NwsZmnmvT2Lpr8OxEUzlIXNiSVu70p3ObbsS+AQqRPqiCjpnrZ049FFaW2yL0jcrPSBuhMfs9oQmTCw6U4cbqdn+Gs6QCS0qpXnjOgqDEAtZOYCW/HjAs+erfVFljsOTV9OaoQzj5uft+JIaovfPQbX8OYqigWCeAs102eICWF9Aoz7ALrCKX5rPdkpFqaJH2xdT3I94Bd1DxlT9dg6Gyc+NyEMhRzJsFLNLyA0DEAd5LBWF1b9Towrw5LXGF1zcF3ui1MKoUQwIzFLm+X0DryYqtp9GID1yIkg6khfbRbg5fWrZiKvfbUgOQs20CC1KhT2Eaaof4USbDO/JlagePWXFAZa43vvVef5pqGPD4xvr2+vBIfzhgdBIRWHNz7K8fhx4QY1i/lWFLy3Cb86h0XHtg7dcFS3X5P67cu6/rr1gcgN0eGb27aP6VxlmlRiospGQrUoW+mfNgW4Td84BaqRV8jfIXMi4IxBtv8e4tWzbN3Dt63t5aM+GcCXqk+vI93tMo1832gb22/pGAc8KefREK4LxRng7jvQHX3IWdoBtvEKaWtlDo89zaoWZ3FHwZdj9JT6razZL6x/CC9D5Mrn+vYHAi4iz/JMybQSBSj5Ht58ZoQyUEVxjowUo+1Za6OgDGhZZESw6k6N+02OMlNVzhPoPFSotrjbctHQOQBQb96N4a0MbOYa4o7/ATK4i2Z60/JYrWLIjAx3tPepsT3xCetnZZr6WDEC7menYLy+Aea8VQaLbegXFDnHgj4HTOAFRwtFOh+sYeAt8qOVhE12UqUssq7fGWrlSVaiAdoZGX6qpf+ZxC53Ct12E2y75IsIg0eRoWpImEHRh+ZaQkjL25h2aAKmzyfIdGGYnFC0F00WBuoQh0F3ILJ5eieb X-Microsoft-Antispam-Message-Info: Qn/ar3lrNbdSikk6cxpgppFs9fBZchraZjZdRgnG/aqzzXiRlJdtXzq4YtxXfuZbE4tJ/dxZKTu+Udn97WI0yfcg1wsLLmRrYoXkY3cb3lig+qkErmPF+hrRrs9kHsqWGBF33Che7qkb7ZntQti6eAVhPBiCwK53HklA/xcJ2LCBkAIsko4GCTS8Wwpf0VwsXXSs/3m50bl3OFIDL3G8v18OyHz0sjqvYNosdEAl3e5wxGDoKrgF06W2WPNAuPJVXHBa+iJ7gAmxtR9O6rC0WsgAE+hBr3Sd2Ea0mjYvBFnOTRuBXiL49mjSyVPPBTFBhJ58rTPDfGUzy3g3wCPWnT8nAv35v7fnLm9VXgN257c= X-Microsoft-Exchange-Diagnostics: 1;VI1PR05MB4190;6:Y3eOUKNTg/1tK0+tDOB1CcadvMQNxvKbIEdQsCwlHsIl0KkAKdbuRF7wHoxbqEL6nbCs9Ig6vyGHaWOvFyCV4jvNuZ74Vhb6N62BZePL4LpPbxkWOc3WYfaTOrH0qnV6iEt8HscKzaneuyUoT67PmBQASYOiy6C5ZrUBfmvNGxJ967IJtPDRTNez8IbA3JSnUrgZ9Mv66+y5i6mtOcCI9350tm1jZe5f/+YQAFy4KIK12KZgE9UU/nxRq6syGaq7WIgqvl88CnnKVIU3TpRHnPZbfbIwmUFqDrnRvV3/CnDglhVNyQuRFlCsMW6+jU3kfARBXNqq0cVjLhhGL5dfwvTpessT1qVdlvunZWhJGXEC3FHujVOu5WXBmn8G9LiVqQ0OktOA4Z+fmn9Yl1sFRPyrod5ifeEwrFqea9AQX/hct9rToEmpCHb7PhXC0zwsGofrgzQR1xSYtEhexkyqmg==;5:m9EB8SpC3egBBZKCgReDNc3fl0cyk38lx0QRPYqV/gmE0Bsao0y8LlnpoSlRQzDcrAzPGpEKzBhL6nurBMSsMG6vC4MzylsH1PIIp659YXgJa23Ylmn1tmJqNMFuruIEYq9g68QADR0u4KkicVEdGP2Bw65TD+KleqQ8qTaD/7E=;7:QDvSVwMCASIpJdSNvn8LHxwAK7uYYKE7hldAE4v5V5Pc+TnV7Gf6PxHXVT+TRKw3v28bP6oa/0iDJSDwf0yh0SgGMkvGRNcueo9vMpOJj1bUbOu+zjkph+S37YYROwF+ENQGJZywoROpQoEBMM9OFRrzZhWAkVulTEx2WEZG3Jwx5UharYOz9MeU7QKSDt9A23AIA+ixk9T6BObd7+uo5NGODHKQgDvIakXtIUPR+XJvM7mQhHsjcziC36slDM4Y SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jul 2018 10:33:12.0638 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c85ea4a1-e2ab-4cad-b239-08d5f087b123 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR05MB4190 Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Support for device-only IPv6 multipath next hops was dropped in commit 33bd5ac54dc4 ("net/ipv6: Revert attempt to simplify route replace and append") and as of commit b5d2d75e079a ("net/ipv6: Do not allow device only routes via the multipath API"), attempts to add a next hop like that yield an explicit diagnostic. Correspondingly, drop the IPv6 parts of GRE multipath test that are supposed to test that code. Signed-off-by: Petr Machata Reviewed-by: David Ahern --- .../selftests/net/forwarding/gre_multipath.sh | 113 ++------------------- 1 file changed, 6 insertions(+), 107 deletions(-) diff --git a/tools/testing/selftests/net/forwarding/gre_multipath.sh b/tools/testing/selftests/net/forwarding/gre_multipath.sh index 982cc8c23200..3b1e047f7617 100755 --- a/tools/testing/selftests/net/forwarding/gre_multipath.sh +++ b/tools/testing/selftests/net/forwarding/gre_multipath.sh @@ -8,14 +8,12 @@ # | H1 | # | $h1 + | # | 192.0.2.1/28 | | -# | 2001:db8:1::1/64 | | # +-------------------|-----+ # | # +-------------------|------------------------+ # | SW1 | | # | $ol1 + | # | 192.0.2.2/28 | -# | 2001:db8:1::2/64 | # | | # | + g1a (gre) + g1b (gre) | # | loc=192.0.2.65 loc=192.0.2.81 | @@ -49,22 +47,17 @@ # | | # | $ol2 + | # | 192.0.2.17/28 | | -# | 2001:db8:2::1/64 | | # +-------------------|------------------------+ # | # +-------------------|-----+ # | H2 | | # | $h2 + | # | 192.0.2.18/28 | -# | 2001:db8:2::2/64 | # +-------------------------+ ALL_TESTS=" ping_ipv4 - ping_ipv6 multipath_ipv4 - multipath_ipv6 - multipath_ipv6_l4 " NUM_NETIFS=6 @@ -74,19 +67,17 @@ h1_create() { simple_if_init $h1 192.0.2.1/28 2001:db8:1::1/64 ip route add vrf v$h1 192.0.2.16/28 via 192.0.2.2 - ip route add vrf v$h1 2001:db8:2::/64 via 2001:db8:1::2 } h1_destroy() { - ip route del vrf v$h1 2001:db8:2::/64 via 2001:db8:1::2 ip route del vrf v$h1 192.0.2.16/28 via 192.0.2.2 simple_if_fini $h1 192.0.2.1/28 } sw1_create() { - simple_if_init $ol1 192.0.2.2/28 2001:db8:1::2/64 + simple_if_init $ol1 192.0.2.2/28 __simple_if_init $ul1 v$ol1 vlan_create $ul1 111 v$ol1 192.0.2.129/28 vlan_create $ul1 222 v$ol1 192.0.2.145/28 @@ -102,9 +93,6 @@ sw1_create() ip route add vrf v$ol1 192.0.2.16/28 \ nexthop dev g1a \ nexthop dev g1b - ip route add vrf v$ol1 2001:db8:2::/64 \ - nexthop dev g1a \ - nexthop dev g1b tc qdisc add dev $ul1 clsact tc filter add dev $ul1 egress pref 111 prot 802.1q \ @@ -117,7 +105,6 @@ sw1_destroy() { tc qdisc del dev $ul1 clsact - ip route del vrf v$ol1 2001:db8:2::/64 ip route del vrf v$ol1 192.0.2.16/28 ip route del vrf v$ol1 192.0.2.82/32 via 192.0.2.146 @@ -131,12 +118,12 @@ sw1_destroy() vlan_destroy $ul1 222 vlan_destroy $ul1 111 __simple_if_fini $ul1 - simple_if_fini $ol1 192.0.2.2/28 2001:db8:1::2/64 + simple_if_fini $ol1 192.0.2.2/28 } sw2_create() { - simple_if_init $ol2 192.0.2.17/28 2001:db8:2::1/64 + simple_if_init $ol2 192.0.2.17/28 __simple_if_init $ul2 v$ol2 vlan_create $ul2 111 v$ol2 192.0.2.130/28 vlan_create $ul2 222 v$ol2 192.0.2.146/28 @@ -152,14 +139,10 @@ sw2_create() ip route add vrf v$ol2 192.0.2.0/28 \ nexthop dev g2a \ nexthop dev g2b - ip route add vrf v$ol2 2001:db8:1::/64 \ - nexthop dev g2a \ - nexthop dev g2b } sw2_destroy() { - ip route del vrf v$ol2 2001:db8:1::/64 ip route del vrf v$ol2 192.0.2.0/28 ip route del vrf v$ol2 192.0.2.81/32 via 192.0.2.145 @@ -173,21 +156,19 @@ sw2_destroy() vlan_destroy $ul2 222 vlan_destroy $ul2 111 __simple_if_fini $ul2 - simple_if_fini $ol2 192.0.2.17/28 2001:db8:2::1/64 + simple_if_fini $ol2 192.0.2.17/28 } h2_create() { - simple_if_init $h2 192.0.2.18/28 2001:db8:2::2/64 + simple_if_init $h2 192.0.2.18/28 ip route add vrf v$h2 192.0.2.0/28 via 192.0.2.17 - ip route add vrf v$h2 2001:db8:1::/64 via 2001:db8:2::1 } h2_destroy() { - ip route del vrf v$h2 2001:db8:1::/64 via 2001:db8:2::1 ip route del vrf v$h2 192.0.2.0/28 via 192.0.2.17 - simple_if_fini $h2 192.0.2.18/28 2001:db8:2::2/64 + simple_if_fini $h2 192.0.2.18/28 } setup_prepare() @@ -250,77 +231,11 @@ multipath4_test() sysctl_restore net.ipv4.fib_multipath_hash_policy } -multipath6_l4_test() -{ - local what=$1; shift - local weight1=$1; shift - local weight2=$1; shift - - sysctl_set net.ipv6.fib_multipath_hash_policy 1 - ip route replace vrf v$ol1 2001:db8:2::/64 \ - nexthop dev g1a weight $weight1 \ - nexthop dev g1b weight $weight2 - - local t0_111=$(tc_rule_stats_get $ul1 111 egress) - local t0_222=$(tc_rule_stats_get $ul1 222 egress) - - ip vrf exec v$h1 \ - $MZ $h1 -6 -q -p 64 -A 2001:db8:1::1 -B 2001:db8:2::2 \ - -d 1msec -t udp "sp=1024,dp=0-32768" - - local t1_111=$(tc_rule_stats_get $ul1 111 egress) - local t1_222=$(tc_rule_stats_get $ul1 222 egress) - - local d111=$((t1_111 - t0_111)) - local d222=$((t1_222 - t0_222)) - multipath_eval "$what" $weight1 $weight2 $d111 $d222 - - ip route replace vrf v$ol1 2001:db8:2::/64 \ - nexthop dev g1a \ - nexthop dev g1b - sysctl_restore net.ipv6.fib_multipath_hash_policy -} - -multipath6_test() -{ - local what=$1; shift - local weight1=$1; shift - local weight2=$1; shift - - ip route replace vrf v$ol1 2001:db8:2::/64 \ - nexthop dev g1a weight $weight1 \ - nexthop dev g1b weight $weight2 - - local t0_111=$(tc_rule_stats_get $ul1 111 egress) - local t0_222=$(tc_rule_stats_get $ul1 222 egress) - - # Generate 16384 echo requests, each with a random flow label. - for ((i=0; i < 16384; ++i)); do - ip vrf exec v$h1 $PING6 2001:db8:2::2 -F 0 -c 1 -q &> /dev/null - done - - local t1_111=$(tc_rule_stats_get $ul1 111 egress) - local t1_222=$(tc_rule_stats_get $ul1 222 egress) - - local d111=$((t1_111 - t0_111)) - local d222=$((t1_222 - t0_222)) - multipath_eval "$what" $weight1 $weight2 $d111 $d222 - - ip route replace vrf v$ol1 2001:db8:2::/64 \ - nexthop dev g1a \ - nexthop dev g1b -} - ping_ipv4() { ping_test $h1 192.0.2.18 } -ping_ipv6() -{ - ping6_test $h1 2001:db8:2::2 -} - multipath_ipv4() { log_info "Running IPv4 multipath tests" @@ -329,22 +244,6 @@ multipath_ipv4() multipath4_test "Weighted MP 11:45" 11 45 } -multipath_ipv6() -{ - log_info "Running IPv6 multipath tests" - multipath6_test "ECMP" 1 1 - multipath6_test "Weighted MP 2:1" 2 1 - multipath6_test "Weighted MP 11:45" 11 45 -} - -multipath_ipv6_l4() -{ - log_info "Running IPv6 L4 hash multipath tests" - multipath6_l4_test "ECMP" 1 1 - multipath6_l4_test "Weighted MP 2:1" 2 1 - multipath6_l4_test "Weighted MP 11:45" 11 45 -} - trap cleanup EXIT setup_prepare