From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <spp-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
	by inbox.dpdk.org (Postfix) with ESMTP id 0A31FA0524
	for <public@inbox.dpdk.org>; Tue, 25 Feb 2020 11:35:27 +0100 (CET)
Received: from [92.243.14.124] (localhost [127.0.0.1])
	by dpdk.org (Postfix) with ESMTP id 03B53B62;
	Tue, 25 Feb 2020 11:35:27 +0100 (CET)
Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com
 [209.85.216.52]) by dpdk.org (Postfix) with ESMTP id BD74F1BC24
 for <spp@dpdk.org>; Tue, 25 Feb 2020 11:35:25 +0100 (CET)
Received: by mail-pj1-f52.google.com with SMTP id dw13so1069547pjb.4
 for <spp@dpdk.org>; Tue, 25 Feb 2020 02:35:25 -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=1tal6ExNcczs3ngplSRfsGjqyL8q4NwGwXSIXWSToqE=;
 b=RW3uYJ3gOYoMHiQEQWR2CBbN2sLGfREef35Iyxph1VHprQ0H42nQz1hHsJmOLyOOJf
 06u4mVB9mqmz7mKba9Ot6mvEKeWDtx/OwqIm4HkRV4UGzCU4QGegAVqgDMlj4CxpWk9x
 CVcGbFd0v2D39Vd3blStwrOUyPgnKGe5OoOWL1mr0rH+uUtUYreTTrR1WTT3bPIBnDdK
 ic8vMo59kBMzSkZT7e3SdyOVyOKu8AJo49rEr/GX5ofZpv/eJ1IHoKpdcxQlow5KpBSz
 S/98OXw41V34cZADh/8uVLRtWn1GDQU7Xg94GDX80idKfrri89NodL5kA2EhWZ5lC9VQ
 BUOg==
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=1tal6ExNcczs3ngplSRfsGjqyL8q4NwGwXSIXWSToqE=;
 b=lPW2mCGJYVM7EZUy0p0krY+8AI0Ee04fGj3ZYFiKJZe+n2AyOGQ/ANa/deoKBCQA85
 jxk753kr1d/hByY41XAj3gyqpUVRKWYL+h+SPK72h89SufHYy5hXtpI4Gwyc1YvJA86d
 kuePU967YrUs0rrAwuDNifYrAiYC85YK1TsTD3EObloDfgIyRZw6/9chDACpBLjyQ7Nq
 zyGWCRpdbraRq/5pt500jSfCk8dHx0720RpvPjpSorL8H3kBIZESOdy6lyW9XGWv3XXY
 TENupW6GqN9vT99Uspm/wKuoWtviTzAaxrV48cxOmk7GcOZ5a/VLmwte4xc2iPaEpe2A
 kAXQ==
X-Gm-Message-State: APjAAAXqD8KPwHzZhrC7q1pAiaCJxwRwSzj7HHZ153IAXpm7fbAwboo2
 Sf1U59PyQD5aqvHtEXhz7zK4ctbZ
X-Google-Smtp-Source: APXvYqzzCrbjnfnOiFLYVv0odxMYxpnOVG89TVTlcnfIzO2tGma0x+VKc1kIxMCwl2XyvT/+TGYF6Q==
X-Received: by 2002:a17:902:8642:: with SMTP id
 y2mr53441282plt.306.1582626924647; 
 Tue, 25 Feb 2020 02:35:24 -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.23
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Tue, 25 Feb 2020 02:35:24 -0800 (PST)
From: Yasufumi Ogawa <yasufum.o@gmail.com>
To: spp@dpdk.org,
	ferruh.yigit@intel.com,
	yasufum.o@gmail.com
Date: Tue, 25 Feb 2020 19:34:36 +0900
Message-Id: <20200225103446.8243-20-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 19/29] tools/sppc: update dev options of spp_nfv
X-BeenThere: spp@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: Soft Patch Panel <spp.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/spp>,
 <mailto:spp-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/spp/>
List-Post: <mailto:spp@dpdk.org>
List-Help: <mailto:spp-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/spp>,
 <mailto:spp-request@dpdk.org?subject=subscribe>
Errors-To: spp-bounces@dpdk.org
Sender: "spp" <spp-bounces@dpdk.org>

Update options for vdevs of spp_nfv container app.

