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 8F019A00E6 for ; Tue, 6 Aug 2019 14:07:13 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 615F21B955; Tue, 6 Aug 2019 14:07:13 +0200 (CEST) Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by dpdk.org (Postfix) with ESMTP id 2EDB81B955 for ; Tue, 6 Aug 2019 14:07:11 +0200 (CEST) Received: by mail-pl1-f176.google.com with SMTP id az7so37768798plb.5 for ; Tue, 06 Aug 2019 05:07:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=3v33a8M/LhFZlx/t1diSPhRpZyZkrYOQMVOivczkZko=; b=WIe7Jo+h3/YDIwIUiqhYzKamJDKcgF99HYuImqL5aNuaLQnQM/5+Odpf5IaUC1Wgtg exMdjWO9laPXSmInK75a6Qe6rHqOYfj1KGfm8u2Ys7OTtMFCrL9vyNOg7WfihnhvAaJh kxS/sxFeSpMQY1K0zNoTZVJlp6TQD8fEDsGnet257NTi22kLqpyqIi9yrIOe+kddZYWJ kOAExOnXYlpeU9O5yPYNj9Q6eby6zdKIg4Ge4uYXbAqLByuYwsjJm5419L0nAw06+hWp kaFmm/v156dqZSwiWf2y6t8ZgzeF28Cej8o3QT/pD/Eb8Tde/uk7zhVTMnXE2F92TSMq pd3A== 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; bh=3v33a8M/LhFZlx/t1diSPhRpZyZkrYOQMVOivczkZko=; b=AHwwYFNfU7wjV7J1mSWzgnTaATYXiEhiAD7SjBshKSsFSscygbRlYW/gem0M71xku8 dEBAN3/9corEtV2MUete9xVJUSwUPNnXMDsmcWKM+l8l/cdGUMGQt8sI593Kx80ejYHI annDGn7+JK85aSI52NzLwmukHaKsdMTMjFTnc0dF61JXPz7UUJmQYjCrSxrVLehH4iBy +iAq2pPohxuN3kSLaqYRSgqOXtp79Z09GHNQvQAoKD5BXj5a/vel4lrWQuoeNLhPZlgb TR0et0+jJfh65JI/jrnOyXElxZ9N1MfJYNpic7vmyeB3kYHThKuubNVvja0ZCkwrUOyz VZhA== X-Gm-Message-State: APjAAAWLg5SMtMqFHFch2SOPquE+bNxjWXo4fvsgTs1CGz3Lv+nrBsfv dWwFFjIk0Oe+lbs8M80T71afHVCy X-Google-Smtp-Source: APXvYqz7yxatCYFhY2DK01SBliFIylL5NJLp7GdoiWUlv1AwCtWV+KaIB57zsu448/2EepfxJzaxlw== X-Received: by 2002:a17:902:bd49:: with SMTP id b9mr2830263plx.343.1565093230254; Tue, 06 Aug 2019 05:07:10 -0700 (PDT) Received: from localhost.localdomain ([192.47.164.146]) by smtp.gmail.com with ESMTPSA id d8sm80733890pgh.45.2019.08.06.05.07.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Aug 2019 05:07:09 -0700 (PDT) From: yasufum.o@gmail.com To: spp@dpdk.org, ferruh.yigit@intel.com, yasufum.o@gmail.com Date: Tue, 6 Aug 2019 21:07:05 +0900 Message-Id: <20190806120705.13265-1-yasufum.o@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [spp] [PATCH] cli: fix TODOs in pri command 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 This update is to fix following TODOs in `commands/pri.py`. For second one, add util method print_compl_warinig(). * Not accept if given sec ID is already used. * Warn if enough number of empty lcores cannot be assinged. Signed-off-by: Yasufumi Ogawa --- src/cli/commands/pri.py | 16 +++++++++------- src/cli/shell_lib/common.py | 11 +++++++++++ 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/src/cli/commands/pri.py b/src/cli/commands/pri.py index eb4d7d4..da5eca6 100644 --- a/src/cli/commands/pri.py +++ b/src/cli/commands/pri.py @@ -238,9 +238,6 @@ class SppPrimary(object): if (tokens[2] in spp_common.SEC_TYPES) and \ (int(tokens[3])-1 in range(max_secondary)): ptype = tokens[2] - - # TODO(yasufum) Not accept if given sec ID is already - # used. sid = tokens[3] # Option of secondary ID is different between spp_nfv @@ -290,21 +287,26 @@ class SppPrimary(object): empty_lcores = self._get_empty_lcores() empty_lcores = sum(empty_lcores, []) + # Check if enough number of lcores available. + if len(empty_lcores) < nof_slaves: + common.print_compl_warinig( + 'No available lcores remained!') + return [] + if 'sec_m_lcore' in cli_config.keys(): master_lcore = cli_config['sec_m_lcore']['val'] else: logger.error('Config "sec_m_lcore" is not defined!') has_invalid_param = True - # Decide lcore option based on configured number of - # lcores. + # Decide lcore option based on configured number of lcores. slave_lcores = [] for l in empty_lcores: # Master lcore ID should be smaller than slaves. if l > int(master_lcore): slave_lcores.append(str(l)) - # TODO(yasufum) warn if enough number of empty - # lcores cannot be assinged. + + # Check if required number of lcores are found. if len(slave_lcores) > (nof_slaves - 1): break diff --git a/src/cli/shell_lib/common.py b/src/cli/shell_lib/common.py index ad34e56..b936348 100644 --- a/src/cli/shell_lib/common.py +++ b/src/cli/shell_lib/common.py @@ -282,3 +282,14 @@ def validate_config_val(key, val): # No need to check others. return True + + +def print_compl_warinig(msg): + """Print warning message for completion. + + Printing message while complition disturbs user's input, but it should be + printed in some error cases. This method is just for printing warning + message simply. + """ + + print('// WARN: {msg}'.format(msg=msg)) -- 2.17.1