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 C28F1A0524 for ; Tue, 25 Feb 2020 11:35:21 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BB3D71BC24; Tue, 25 Feb 2020 11:35:21 +0100 (CET) Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) by dpdk.org (Postfix) with ESMTP id 93BC31BC24 for ; Tue, 25 Feb 2020 11:35:20 +0100 (CET) Received: by mail-pg1-f177.google.com with SMTP id r77so3288833pgr.12 for ; Tue, 25 Feb 2020 02:35:20 -0800 (PST) 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=gboa1CNuesw8lPmyxV/+Q7O9Mss3FBETaJMGsdut7V4=; b=PjnZV/yPtZyq0ezMHx8Tyg60FMP4mg0EAhkJqlGfDw/AM1ipkOt50ovrpRQNkP8HDB FUXpEnyGQ3FU6OravjEiW0M7uynV10haHcCj/axWu14/tdOi5B3/CQr4WZNaWwYhec/w sdZNko7Z3XyVYqW59DgAK5W826FI91LU6QARjrso4CTZx8MX3qGWZ0J3cSBBHdQyEiNF 3TIe7blKqlaB5lxXVMscHJoQPMsLLKq9c4BcARL1aKqIqrdck532Yuurl7EhsK03lHZX 2aeHLvg8yqUJYUkhmxaumwRe2uS4TFbeMuoB4drSMxi4O+BLGNOhHb9yAhQnc0z6jMlk akiA== 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=gboa1CNuesw8lPmyxV/+Q7O9Mss3FBETaJMGsdut7V4=; b=beeauHaxkY7IirYikLh7G3JFNDpHWCbmzT7iMqbgT0U2sORntc0XHKKZVd1liLaOZ3 sRZIqsi59K5HARXBLR+iLwuerqlYtUWiCX8ithHg6mFyCpO/YpyYMgvUMi2LaRxHimkk Fc71hIUg3IX0tCYeXG3ovZKCRPe+V43w/kNhy8W7uRLJy9aYd6tEOTA2szAabFo1dLdk Wy5ZCTTLP8aNIn0vPgmBQ8lM1QTgMFQ5OLgjO6I3Ryfy+uKuPA9G5BlV6OfJ2Oc/qN65 cZN5Osmz/4hHnxBKaBvrFty6WbzS/myeXV1vzN4JzBej1GvRmKvgBzLg2UgKdAifVia/ qP7g== X-Gm-Message-State: APjAAAX24pubNCg4W7nNy1vVHLS+5r5edauc6llRpdSnpyG17UnaXt1P 7RScPbUE9aw1zidEQgiqwwxJAjg9 X-Google-Smtp-Source: APXvYqzUcBiVHz+dLhHBDhGNZTAq/ychtmfbsg/0oo3TT8kEhFIBrUGnRQfRcqkId7zT0h1zIf4a7A== X-Received: by 2002:aa7:8597:: with SMTP id w23mr26810667pfn.38.1582626919379; Tue, 25 Feb 2020 02:35:19 -0800 (PST) Received: from localhost.localdomain ([2400:4050:c8c2:de00:35bc:b9a3:f404:3cf2]) by smtp.gmail.com with ESMTPSA id a10sm15819987pgk.71.2020.02.25.02.35.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2020 02:35:18 -0800 (PST) From: Yasufumi Ogawa To: spp@dpdk.org, ferruh.yigit@intel.com, yasufum.o@gmail.com Date: Tue, 25 Feb 2020 19:34:33 +0900 Message-Id: <20200225103446.8243-17-yasufum.o@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200225103446.8243-1-yasufum.o@gmail.com> References: <20200225103446.8243-1-yasufum.o@gmail.com> Subject: [spp] [PATCH 16/29] tools/sppc: update calling setup_docker_opts() 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" As getting args of setup_docker_opts() was changed for supporting spp_primary, this update is to change the method call. Signed-off-by: Yasufumi Ogawa --- tools/sppc/app/l2fwd.py | 6 +++--- tools/sppc/app/l3fwd-acl.py | 12 +++++++----- tools/sppc/app/l3fwd.py | 6 +++--- tools/sppc/app/load-balancer.py | 6 +++--- tools/sppc/app/pktgen.py | 6 +++--- tools/sppc/app/spp-primary.py | 4 ++-- tools/sppc/app/testpmd.py | 6 +++--- 7 files changed, 24 insertions(+), 22 deletions(-) diff --git a/tools/sppc/app/l2fwd.py b/tools/sppc/app/l2fwd.py index d6156a8..3bbaf34 100755 --- a/tools/sppc/app/l2fwd.py +++ b/tools/sppc/app/l2fwd.py @@ -59,8 +59,7 @@ def main(): # Setup docker command. docker_cmd = ['sudo', 'docker', 'run', '\\'] - docker_opts = app_helper.setup_docker_opts( - args, container_image, sock_files) + docker_opts = app_helper.setup_docker_opts(args, sock_files) # Check if the number of ports is even for l2fwd. nof_ports = app_helper.count_ports(args.port_mask) @@ -93,7 +92,8 @@ def main(): format(int(args.port_mask, 16), 'b'))) exit() - cmds = docker_cmd + docker_opts + l2fwd_cmd + eal_opts + l2fwd_opts + cmds = docker_cmd + docker_opts + [container_image, '\\'] + \ + l2fwd_cmd + eal_opts + l2fwd_opts if cmds[-1] == '\\': cmds.pop() common.print_pretty_commands(cmds) diff --git a/tools/sppc/app/l3fwd-acl.py b/tools/sppc/app/l3fwd-acl.py index 46163f4..93c4866 100755 --- a/tools/sppc/app/l3fwd-acl.py +++ b/tools/sppc/app/l3fwd-acl.py @@ -163,8 +163,7 @@ def main(): # Setup docker command. docker_cmd = ['sudo', 'docker', 'run', '\\'] - docker_opts = app_helper.setup_docker_opts( - args, container_image, sock_files) + docker_opts = app_helper.setup_docker_opts(args, sock_files) # Check given number of ports is enough for portmask. if (args.port_mask is None) or (args.dev_uids is None): @@ -209,13 +208,15 @@ def main(): if args.rule_ipv4 is not None: if os.path.exists(args.rule_ipv4): - l3fwd_opts += ['--rule_ipv4', '"{:s}"'.format(args.rule_ipv4), '\\'] + l3fwd_opts += ['--rule_ipv4', '"{:s}"'.format(args.rule_ipv4), + '\\'] else: print('Error: "{}" does not exist'.format(args.rule_ipv4)) exit() if args.rule_ipv6 is not None: if os.path.exists(args.rule_ipv6): - l3fwd_opts += ['--rule_ipv6', '"{:s}"'.format(args.rule_ipv6), '\\'] + l3fwd_opts += ['--rule_ipv6', '"{:s}"'.format(args.rule_ipv6), + '\\'] else: print('Error: "{}" does not exist'.format(args.rule_ipv6)) exit() @@ -231,7 +232,8 @@ def main(): if args.no_numa is True: l3fwd_opts += ['--no-numa', '\\'] - cmds = docker_cmd + docker_opts + l3fwd_cmd + eal_opts + l3fwd_opts + cmds = docker_cmd + docker_opts + [container_image, '\\'] + \ + l3fwd_cmd + eal_opts + l3fwd_opts if cmds[-1] == '\\': cmds.pop() common.print_pretty_commands(cmds) diff --git a/tools/sppc/app/l3fwd.py b/tools/sppc/app/l3fwd.py index 356b281..4a3d2a2 100755 --- a/tools/sppc/app/l3fwd.py +++ b/tools/sppc/app/l3fwd.py @@ -198,8 +198,7 @@ def main(): # Setup docker command. docker_cmd = ['sudo', 'docker', 'run', '\\'] - docker_opts = app_helper.setup_docker_opts( - args, container_image, sock_files) + docker_opts = app_helper.setup_docker_opts(args, sock_files) # Check given number of ports is enough for portmask. if (args.port_mask is None) or (args.dev_uids is None): @@ -285,7 +284,8 @@ def main(): if args.ipv6 is True: l3fwd_opts += ['--ipv6', '\\'] - cmds = docker_cmd + docker_opts + l3fwd_cmd + eal_opts + l3fwd_opts + cmds = docker_cmd + docker_opts + [container_image, '\\'] + \ + l3fwd_cmd + eal_opts + l3fwd_opts if cmds[-1] == '\\': cmds.pop() common.print_pretty_commands(cmds) diff --git a/tools/sppc/app/load-balancer.py b/tools/sppc/app/load-balancer.py index ec504e7..ea5fa19 100755 --- a/tools/sppc/app/load-balancer.py +++ b/tools/sppc/app/load-balancer.py @@ -91,8 +91,7 @@ def main(): # Setup docker command. docker_cmd = ['sudo', 'docker', 'run', '\\'] - docker_opts = app_helper.setup_docker_opts( - args, container_image, sock_files) + docker_opts = app_helper.setup_docker_opts(args, sock_files) cmd_path = '{0:s}/examples/{1:s}/{2:s}/{1:s}'.format( env.RTE_SDK, app_name, env.RTE_TARGET) @@ -138,7 +137,8 @@ def main(): if args.pos_lb is not None: lb_opts += ['--pos-lb', str(args.pos_lb)] - cmds = docker_cmd + docker_opts + lb_cmd + eal_opts + lb_opts + cmds = docker_cmd + docker_opts + [container_image, '\\'] + \ + lb_cmd + eal_opts + lb_opts if cmds[-1] == '\\': cmds.pop() common.print_pretty_commands(cmds) diff --git a/tools/sppc/app/pktgen.py b/tools/sppc/app/pktgen.py index a7112e6..bcc8d42 100755 --- a/tools/sppc/app/pktgen.py +++ b/tools/sppc/app/pktgen.py @@ -92,8 +92,7 @@ def main(): else: wd = '/root/pktgen-dpdk' docker_cmd = ['sudo', 'docker', 'run', '\\'] - docker_opts = app_helper.setup_docker_opts( - args, container_image, sock_files, wd) + docker_opts = app_helper.setup_docker_opts(args, sock_files, wd) # Setup pktgen command pktgen_cmd = ['pktgen', '\\'] @@ -181,7 +180,8 @@ def main(): if args.numa is True: pktgen_opts += ['-N', '\\'] - cmds = docker_cmd + docker_opts + pktgen_cmd + eal_opts + pktgen_opts + cmds = docker_cmd + docker_opts + [container_image, '\\'] + \ + pktgen_cmd + eal_opts + pktgen_opts if cmds[-1] == '\\': cmds.pop() common.print_pretty_commands(cmds) diff --git a/tools/sppc/app/spp-primary.py b/tools/sppc/app/spp-primary.py index 25f94ef..80b0c7b 100755 --- a/tools/sppc/app/spp-primary.py +++ b/tools/sppc/app/spp-primary.py @@ -103,8 +103,8 @@ def main(): else: spp_opts += ['-s', '{}:{}'.format(ctl_ip, args.ctl_port), '\\'] - cmds = docker_cmd + docker_opts + [container_image] + spp_cmd + \ - eal_opts + spp_opts + cmds = docker_cmd + docker_opts + [container_image, '\\'] + \ + spp_cmd + eal_opts + spp_opts if cmds[-1] == '\\': cmds.pop() diff --git a/tools/sppc/app/testpmd.py b/tools/sppc/app/testpmd.py index 1ffb6eb..a84a175 100755 --- a/tools/sppc/app/testpmd.py +++ b/tools/sppc/app/testpmd.py @@ -475,8 +475,7 @@ def main(): # Setup docker command. docker_cmd = ['sudo', 'docker', 'run', '\\'] - docker_opts = app_helper.setup_docker_opts( - args, container_image, sock_files) + docker_opts = app_helper.setup_docker_opts(args, sock_files) cmd_path = 'testpmd' @@ -916,7 +915,8 @@ def main(): if args.no_mlockall is True: testpmd_opts += ['--no-mlockall', '\\'] - cmds = docker_cmd + docker_opts + testpmd_cmd + eal_opts + testpmd_opts + cmds = docker_cmd + docker_opts + [container_image, '\\'] + \ + testpmd_cmd + eal_opts + testpmd_opts if cmds[-1] == '\\': cmds.pop() common.print_pretty_commands(cmds) -- 2.17.1