From patchwork Thu May 23 20:07:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Pettit X-Patchwork-Id: 1104399 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.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 mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4590tX5w7Pz9s3l for ; Fri, 24 May 2019 06:08:19 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 1D45CFA4; Thu, 23 May 2019 20:08:17 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 3EFC7F8C for ; Thu, 23 May 2019 20:08:15 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay11.mail.gandi.net (relay11.mail.gandi.net [217.70.178.231]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 72FEF829 for ; Thu, 23 May 2019 20:08:14 +0000 (UTC) Received: from sc9-mailhost2.vmware.com (unknown [66.170.99.1]) (Authenticated sender: jpettit@ovn.org) by relay11.mail.gandi.net (Postfix) with ESMTPSA id 886B0100002 for ; Thu, 23 May 2019 20:08:12 +0000 (UTC) From: Justin Pettit To: dev@openvswitch.org Date: Thu, 23 May 2019 13:07:36 -0700 Message-Id: <20190523200737.87615-2-jpettit@ovn.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190523200737.87615-1-jpettit@ovn.org> References: <20190523200737.87615-1-jpettit@ovn.org> X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH 2/3] ovn.at: Use ovn cleanup macros. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org Signed-off-by: Justin Pettit --- tests/ovn.at | 92 +++------------------------------------------------- 1 file changed, 5 insertions(+), 87 deletions(-) diff --git a/tests/ovn.at b/tests/ovn.at index 298f647d37bf..9c71dc9ffdcf 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -3857,24 +3857,7 @@ echo "${expect_dst_mac}${expect_src_mac}08004500001c000000003f110100${src_ip}${d OVN_CHECK_PACKETS([hv1/vif2-tx.pcap], [expected]) - -as hv1 -OVS_APP_EXIT_AND_WAIT([ovn-controller]) -OVS_APP_EXIT_AND_WAIT([ovs-vswitchd]) -OVS_APP_EXIT_AND_WAIT([ovsdb-server]) - -as ovn-sb -OVS_APP_EXIT_AND_WAIT([ovsdb-server]) - -as ovn-nb -OVS_APP_EXIT_AND_WAIT([ovsdb-server]) - -as northd -OVS_APP_EXIT_AND_WAIT([ovn-northd]) - -as main -OVS_APP_EXIT_AND_WAIT([ovs-vswitchd]) -OVS_APP_EXIT_AND_WAIT([ovsdb-server]) +OVN_CLEANUP([hv1]) AT_CLEANUP @@ -4808,23 +4791,7 @@ OVS_WAIT_UNTIL([test 8 = `cat ofctl_monitor*.log | grep -c NXT_RESUME`]) # vif1-tx.pcap should have received the DHCPv4 request packet OVN_CHECK_PACKETS([hv1/vif1-tx.pcap], [1.expected]) -as hv1 -OVS_APP_EXIT_AND_WAIT([ovn-controller]) -OVS_APP_EXIT_AND_WAIT([ovs-vswitchd]) -OVS_APP_EXIT_AND_WAIT([ovsdb-server]) - -as ovn-sb -OVS_APP_EXIT_AND_WAIT([ovsdb-server]) - -as ovn-nb -OVS_APP_EXIT_AND_WAIT([ovsdb-server]) - -as northd -OVS_APP_EXIT_AND_WAIT([ovn-northd]) - -as main -OVS_APP_EXIT_AND_WAIT([ovs-vswitchd]) -OVS_APP_EXIT_AND_WAIT([ovsdb-server]) +OVN_CLEANUP([hv1]) AT_CLEANUP @@ -5096,23 +5063,7 @@ trim_zeros > 5.packets cat 5.expected | cut -c 1-120,125- > expout AT_CHECK([cat 5.packets | cut -c 1-120,125- ], [0], [expout]) -as hv1 -OVS_APP_EXIT_AND_WAIT([ovn-controller]) -OVS_APP_EXIT_AND_WAIT([ovs-vswitchd]) -OVS_APP_EXIT_AND_WAIT([ovsdb-server]) - -as ovn-sb -OVS_APP_EXIT_AND_WAIT([ovsdb-server]) - -as ovn-nb -OVS_APP_EXIT_AND_WAIT([ovsdb-server]) - -as northd -OVS_APP_EXIT_AND_WAIT([ovn-northd]) - -as main -OVS_APP_EXIT_AND_WAIT([ovs-vswitchd]) -OVS_APP_EXIT_AND_WAIT([ovsdb-server]) +OVN_CLEANUP([hv1]) AT_CLEANUP @@ -8039,25 +7990,7 @@ expected=${dst_mac}${src_mac}08004500001c000000003e110200${src_ip}${dst_ip}00351 echo $expected > expected OVN_CHECK_PACKETS([hv3/vif1-tx.pcap], [expected]) -for sim in hv1 hv2 hv3; do - as $sim - OVS_APP_EXIT_AND_WAIT([ovn-controller]) - OVS_APP_EXIT_AND_WAIT([ovs-vswitchd]) - OVS_APP_EXIT_AND_WAIT([ovsdb-server]) -done - -as ovn-sb -OVS_APP_EXIT_AND_WAIT([ovsdb-server]) - -as ovn-nb -OVS_APP_EXIT_AND_WAIT([ovsdb-server]) - -as northd -OVS_APP_EXIT_AND_WAIT([ovn-northd]) - -as main -OVS_APP_EXIT_AND_WAIT([ovs-vswitchd]) -OVS_APP_EXIT_AND_WAIT([ovsdb-server]) +OVN_CLEANUP([hv1],[hv2],[hv3]) AT_CLEANUP @@ -8471,23 +8404,8 @@ reset_pcap_file hv1-vif2 hv1/vif2 rm -f 1.expected rm -f 2.expected -as hv1 - OVS_APP_EXIT_AND_WAIT([ovn-controller]) -OVS_APP_EXIT_AND_WAIT([ovs-vswitchd]) -OVS_APP_EXIT_AND_WAIT([ovsdb-server]) - -as ovn-sb -OVS_APP_EXIT_AND_WAIT([ovsdb-server]) - -as ovn-nb -OVS_APP_EXIT_AND_WAIT([ovsdb-server]) - -as northd -OVS_APP_EXIT_AND_WAIT([ovn-northd]) +OVN_CLEANUP([hv1]) -as main -OVS_APP_EXIT_AND_WAIT([ovs-vswitchd]) -OVS_APP_EXIT_AND_WAIT([ovsdb-server]) AT_CLEANUP AT_SETUP([ovn -- 4 HV, 1 LS, 1 LR, packet test with HA distributed router gateway port])