From patchwork Thu Oct 17 13:51:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dumitru Ceara X-Patchwork-Id: 1178626 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.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com 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 46v9ZL73hkz9sPJ for ; Fri, 18 Oct 2019 00:51:53 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 8B5EE1513; Thu, 17 Oct 2019 13:51:50 +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 BC6641512 for ; Thu, 17 Oct 2019 13:51:49 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 60CBD5D3 for ; Thu, 17 Oct 2019 13:51:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AAF55308429D; Thu, 17 Oct 2019 13:51:48 +0000 (UTC) Received: from dceara.remote.csb (ovpn-117-180.ams2.redhat.com [10.36.117.180]) by smtp.corp.redhat.com (Postfix) with ESMTP id 52E205D6C8; Thu, 17 Oct 2019 13:51:47 +0000 (UTC) From: Dumitru Ceara To: dev@openvswitch.org Date: Thu, 17 Oct 2019 15:51:42 +0200 Message-Id: <1571320302-7755-1-git-send-email-dceara@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Thu, 17 Oct 2019 13:51:48 +0000 (UTC) X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI 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 ovn] ovn.at: Fix vtep autotest. 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 With the removal of the OVS subtree the vtep autotest stopped working because the vtep.ovsschema couldn't be found anymore. The failure was however hidden by the "|| return 1" when failing to create the vtep DB. Fix the path to the vtep schema and make potential failures visible. CC: Numan Siddique Fixes: 84bf7d8435b8 ("Remove ovs subtree") Signed-off-by: Dumitru Ceara Acked-by: Ben Pfaff --- tests/ovn.at | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/ovn.at b/tests/ovn.at index d141367..315c35d 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -3551,7 +3551,7 @@ ovs-vsctl add-port br-int vif2 -- set Interface vif2 external-ids:iface-id=lp2 o sim_add vtep as vtep -ovsdb-tool create "$ovs_base"/vtep/vtep.db "$abs_top_srcdir"/vtep/vtep.ovsschema || return 1 +ovsdb-tool create "$ovs_base"/vtep/vtep.db "$ovs_srcdir"/vtep/vtep.ovsschema ovs-appctl -t ovsdb-server ovsdb-server/add-db "$ovs_base"/vtep/vtep.db ovs-vsctl add-br br-phys @@ -3559,8 +3559,8 @@ net_attach n1 br-phys mac=`ovs-vsctl get Interface br-phys mac_in_use | sed s/\"//g` arp_table="$arp_table $sandbox,br-phys,192.168.0.3,$mac" -ovs-appctl netdev-dummy/ip4addr br-phys 192.168.0.3/24 >/dev/null || return 1 -ovs-appctl ovs/route/add 192.168.0.3/24 br-phys >/dev/null || return 1 +ovs-appctl netdev-dummy/ip4addr br-phys 192.168.0.3/24 >/dev/null +ovs-appctl ovs/route/add 192.168.0.3/24 br-phys >/dev/null ovs-vsctl add-br br-vtep net_attach n2 br-vtep