From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id B33F3A046B for ; Thu, 22 Aug 2019 10:28:15 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id AB7161BF5C; Thu, 22 Aug 2019 10:28:15 +0200 (CEST) Received: from mail-pl1-f195.google.com (mail-pl1-f195.google.com [209.85.214.195]) by dpdk.org (Postfix) with ESMTP id 17B531BF55 for ; Thu, 22 Aug 2019 10:28:14 +0200 (CEST) Received: by mail-pl1-f195.google.com with SMTP id y8so3014480plr.12 for ; Thu, 22 Aug 2019 01:28:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=f2/grlPA4t4DXkwX69Dfzz+HaDEFafTbUtWytjD3UqY=; b=S2FDkGcYkKaOynIk5j5kPWyN2EU0jfus2A5IFlNjlVOX+04NYyzru62Yg8RvMDRGeq ihmoLLmmYkWWlF5AE0Gs5856RCIHCayZu9+t82EOo9FfAgMBrFX9QXSnfWJHwXBXkQAo zrU8HwaSigWoSu0eBDp2dZ6cRmytrEF49/q7ybN16TN78v8GsnKvLdhmRF1H2E3IoPn9 X6LWdiNx0zygkIS18cQzXdYGFQWgtbON01UijM6ssLHwC9uMqwPOjvQ5gTLuDWkM6FRI 3OrjIwb4zUdTmYKABMz4n1z4dpcmpkdmnpWaFGLfjp0mrJEgGOunS4lcqa8BNIUBItZy AQIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=f2/grlPA4t4DXkwX69Dfzz+HaDEFafTbUtWytjD3UqY=; b=dPY3yJ3Q/6jWeZdGni6fgCrp0Zp1ZrVgJa7sXz+4wUbuFCqK+8h9OjUoj149f9azv4 zk5Tj0wdizUV7/kbS/HVbrcQCnwyjhCmHSNurLYABcEWx1YdsOxqkC8biA0uNBgYK69E vtsZI4Bbgw5RG0U7o/GFw/h9PQaE1csz+jcjmz8lFkfMwXmu0i8pxYfMgkvaKlF5QcrN WD8jHhVLVOcy9Bps/84Wat7N4VQ5H4zSjh47j5ZlOr544A087fX8F/9mY1vUPqJg5Whg ON/f0naPlr+roqYNdlgtgH3Co5lq59lTywSpoemrX9D8vN+h9cjKg2PnUBEfjkUaW5Z4 DvFA== X-Gm-Message-State: APjAAAXm5bUlwRw6OHqePHT3Hl2IeQJ97ANpYXNc6tchWYh00DpiUQAT +LTcWRaOh6mbrMC6CJWynrELN83O X-Google-Smtp-Source: APXvYqzwRZs5G5toy1vgZ0n+XZT/4PU3muuweT5oh0bxyTPJ+vQ8D5JznZunRbkLO0FSGp02C4vW9w== X-Received: by 2002:a17:902:1c7:: with SMTP id b65mr32315742plb.313.1566462493235; Thu, 22 Aug 2019 01:28:13 -0700 (PDT) Received: from localhost.localdomain ([192.47.164.146]) by smtp.gmail.com with ESMTPSA id g3sm34795361pfm.179.2019.08.22.01.28.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Aug 2019 01:28:12 -0700 (PDT) From: yasufum.o@gmail.com To: spp@dpdk.org, ferruh.yigit@intel.com, yasufum.o@gmail.com Date: Thu, 22 Aug 2019 17:28:05 +0900 Message-Id: <20190822082806.20327-2-yasufum.o@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190822082806.20327-1-yasufum.o@gmail.com> References: <20190822082806.20327-1-yasufum.o@gmail.com> Subject: [spp] [PATCH 1/2] tools/sppc: change env var SPP_CTRL_IP X-BeenThere: spp@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Soft Patch Panel List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: spp-bounces@dpdk.org Sender: "spp" From: Yasufumi Ogawa The name of `SPP_CTRL_IP` of spp-ctl is ambiguous and it is better to renmae `SPP_CTL_IP`. Signed-off-by: Yasufumi Ogawa --- tools/sppc/app/spp-nfv.py | 19 ++++++++++--------- tools/sppc/app/spp-primary.py | 27 ++++++++++++++------------- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/tools/sppc/app/spp-nfv.py b/tools/sppc/app/spp-nfv.py index 6506fed..96e25e7 100755 --- a/tools/sppc/app/spp-nfv.py +++ b/tools/sppc/app/spp-nfv.py @@ -28,14 +28,14 @@ def parse_args(): type=int, help='Secondary ID') parser.add_argument( - '-ip', '--ctrl-ip', + '-ip', '--ctl-ip', type=str, - help="IP address of SPP controller") + help="IP address of spp-ctl") parser.add_argument( - '--ctrl-port', + '--ctl-port', type=int, default=6666, - help="Port of SPP controller") + help="Port for secondary of spp-ctl") parser = app_helper.add_sppc_args(parser) @@ -99,12 +99,13 @@ def main(): else: spp_opts += ['-n', str(args.sec_id), '\\'] - # IP address of SPP controller. - ctrl_ip = os.getenv('SPP_CTRL_IP', args.ctrl_ip) - if ctrl_ip is None: - common.error_exit('SPP_CTRL_IP') + # IP address of spp-ctl. + ctl_ip = os.getenv('SPP_CTL_IP', args.ctl_ip) + if ctl_ip is None: + print('Env variable "SPP_CTL_IP" is not defined!') + exit() else: - spp_opts += ['-s', '%s:%d' % (ctrl_ip, args.ctrl_port), '\\'] + spp_opts += ['-s', '{}:{}'.format(ctl_ip, args.ctl_port), '\\'] cmds = docker_cmd + docker_opts + spp_cmd + eal_opts + spp_opts if cmds[-1] == '\\': diff --git a/tools/sppc/app/spp-primary.py b/tools/sppc/app/spp-primary.py index 6a004f6..6a71490 100755 --- a/tools/sppc/app/spp-primary.py +++ b/tools/sppc/app/spp-primary.py @@ -41,14 +41,14 @@ def parse_args(): type=str, help='TAP device IDs') parser.add_argument( - '-ip', '--ctrl-ip', + '-ip', '--ctl-ip', type=str, - help="IP address of SPP controller") + help="IP address of spp-ctl") parser.add_argument( - '--ctrl-port', + '--ctl-port', type=int, default=5555, - help="Port of SPP controller") + help="Port for primary of spp-ctl") parser = app_helper.add_sppc_args(parser) @@ -88,8 +88,8 @@ def main(): socks = [] for dev_id in dev_vhost_ids: socks.append({ - 'host': '/tmp/sock%d' % dev_id, - 'guest': '/tmp/sock%d' % dev_id}) + 'host': '/tmp/sock{}'.format(dev_id), + 'guest': '/tmp/sock{}'.format(dev_id)}) else: dev_vhost_ids = [] @@ -122,13 +122,13 @@ def main(): # Add TAP vdevs for i in range(len(dev_tap_ids)): eal_opts += [ - '--vdev', 'net_tap%d,iface=foo%d' % ( + '--vdev', 'net_tap{},iface=foo{}'.format( dev_tap_ids[i], dev_tap_ids[i]), '\\'] # Add vhost vdevs for i in range(len(dev_vhost_ids)): eal_opts += [ - '--vdev', 'eth_vhost%d,iface=%s' % ( + '--vdev', 'eth_vhost{},iface={}'.format( dev_vhost_ids[i], socks[i]['guest']), '\\'] eal_opts += ['--', '\\'] @@ -142,12 +142,13 @@ def main(): spp_opts += ['-n', str(args.nof_ring), '\\'] - # IP address of SPP controller. - ctrl_ip = os.getenv('SPP_CTRL_IP', args.ctrl_ip) - if ctrl_ip is None: - common.error_exit('SPP_CTRL_IP') + # IP address of spp-ctl. + ctl_ip = os.getenv('SPP_CTL_IP', args.ctl_ip) + if ctl_ip is None: + print('Env variable "SPP_CTL_IP" is not defined!') + exit() else: - spp_opts += ['-s', '%s:%d' % (ctrl_ip, args.ctrl_port), '\\'] + spp_opts += ['-s', '{}:{}'.format(ctl_ip, args.ctl_port), '\\'] cmds = docker_cmd + docker_opts + spp_cmd + eal_opts + spp_opts if cmds[-1] == '\\': -- 2.17.1