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 C641CA0524
	for <public@inbox.dpdk.org>; Tue, 25 Feb 2020 11:34:57 +0100 (CET)
Received: from [92.243.14.124] (localhost [127.0.0.1])
	by dpdk.org (Postfix) with ESMTP id C0195B62;
	Tue, 25 Feb 2020 11:34:57 +0100 (CET)
Received: from mail-pj1-f67.google.com (mail-pj1-f67.google.com
 [209.85.216.67]) by dpdk.org (Postfix) with ESMTP id 62D3CB62
 for <spp@dpdk.org>; Tue, 25 Feb 2020 11:34:56 +0100 (CET)
Received: by mail-pj1-f67.google.com with SMTP id d5so1069342pjz.5
 for <spp@dpdk.org>; Tue, 25 Feb 2020 02:34:56 -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=8LNRHwdXz92HYS0Uhzoi3kf4jxu8rpDlfIMD6qZ46M8=;
 b=Dfj3cSDZiWjGbc2IdPWj207vpqF03iW1YkCTC7UEfKKQ07ASpn90ak9PthASW/aiPI
 76EWpv7ECEwShrf+4b0SO86pdSJQ6VGBU0JfQEuG0SNEXZaj/5DKHZ/jhJgM8ThkGROJ
 013LdFWrXJDfxS790ZjGMCtiQxg2Gb2HBozCwBKMt25Grgwt7HIBuplH7JbBVhWG4/NY
 uQe8Keq8JSCrPqSVpKZkvTK7SWEFqTdXPjmkXE2FFbGZJkMY9lp++af1RagexF3yWu5j
 PWccJEThPSxpODw7HG1dlOncg5GeRluPKHbi6S10eRkan0P9IyAHl/YCSV24UOtrTVGZ
 KvUg==
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=8LNRHwdXz92HYS0Uhzoi3kf4jxu8rpDlfIMD6qZ46M8=;
 b=dvPfgYhsFK9jlcZRUe0JAL8/1zxtGetCk2k2bHuZ3wwYIuU6njqxyygG1RVaLTVfjj
 cvueyYkb2WZWOxTFzCH3hzn/dKQhBAjY0XMJRTxnH4LzIY4OfjfSiHg7ZU5JfUBSp9/w
 OFIBalTeWSYXaKi6GhsUXMcHdHvJlYdN2DCZkZaWYvtHP+EMoR/fOaP8b0SNedK7JMOJ
 NPJ5zH4j+lgz+cYGmBG3+yfqZouiY+rqNslC3TrYynGa7lnt2oWc7uDtp2Bfl+eWtAWa
 ZzkzI+Y4sF1+e66zGIlDJ+/DUld9HLJX7+0W4A3CcpPcbA1xfUWSiMCKb8pyPCQWAnVy
 Ac8g==
X-Gm-Message-State: APjAAAXhYPUvf7ggjxk3zbsAiJcUXI/JTXRcFvPH+7Ag/992YlPLq+uH
 0WnHX1nsf6zhCazuOtyWA4J0e3JM
X-Google-Smtp-Source: APXvYqynLf4EQvUTOy/tf7ceIxA4mttiSs3Bv0UATMuKjeReztRhkfxrdGDnqdCewQUuvP5qjvJE+g==
X-Received: by 2002:a17:90a:5285:: with SMTP id
 w5mr4492081pjh.77.1582626895394; 
 Tue, 25 Feb 2020 02:34:55 -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.34.54
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Tue, 25 Feb 2020 02:34:54 -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:19 +0900
Message-Id: <20200225103446.8243-3-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 02/29] tools/sppc: update dev options of l2fwd
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 l2fwd container app.

Signed-off-by: Yasufumi Ogawa <yasufum.o@gmail.com>
---
 tools/sppc/app/l2fwd.py | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/tools/sppc/app/l2fwd.py b/tools/sppc/app/l2fwd.py
index a658d6c..1ddb6a9 100755
--- a/tools/sppc/app/l2fwd.py
+++ b/tools/sppc/app/l2fwd.py
@@ -45,12 +45,17 @@ def main():
     # Check for other mandatory opitons.
     if args.port_mask is None:
         common.error_exit('--port-mask')
-    if args.dev_ids is None:
-        common.error_exit('--dev-ids')
 
     # Setup for vhost devices with given device IDs.
-    dev_ids_list = app_helper.dev_ids_to_list(args.dev_ids)
-    sock_files = app_helper.sock_files(dev_ids_list)
+    dev_uids = None
+    sock_files = None
+    if args.dev_uids is not None:
+        if app_helper.is_valid_dev_uids(args.dev_uids) is False:
+            print('Invalid option: {}'.format(args.dev_uids))
+            exit()
+
+        dev_uids_list = args.dev_uids.split(',')
+        sock_files = app_helper.sock_files(dev_uids_list)
 
     # Setup docker command.
     docker_cmd = ['sudo', 'docker', 'run', '\\']
@@ -64,24 +69,25 @@ def main():
         exit()
 
     # Setup l2fwd command run on container.
-    cmd_path = '%s/examples/l2fwd/%s/l2fwd' % (
+    cmd_path = '{}/examples/l2fwd/{}/l2fwd'.format(
         env.RTE_SDK, env.RTE_TARGET)
 
     l2fwd_cmd = [cmd_path, '\\']
 
-    file_prefix = 'spp-l2fwd-container%d' % dev_ids_list[0]
+    file_prefix = app_helper.gen_sppc_file_prefix('l2fwd')
+
     eal_opts = app_helper.setup_eal_opts(args, file_prefix)
 
     l2fwd_opts = ['-p', args.port_mask, '\\']
 
-    # Parse vhost device IDs and Check the number of devices is
-    # sufficient for port mask.
-    if app_helper.is_sufficient_dev_ids(
-            args.dev_ids, args.port_mask) is not True:
-        print("Error: Cannot reserve ports '%s (= 0b%s)' on '%s'." % (
+    # Check given number of ports is enough for portmask.
+    if (args.port_mask is None) or (args.dev_uids is None):
+        pass
+    elif app_helper.is_sufficient_ports(args) is not True:
+        print("Error: Not enough ports, {} devs for '{}(=0b{})'.".format(
+            len(args.dev_uids.split(',')),
             args.port_mask,
-            format(int(args.port_mask, 16), 'b'),
-            args.dev_ids))
+            format(int(args.port_mask, 16), 'b')))
         exit()
 
     cmds = docker_cmd + docker_opts + l2fwd_cmd + eal_opts + l2fwd_opts
-- 
2.17.1