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 EA915A0524 for ; Tue, 25 Feb 2020 11:35:25 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E34241BFB3; Tue, 25 Feb 2020 11:35:25 +0100 (CET) Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by dpdk.org (Postfix) with ESMTP id EBA341BFAB for ; Tue, 25 Feb 2020 11:35:23 +0100 (CET) Received: by mail-pg1-f179.google.com with SMTP id 7so4597963pgr.2 for ; Tue, 25 Feb 2020 02:35:23 -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=Ixwnu3/Ud52aCcrZ9RzCbDkwi3zJCBLWNDmo759ddCQ=; b=vF11OFv5yViR8oZQF9p1HuGgwG8VcIyAMYDiFHbZSO5oNApeP7CJ6BzWFoffbTMtd4 c9Ol4OhJKHKqwYUWNitp0abScknfzE5ePCdGmxdH1o8tY4PA153SpikfJpF8W/8jl6aA 1JNnLlMqmy+DpAnnGRzAg0FsrF6CTBzZcSeRPF6Q6+oCLb1wnKcznQ0fhElKGYH7GSrm vJz4o3NvGWhcuUHb+oZDuyuZWhPpg/9vDJMeYm2H0bPf0/81H18akEtCmssK8ia/zxWm 4U2RKAUEiP2oXw4ZHsQ7mB8JnbJg2hRZ4XIkZCuOjRBa5R2Ruac3fWagtrmVrhPtNUVV tRpQ== 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=Ixwnu3/Ud52aCcrZ9RzCbDkwi3zJCBLWNDmo759ddCQ=; b=JGyRZ0Vwn7FIevOEEKZdmy3KmlFLYN1PWRmYIbx5s34KnO0QcXsxenyNdscxWAUL1m APCbZn0LZlOL9meXP+ByZJ3aXjxWITojEaAxkOzirQRpHUqPIJLNbT8ZXiD1ldzoaXwc jevlYN90ku9N+A1WwGp3NCcBZFv5dqd6D5MBurDjTy6Z2/PkFXnmMyui9DOyv/LdBDL4 PbvN5neJhtbH/w9JojtAfmFP/bUb5fqbbGkmfjxDVkxnsglhsHoNWW0iQ4Y1sGqmyjLf k7joDJBFiY+QN0vxqebTtyPy38KFFj9nodUT1+Kkee/DENiD+o+W0T8Z7VcXrSL3iHfm Io6g== X-Gm-Message-State: APjAAAUqiZYTD9DfXAebbknEIjWBAmKQflK4ZkeYok6rUhjYRV3yowy6 h1tKSsWAgH2h3Blsz6VUt5iWeU5z X-Google-Smtp-Source: APXvYqxST6OuJ//fIDYkTLCqWfJap9pFPNL3trfV+IIjRpAM8TdbqzbazUWa0Uljo/UD97TeFx2j5A== X-Received: by 2002:a62:e713:: with SMTP id s19mr32475704pfh.22.1582626922933; Tue, 25 Feb 2020 02:35:22 -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.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2020 02:35:22 -0800 (PST) From: Yasufumi Ogawa To: spp@dpdk.org, ferruh.yigit@intel.com, yasufum.o@gmail.com Date: Tue, 25 Feb 2020 19:34:35 +0900 Message-Id: <20200225103446.8243-19-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 18/29] tools/sppc: update dev options of suricata 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" Update options for vdevs of suricata container app. Signed-off-by: Yasufumi Ogawa --- tools/sppc/app/suricata.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/tools/sppc/app/suricata.py b/tools/sppc/app/suricata.py index 2ac01c0..34601e1 100755 --- a/tools/sppc/app/suricata.py +++ b/tools/sppc/app/suricata.py @@ -35,24 +35,26 @@ def main(): common.IMG_BASE_NAMES['suricata'], args.dist_name, args.dist_ver) - # Check for other mandatory opitons. - if args.dev_ids is None: - common.error_exit('--dev-ids') + # Setup devices with given device UIDs. + 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() - # 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_list = args.dev_uids.split(',') + sock_files = app_helper.sock_files(dev_uids_list) # 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 = '/bin/bash' cmd = [cmd_path, '\\'] - cmds = docker_cmd + docker_opts + cmd + cmds = docker_cmd + docker_opts + [container_image, '\\'] + cmd if cmds[-1] == '\\': cmds.pop() common.print_pretty_commands(cmds) -- 2.17.1