From patchwork Fri Oct 30 00:24:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Pfaff X-Patchwork-Id: 1390531 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ovn.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CMjkj3j5Xz9sSn for ; Fri, 30 Oct 2020 11:25:17 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0ED0686B3A; Fri, 30 Oct 2020 00:25:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vKwGc3Tz5Pc4; Fri, 30 Oct 2020 00:25:13 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by whitealder.osuosl.org (Postfix) with ESMTP id 2811386A04; Fri, 30 Oct 2020 00:25:10 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id E0AD8C0051; Fri, 30 Oct 2020 00:25:09 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists.linuxfoundation.org (Postfix) with ESMTP id 789E1C0051 for ; Fri, 30 Oct 2020 00:25:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 68A1886B4F for ; Fri, 30 Oct 2020 00:25:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ChEH3dGafFK7 for ; Fri, 30 Oct 2020 00:25:06 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 3A1FF86B54 for ; Fri, 30 Oct 2020 00:25:05 +0000 (UTC) X-Originating-IP: 75.54.222.30 Received: from sigfpe.attlocal.net (75-54-222-30.lightspeed.rdcyca.sbcglobal.net [75.54.222.30]) (Authenticated sender: blp@ovn.org) by relay2-d.mail.gandi.net (Postfix) with ESMTPSA id ED4F640007; Fri, 30 Oct 2020 00:25:02 +0000 (UTC) From: Ben Pfaff To: dev@openvswitch.org Date: Thu, 29 Oct 2020 17:24:38 -0700 Message-Id: <20201030002447.936548-7-blp@ovn.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201030002447.936548-1-blp@ovn.org> References: <20201030002447.936548-1-blp@ovn.org> MIME-Version: 1.0 Cc: Ben Pfaff Subject: [ovs-dev] [PATCH ovn 07/16] tests: Remove broken "dhcpv4 : 1 HV, 2 LS, 2 LSP/LS" bits. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" These calls to test_dhcp in the "ovn -- dhcpv4 : 1 HV, 2 LS, 2 LSPs/LS" test passed bad arguments that just caused errors in the shell function and didn't do anything useful. I guess that's probably why the checks for their results were commented out. Signed-off-by: Ben Pfaff --- tests/ovn.at | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/tests/ovn.at b/tests/ovn.at index 2d760cf6c06c..a15840b3e429 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -5569,23 +5569,9 @@ reset_pcap_file hv1-vif2 hv1/vif2 rm -f 1.expected rm -f 2.expected -# Send DHCPv4 packet on ls2-lp1. It doesn't have any DHCPv4 options defined. -# ls2-lp2 (vif4-tx.pcap) should receive the DHCPv4 request packet once. - -ciaddr=`ip_to_hex 0 0 0 0` -test_dhcp 3 f00000000003 01 0 $ciaddr 0 0 0 4 0 - -# Send DHCPv4 packet on ls2-lp2. "router" DHCPv4 option is not defined for -# this lport. -ciaddr=`ip_to_hex 0 0 0 0` -test_dhcp 4 f00000000004 01 0 $ciaddr 0 0 0 3 0 - # NXT_RESUMEs should be 4. OVS_WAIT_UNTIL([test 4 = `cat ofctl_monitor*.log | grep -c NXT_RESUME`]) -OVN_CHECK_PACKETS([hv1/vif3-tx.pcap], [3.expected]) -OVN_CHECK_PACKETS([hv1/vif4-tx.pcap], [4.expected]) - # Send DHCPREQUEST in the RENEWING/REBINDING state with ip4.src set to 10.0.0.6 # and ip4.dst set to 10.0.0.1. offer_ip=`ip_to_hex 10 0 0 6`