From patchwork Mon Dec 23 09:38:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damijan Skvarc X-Patchwork-Id: 1214869 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.136; helo=silver.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="tlICVA9X"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47hDnr4bQFz9sPJ for ; Mon, 23 Dec 2019 20:39:11 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 95952204F8; Mon, 23 Dec 2019 09:39:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pYDXfVxN3wqj; Mon, 23 Dec 2019 09:39:06 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by silver.osuosl.org (Postfix) with ESMTP id 988E7204F3; Mon, 23 Dec 2019 09:39:06 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 6E40AC1D81; Mon, 23 Dec 2019 09:39:06 +0000 (UTC) X-Original-To: ovs-dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by lists.linuxfoundation.org (Postfix) with ESMTP id 15039C0881 for ; Mon, 23 Dec 2019 09:39:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 0C11187A5F for ; Mon, 23 Dec 2019 09:39:05 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8zFMsDdIzdUD for ; Mon, 23 Dec 2019 09:39:04 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by hemlock.osuosl.org (Postfix) with ESMTPS id 32D7187A62 for ; Mon, 23 Dec 2019 09:39:04 +0000 (UTC) Received: by mail-wm1-f43.google.com with SMTP id p9so15230739wmc.2 for ; Mon, 23 Dec 2019 01:39:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=s7BXSENa6L981w8ded8EVZn6Rmq6F+RA46iXa6b+Rpc=; b=tlICVA9XzsWa1QVUKP4PHE6jTn+SOvaMP82LGgPKpG/5iEY93peV3Nr1ircdjLskRQ X2XVfq16npskFxFqcLYatN4RmFEhYsQYYqMNLKcActHjEVOTPQfqiZClGQG85cS0j4/6 6CfmnBxwDgjL3SgNWsSqK0rJh/qsGhEJoBCF/OgiQiMdQH0rsnCJD2g7cuW15eF/frC3 Iue+RhUcdkboqq5zgND93n7IGwFK5Yac3i9SiMqLu2yO34KI00/2fQDnkRFFf13nQ95D vUQz/gSoZFbolYGQy+aCAzDWeuEICFUk5CT8pSt2+R8VlEr50OO7C16aQRvVpBgBdaej XsPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=s7BXSENa6L981w8ded8EVZn6Rmq6F+RA46iXa6b+Rpc=; b=ezGkSFL9cANAizVZMdaK/KOhs2TwBVWh4CuuOJ8opmmSDlfFwVBPVO7II7oYXJ66g0 A/pn1QqSxilUNQSR8WHVC+6m4wNT17OMLL9n8QL4dCuQvXnkoOu/oYZEs4Vc8b+ssULm 7B5JkG/08qcCgUxBPtfQyY1/poQbOf3UEEgoIBNBXg21aethWX51nj2erKs8zRKcF2d5 J2vUMR1JY3R/sEIWYa9C1Uq5+v+aC8MvbiarqJxzYjNeMTqutjdtmgxqSB06EJC0eJ4z bxmey6TAfRJIlw/STkf+w6R2dDHBQLFX4hc0+7PzY5MnIy2USeJOwJKPJcHYMQ9gcIln p7ZQ== X-Gm-Message-State: APjAAAV+IWv4g+0Ax0CgXvDdo9ktOjjHQbUsL0bwLwrrRhPg/vF8Rv5D dg1Yk1m6K0sJHUpxd6DIMn6lIhl7 X-Google-Smtp-Source: APXvYqwUtyfReq/CGXUcYUoo10aXGNABq9Do6Bxa8BgswvnVohgpHjBLanPXAK0RzKRBhVpV2gsdLQ== X-Received: by 2002:a1c:7d93:: with SMTP id y141mr31238643wmc.111.1577093942201; Mon, 23 Dec 2019 01:39:02 -0800 (PST) Received: from damijan-PC.i-tech.local (mail.i-tech.si. [89.212.78.105]) by smtp.gmail.com with ESMTPSA id m10sm19744468wrx.19.2019.12.23.01.39.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Dec 2019 01:39:01 -0800 (PST) From: Damijan Skvarc To: ovs-dev@openvswitch.org Date: Mon, 23 Dec 2019 10:38:57 +0100 Message-Id: <1577093937-27287-1-git-send-email-damjan.skvarc@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <20191213190925.GL461265@ovn.org> References: <20191213190925.GL461265@ovn.org> Subject: [ovs-dev] [PATCH 1/1] tests: introduced tests for adding/deleting logical routers in VTEP database 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: , MIME-Version: 1.0 Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" New tests were introduced based on lcov report, which reveals apparent code is not covered by ovs test suites. Signed-off-by: Damijan Skvarc --- tests/vtep-ctl.at | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/tests/vtep-ctl.at b/tests/vtep-ctl.at index 3949f16..9806765 100644 --- a/tests/vtep-ctl.at +++ b/tests/vtep-ctl.at @@ -129,6 +129,39 @@ m4_define([CHECK_LSWITCHES], AT_CHECK([RUN_VTEP_CTL([ls-exists nonexistent])], [2], [], [], [VTEP_CTL_CLEANUP])]) + +dnl CHECK_LROUTERS([LROUTER], ...) +dnl +dnl Verifies that "vtep-ctl list-lr" prints the specified list of +dnl logical routers, which must be in alphabetical order. +m4_define([CHECK_LROUTERS], + [dnl Check that the lrouters appear on list-lr, without --oneline. + AT_CHECK( + [RUN_VTEP_CTL([list-lr])], + [0], + [m4_foreach([lrinfo], [$@], [m4_car(lrinfo) +])], + [], + [VTEP_CTL_CLEANUP]) + + dnl Check that the lswitches appear on list-lr, with --oneline. + AT_CHECK( + [RUN_VTEP_CTL_ONELINE([list-lr])], + [0], + [m4_join([\n], m4_foreach([lrinfo], [$@], [m4_car(lrinfo),])) +], + [], + [VTEP_CTL_CLEANUP]) + + dnl Check that each lrouter exists according to lr-exists and that + dnl a prouter that should not exist does not. + m4_foreach([lrinfo], [$@], + [AT_CHECK([RUN_VTEP_CTL([lr-exists m4_car(lrinfo)])], [0], [], + [], [VTEP_CTL_CLEANUP])]) + AT_CHECK([RUN_VTEP_CTL([lr-exists nonexistent])], [2], [], [], + [VTEP_CTL_CLEANUP])]) + + dnl ---------------------------------------------------------------------- AT_BANNER([vtep-ctl unit tests -- physical switch tests]) @@ -351,6 +384,60 @@ AT_CHECK([RUN_VTEP_CTL( VTEP_CTL_CLEANUP AT_CLEANUP + +dnl ---------------------------------------------------------------------- +AT_BANNER([vtep-ctl unit tests -- logical router tests]) + +AT_SETUP([add-lr a]) +AT_KEYWORDS([vtep-ctl]) +VTEP_CTL_SETUP +AT_CHECK([RUN_VTEP_CTL([add-lr a])], [0], [], [], [VTEP_CTL_CLEANUP]) +CHECK_LROUTERS([a]) +VTEP_CTL_CLEANUP +AT_CLEANUP + +AT_SETUP([add-lr a, add-lr a]) +AT_KEYWORDS([vtep-ctl]) +VTEP_CTL_SETUP +AT_CHECK([RUN_VTEP_CTL([add-lr a])], [0], [], [], [VTEP_CTL_CLEANUP]) +AT_CHECK([RUN_VTEP_CTL([add-lr a])], [1], [], + [vtep-ctl: cannot create logical router a because it already exists +], [VTEP_CTL_CLEANUP]) +VTEP_CTL_CLEANUP +AT_CLEANUP + +AT_SETUP([add-lr a, add-lr b]) +AT_KEYWORDS([vtep-ctl]) +VTEP_CTL_SETUP +AT_CHECK([RUN_VTEP_CTL([add-lr a], [add-lr b])], [0], [], [], + [VTEP_CTL_CLEANUP]) +CHECK_LROUTERS([a], [b]) +VTEP_CTL_CLEANUP +AT_CLEANUP + +AT_SETUP([add-lr a, add-lr b, del-lr a]) +AT_KEYWORDS([vtep-ctl]) +VTEP_CTL_SETUP +AT_CHECK([RUN_VTEP_CTL([add-lr a], [add-lr b], [del-lr a])], [0], [], [], + [VTEP_CTL_CLEANUP]) +CHECK_LROUTERS([b]) +VTEP_CTL_CLEANUP +AT_CLEANUP + +AT_SETUP([add-lr a, del-lr a, add-lr a]) +AT_KEYWORDS([vtep-ctl]) +VTEP_CTL_SETUP +AT_CHECK([RUN_VTEP_CTL_TOGETHER( + [add-lr a], + [del-lr a], + [add-lr a])], [0], [ + + +], [], [VTEP_CTL_CLEANUP]) +CHECK_LROUTERS([a]) +VTEP_CTL_CLEANUP +AT_CLEANUP + dnl ---------------------------------------------------------------------- AT_BANNER([vtep-ctl unit tests -- logical binding tests])