From patchwork Wed Sep 23 00:51:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Zhou X-Patchwork-Id: 521526 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 98DA11401AF for ; Wed, 23 Sep 2015 10:52:15 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 23C2710A13; Tue, 22 Sep 2015 17:51:37 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx1e4.cudamail.com (mx1.cudamail.com [69.90.118.67]) by archives.nicira.com (Postfix) with ESMTPS id 534A8109FE for ; Tue, 22 Sep 2015 17:51:35 -0700 (PDT) Received: from bar2.cudamail.com (unknown [192.168.21.12]) by mx1e4.cudamail.com (Postfix) with ESMTPS id D187E1E0366 for ; Tue, 22 Sep 2015 18:51:34 -0600 (MDT) X-ASG-Debug-ID: 1442969491-03dc537fe04cd160001-byXFYA Received: from mx1-pf1.cudamail.com ([192.168.24.1]) by bar2.cudamail.com with ESMTP id lGXgUozbNOGFllgY (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 22 Sep 2015 18:51:31 -0600 (MDT) X-Barracuda-Envelope-From: azhou@nicira.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.24.1 Received: from unknown (HELO mail-pa0-f50.google.com) (209.85.220.50) by mx1-pf1.cudamail.com with ESMTPS (RC4-SHA encrypted); 23 Sep 2015 00:51:31 -0000 Received-SPF: unknown (mx1-pf1.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 pacex6 with SMTP id ex6so24072352pac.0 for ; Tue, 22 Sep 2015 17:51:30 -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:cc:subject:date:message-id:in-reply-to :references; bh=rYZh2B0VnC3rjWxNy7JjRDAcOz4pWz255B6xTLbxSQk=; b=HSA7g9UG/vwc9PYCfozFYwdzx4bbkK4s6wV4nsptNpXjIvIeFGhbWJG/zHnr2E0AzD 75qd4bdTiHY+z+ylH5PJGRUuCWdwRihOkGiZi9vDv6o3IOoNqQ8dWfZ6UQXe/tv7CZmU ZIaktjN0Q8RmUtBCVeNTH6IejOVSMSJxb9+ov/W/HxeSGpFBs3utdSX91YqH7KIuXhGL eq3htmlSeZ36TZqQIzZ/ALD53Yz8CBkNnEPZX4g0MWRsRMAQLM3kqoyZBwGiWQ4U/Tp2 THCHUQtkAvnPOcKL6nBjUONlocjiPxZwRCgYq2X2fnOWUoq73J6Ob2Snx+o+fvhYCVFj EpaA== X-Gm-Message-State: ALoCoQn6mERPvS8rqk6hGA2AGwvX5LULRoCYdFYJOix9QR+0TxXxAFVMEItkFC2nGFQplOkzIvmA X-Received: by 10.69.16.166 with SMTP id fx6mr11974911pbd.18.1442969490299; Tue, 22 Sep 2015 17:51:30 -0700 (PDT) Received: from ubuntu.localdomain ([208.91.1.34]) by smtp.gmail.com with ESMTPSA id qn5sm4441160pbc.74.2015.09.22.17.51.29 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 22 Sep 2015 17:51:29 -0700 (PDT) X-CudaMail-Envelope-Sender: azhou@nicira.com From: Andy Zhou To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-E1-921114924 X-CudaMail-DTE: 092215 X-CudaMail-Originating-IP: 209.85.220.50 Date: Tue, 22 Sep 2015 17:51:14 -0700 X-ASG-Orig-Subj: [##CM-E1-921114924##][PATCH 5/8] ovs-dev.py: rename ROOT to VARDIR Message-Id: <1442969477-11026-5-git-send-email-azhou@nicira.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1442969477-11026-1-git-send-email-azhou@nicira.com> References: <1442969477-11026-1-git-send-email-azhou@nicira.com> X-Barracuda-Connect: UNKNOWN[192.168.24.1] X-Barracuda-Start-Time: 1442969491 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 5/8] ovs-dev.py: rename ROOT to VARDIR 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" VARDIR seems to be a better name. Signed-off-by: Andy Zhou Acked-by: Joe Stringer --- utilities/ovs-dev.py | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/utilities/ovs-dev.py b/utilities/ovs-dev.py index 54989e6..82d946d 100755 --- a/utilities/ovs-dev.py +++ b/utilities/ovs-dev.py @@ -26,7 +26,7 @@ PWD = os.getcwd() OVS_SRC = HOME + "/ovs" if os.path.exists(PWD + "/WHY-OVS.md"): OVS_SRC = PWD # Use current directory as OVS source tree -ROOT = HOME + "/root" +VARDIR = OVS_SRC + "/_var" BUILD_GCC = OVS_SRC + "/_build-gcc" BUILD_CLANG = OVS_SRC + "/_build-clang" @@ -63,9 +63,11 @@ def conf(): except OSError: pass - configure = ["../configure", "--prefix=" + ROOT, "--localstatedir=" + ROOT, - "--with-logdir=%s/log" % ROOT, "--with-rundir=%s/run" % ROOT, - "--enable-silent-rules", "--with-dbdir=" + ROOT, "--silent"] + configure = ["../configure", + "--prefix=" + VARDIR, "--localstatedir=" + VARDIR, + "--with-logdir=%s/log" % VARDIR, + "--with-rundir=%s/run" % VARDIR, + "--enable-silent-rules", "--with-dbdir=" + VARDIR, "--silent"] cflags = "-g -fno-omit-frame-pointer" @@ -185,7 +187,7 @@ commands.append(tag) def kill(): for proc in ["ovs-vswitchd", "ovsdb-server"]: - if os.path.exists("%s/run/openvswitch/%s.pid" % (ROOT, proc)): + if os.path.exists("%s/run/openvswitch/%s.pid" % (VARDIR, proc)): _sh("ovs-appctl", "-t", proc, "exit", check=False) time.sleep(.1) _sh("sudo", "killall", "-q", "-2", proc, check=False) @@ -194,8 +196,8 @@ commands.append(kill) def reset(): kill() - if os.path.exists(ROOT): - shutil.rmtree(ROOT) + if os.path.exists(VARDIR): + shutil.rmtree(VARDIR) for dp in _sh("ovs-dpctl dump-dps", capture=True): _sh("ovs-dpctl", "del-dp", dp.strip()) commands.append(reset) @@ -204,11 +206,11 @@ commands.append(reset) def run(): kill() for d in ["log", "run"]: - d = "%s/%s" % (ROOT, d) + d = "%s/%s" % (VARDIR, d) shutil.rmtree(d, ignore_errors=True) os.makedirs(d) - pki_dir = ROOT + "/pki" + pki_dir = VARDIR + "/pki" if not os.path.exists(pki_dir): os.mkdir(pki_dir) os.chdir(pki_dir) @@ -216,14 +218,14 @@ def run(): _sh("ovs-pki req+sign ovsclient") os.chdir(OVS_SRC) - if not os.path.exists(ROOT + "/conf.db"): - _sh("ovsdb-tool", "create", ROOT + "/conf.db", + if not os.path.exists(VARDIR + "/conf.db"): + _sh("ovsdb-tool", "create", VARDIR + "/conf.db", OVS_SRC + "/vswitchd/vswitch.ovsschema") opts = ["--pidfile", "--log-file"] _sh(*(["ovsdb-server", - "--remote=punix:%s/run/db.sock" % ROOT, + "--remote=punix:%s/run/db.sock" % VARDIR, "--remote=db:Open_vSwitch,Open_vSwitch,manager_options", "--private-key=db:Open_vSwitch,SSL,private_key", "--certificate=db:Open_vSwitch,SSL,certificate", @@ -339,7 +341,7 @@ Commands: modinst - Build ovs and install the kernel module. env - Print the required path environment variable. doc - Print this message. -""" % {"ovs": OVS_SRC, "v": sys.argv[0], "run": ROOT} +""" % {"ovs": OVS_SRC, "v": sys.argv[0], "run": VARDIR} sys.exit(0) commands.append(doc)