Signed-off-by: Yasufumi Ogawa <yasufum.o@gmail.com>
---
 tools/sppc/app/spp-nfv.py     | 45 ++++++++++++++++-------------------
 tools/sppc/app/spp-primary.py |  1 +
 2 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/tools/sppc/app/spp-nfv.py b/tools/sppc/app/spp-nfv.py
index da9853b..3d608f3 100755
--- a/tools/sppc/app/spp-nfv.py
+++ b/tools/sppc/app/spp-nfv.py
@@ -18,6 +18,7 @@ def parse_args():
         description="Launcher for spp-nfv application container")
 
     parser = app_helper.add_eal_args(parser)
+    parser = app_helper.add_appc_args(parser)
 
     # Application specific arguments
     parser.add_argument(
@@ -35,16 +36,16 @@ def parse_args():
         help="Port for secondary of spp-ctl")
 
     parser = app_helper.add_sppc_args(parser)
-
     return parser.parse_args()
 
 
 def main():
     args = parse_args()
 
+    app_name = 'spp_nfv'
+
     # Setup docker command.
     docker_cmd = ['sudo', 'docker', 'run', '\\']
-    docker_opts = []
 
     # Container image name such as 'sppc/spp-ubuntu:18.04'
     if args.container_image is not None:
@@ -54,33 +55,28 @@ def main():
             common.IMG_BASE_NAMES['spp'],
             args.dist_name, args.dist_ver)
 
-    # This container is running in backgroud in defualt.
-    if args.foreground is not True:
-        docker_opts += ['-d', '\\']
-    else:
-        docker_opts += ['-it', '\\']
-
-    docker_opts += [
-        '--privileged', '\\',  # should be privileged
-        '-v', '/dev/hugepages:/dev/hugepages', '\\',
+    app_opts = [
         '-v', '/var/run/:/var/run/', '\\',
-        '-v', '/tmp/:/tmp/', '\\',
-        container_image, '\\'
-    ]
+        '-v', '/tmp/:/tmp/', '\\']
+
+    docker_opts = app_helper.setup_docker_opts(
+            args, None, app_opts)
 
     # Setup spp_nfv command.
-    spp_cmd = ['spp_nfv', '\\']
+    spp_cmd = [app_name, '\\']
 
     # Do not use 'app_helper.setup_eal_opts()' because spp_nfv does
     # not use virtio.
-    core_opt = app_helper.get_core_opt(args)
-    mem_opt = app_helper.get_mem_opt(args)
-    eal_opts = [
-        core_opt['attr'], core_opt['val'], '\\',
-        '-n', str(args.nof_memchan), '\\',
-        mem_opt['attr'], mem_opt['val'], '\\',
-        '--proc-type', 'secondary', '\\',
-        '--', '\\']
+    #core_opt = app_helper.get_core_opt(args)
+    #mem_opt = app_helper.get_mem_opt(args)
+    #eal_opts = [
+    #    core_opt['attr'], core_opt['val'], '\\',
+    #    '-n', str(args.nof_memchan), '\\',
+    #    mem_opt['attr'], mem_opt['val'], '\\',
+    #    '--proc-type', 'secondary', '\\',
+    #    '--', '\\']
+    eal_opts = app_helper.setup_eal_opts(args, common.SPPC_FILE_PREFIX,
+                                         proc_type='secondary')
 
     spp_opts = []
     # Check for other mandatory opitons.
@@ -97,7 +93,8 @@ def main():
     else:
         spp_opts += ['-s', '{}:{}'.format(ctl_ip, args.ctl_port), '\\']
 
-    cmds = docker_cmd + docker_opts + spp_cmd + eal_opts + spp_opts
+    cmds = docker_cmd + docker_opts + [container_image, '\\'] + \
+        spp_cmd + eal_opts + spp_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 80b0c7b..5cc12ed 100755
--- a/tools/sppc/app/spp-primary.py
+++ b/tools/sppc/app/spp-primary.py
@@ -62,6 +62,7 @@ def main():
 
     # Setup devices with given device UIDs.
     dev_uids_list = None
+    # TODO(yasufum) Remove no need sock_files
     sock_files = []
     if args.dev_uids is not None:
         if app_helper.is_valid_dev_uids(args.dev_uids) is False:
-- 
2.17.1