From patchwork Thu Sep 3 21:47:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Pettit X-Patchwork-Id: 514280 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (li376-54.members.linode.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id E9B7E14032F for ; Fri, 4 Sep 2015 07:53:04 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 8C5DC10BBD; Thu, 3 Sep 2015 14:47:58 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx3v1.cudamail.com (mx3.cudamail.com [64.34.241.5]) by archives.nicira.com (Postfix) with ESMTPS id 3819110BB1 for ; Thu, 3 Sep 2015 14:47:57 -0700 (PDT) Received: from bar4.cudamail.com (bar2 [192.168.15.2]) by mx3v1.cudamail.com (Postfix) with ESMTP id B151661807F for ; Thu, 3 Sep 2015 15:47:46 -0600 (MDT) X-ASG-Debug-ID: 1441316866-03dc211ad74a3370001-byXFYA Received: from mx3-pf3.cudamail.com ([192.168.14.3]) by bar4.cudamail.com with ESMTP id XEd9CuDarQ5m8urZ (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 03 Sep 2015 15:47:46 -0600 (MDT) X-Barracuda-Envelope-From: jpettit@nicira.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.14.3 Received: from unknown (HELO mail-pa0-f50.google.com) (209.85.220.50) by mx3-pf3.cudamail.com with ESMTPS (RC4-SHA encrypted); 3 Sep 2015 21:47:45 -0000 Received-SPF: unknown (mx3-pf3.cudamail.com: Multiple SPF records returned) X-Barracuda-Apparent-Source-IP: 209.85.220.50 X-Barracuda-RBL-IP: 209.85.220.50 Received: by padhy16 with SMTP id hy16so73184pad.1 for ; Thu, 03 Sep 2015 14:47:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=RDlVqyfNngrne9qGLY5+KjCpigj3TPZ/kix6w5SkzXQ=; b=mRioNVHQlGL08O38EhM5EvE6RT2qOAlq5b79gsri2Dp2T/a7t2um3JMSXY431AGjLt jzvCbbR0i8IzaIuErCMBn7iOotfTnbuH1yM937qGvr8tMtyiLoE1Zl+IKs4D/tcoCNhb iDnLEuoVo99H77/Yl2y+6FJ6Iet4zwPT53lo12tjDCYa7mt4Z7hNZhM0v9JZbXlE/+GQ qXC+g94c4GlTBBSCGerkcNLvCH1ceGKLKxJFu7J2jioWXrPs4F8JRu5snIVmCVGEn1RS X1nZSNqLGqO+OH0ZFWOoJ1UVcjgRz/qJd3HD7Y8r0fquZb9WzxORh0P3HTT/CoSfx4s8 Vvbg== X-Gm-Message-State: ALoCoQkm945tEcF0F7UTIvBCbt5QtYchGUu8wqD6q5Fi9BnWw7YkfoSRDwwJ0u+9+rYAZ5GmGjqW X-Received: by 10.66.186.39 with SMTP id fh7mr285942pac.48.1441316865769; Thu, 03 Sep 2015 14:47:45 -0700 (PDT) Received: from localhost.localdomain ([208.91.2.4]) by smtp.gmail.com with ESMTPSA id u5sm96145pdr.63.2015.09.03.14.47.45 for (version=TLSv1/SSLv3 cipher=OTHER); Thu, 03 Sep 2015 14:47:45 -0700 (PDT) X-CudaMail-Envelope-Sender: jpettit@nicira.com From: Justin Pettit To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-V3-902058570 X-CudaMail-DTE: 090315 X-CudaMail-Originating-IP: 209.85.220.50 Date: Thu, 3 Sep 2015 14:47:02 -0700 X-ASG-Orig-Subj: [##CM-V3-902058570##][PATCH 4/4] tests: Add unit tests for ovn-nbctl. Message-Id: <1441316822-60290-4-git-send-email-jpettit@nicira.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1441316822-60290-1-git-send-email-jpettit@nicira.com> References: <1441316822-60290-1-git-send-email-jpettit@nicira.com> X-Barracuda-Connect: UNKNOWN[192.168.14.3] X-Barracuda-Start-Time: 1441316866 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-ASG-Whitelist: Header =?UTF-8?B?eFwtY3VkYW1haWxcLXdoaXRlbGlzdFwtdG8=?= X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 Subject: [ovs-dev] [PATCH 4/4] tests: Add unit tests for ovn-nbctl. X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dev-bounces@openvswitch.org Sender: "dev" Signed-off-by: Justin Pettit Acked-by: Ben Pfaff --- tests/automake.mk | 1 + tests/ovn-nbctl.at | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/testsuite.at | 1 + 3 files changed, 121 insertions(+), 0 deletions(-) create mode 100644 tests/ovn-nbctl.at diff --git a/tests/automake.mk b/tests/automake.mk index 32f757b..4198039 100644 --- a/tests/automake.mk +++ b/tests/automake.mk @@ -87,6 +87,7 @@ TESTSUITE_AT = \ tests/vtep-ctl.at \ tests/auto-attach.at \ tests/ovn.at \ + tests/ovn-nbctl.at \ tests/ovn-sbctl.at \ tests/ovn-controller-vtep.at diff --git a/tests/ovn-nbctl.at b/tests/ovn-nbctl.at new file mode 100644 index 0000000..dd81626 --- /dev/null +++ b/tests/ovn-nbctl.at @@ -0,0 +1,119 @@ +AT_BANNER([ovn-nbctl]) + +# OVN_NBCTL_TEST_START +m4_define([OVN_NBCTL_TEST_START], + [OVS_RUNDIR=`pwd`; export OVS_RUNDIR + OVS_LOGDIR=`pwd`; export OVS_LOGDIR + OVS_DBDIR=`pwd`; export OVS_DBDIR + OVS_SYSCONFDIR=`pwd`; export OVS_SYSCONFDIR + + dnl Create ovn-nb database. + AT_CHECK([ovsdb-tool create ovn-nb.db $abs_top_srcdir/ovn/ovn-nb.ovsschema]) + + dnl Start ovsdb-server. + AT_CHECK([ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock ovn-nb.db], [0], [], [stderr]) + ON_EXIT_UNQUOTED([kill `cat ovsdb-server.pid`]) + AT_CHECK([[sed < stderr ' +/vlog|INFO|opened log file/d +/ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d']]) + AT_CAPTURE_FILE([ovsdb-server.log]) +]) + +# OVN_NBCTL_TEST_STOP +m4_define([OVN_NBCTL_TEST_STOP], + [AT_CHECK([check_logs $1]) + AT_CHECK([ovs-appctl -t ovsdb-server exit])]) + + +AT_SETUP([ovn-nbctl - lswitch]) +OVN_NBCTL_TEST_START + +AT_CHECK([ovn-nbctl lswitch-add ls0]) +AT_CHECK([ovn-nbctl lswitch-list | ${PERL} $srcdir/uuidfilt.pl], [0], [dnl +<0> (ls0) +]) + +AT_CHECK([ovn-nbctl lswitch-add ls1]) +AT_CHECK([ovn-nbctl lswitch-list | ${PERL} $srcdir/uuidfilt.pl], [0], [dnl +<0> (ls0) +<1> (ls1) +]) + +AT_CHECK([ovn-nbctl lswitch-del ls0]) +AT_CHECK([ovn-nbctl lswitch-list | ${PERL} $srcdir/uuidfilt.pl], [0], [dnl +<0> (ls1) +]) + +OVN_NBCTL_TEST_STOP +AT_CLEANUP + +dnl --------------------------------------------------------------------- + +AT_SETUP([ovn-nbctl - lport]) +OVN_NBCTL_TEST_START + +AT_CHECK([ovn-nbctl lswitch-add ls0]) +AT_CHECK([ovn-nbctl lport-add ls0 lp0]) +AT_CHECK([ovn-nbctl lport-list ls0 | ${PERL} $srcdir/uuidfilt.pl], [0], [dnl +<0> (lp0) +]) + +AT_CHECK([ovn-nbctl lport-add ls0 lp1]) +AT_CHECK([ovn-nbctl lport-list ls0 | ${PERL} $srcdir/uuidfilt.pl], [0], [dnl +<0> (lp0) +<1> (lp1) +]) + +AT_CHECK([ovn-nbctl lport-del lp1]) +AT_CHECK([ovn-nbctl lport-list ls0 | ${PERL} $srcdir/uuidfilt.pl], [0], [dnl +<0> (lp0) +]) + +OVN_NBCTL_TEST_STOP +AT_CLEANUP + +dnl --------------------------------------------------------------------- + +AT_SETUP([ovn-nbctl - lport macs]) +OVN_NBCTL_TEST_START + +AT_CHECK([ovn-nbctl lswitch-add ls0]) +AT_CHECK([ovn-nbctl lport-add ls0 lp0]) +AT_CHECK([ovn-nbctl lport-get-macs lp0], [0], [dnl +]) + +AT_CHECK([ovn-nbctl lport-set-macs lp0 00:11:22:33:44:55 unknown]) +AT_CHECK([ovn-nbctl lport-get-macs lp0], [0], [dnl +00:11:22:33:44:55 +unknown +]) + +AT_CHECK([ovn-nbctl lport-set-macs lp0]) +AT_CHECK([ovn-nbctl lport-get-macs lp0], [0], [dnl +]) + +OVN_NBCTL_TEST_STOP +AT_CLEANUP + +dnl --------------------------------------------------------------------- + +AT_SETUP([ovn-nbctl - lport port security]) +OVN_NBCTL_TEST_START + +AT_CHECK([ovn-nbctl lswitch-add ls0]) +AT_CHECK([ovn-nbctl lport-add ls0 lp0]) +AT_CHECK([ovn-nbctl lport-get-macs lp0], [0], [dnl +]) + +AT_CHECK([ovn-nbctl lport-set-port-security lp0 aa:bb:cc:dd:ee:ff 00:11:22:33:44:55]) +AT_CHECK([ovn-nbctl lport-get-port-security lp0], [0], [dnl +00:11:22:33:44:55 +aa:bb:cc:dd:ee:ff +]) + +AT_CHECK([ovn-nbctl lport-set-port-security lp0]) +AT_CHECK([ovn-nbctl lport-get-port-security lp0], [0], [dnl +]) + +OVN_NBCTL_TEST_STOP +AT_CLEANUP diff --git a/tests/testsuite.at b/tests/testsuite.at index f3bc126..cb2e098 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -68,5 +68,6 @@ m4_include([tests/vlog.at]) m4_include([tests/vtep-ctl.at]) m4_include([tests/auto-attach.at]) m4_include([tests/ovn.at]) +m4_include([tests/ovn-nbctl.at]) m4_include([tests/ovn-sbctl.at]) m4_include([tests/ovn-controller-vtep.at])