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 0162DA0352 for ; Thu, 16 Jan 2020 13:02:51 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id EC1391C227; Thu, 16 Jan 2020 13:02:50 +0100 (CET) Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) by dpdk.org (Postfix) with ESMTP id ABDC81C2AB for ; Thu, 16 Jan 2020 13:02:49 +0100 (CET) Received: by mail-pl1-f194.google.com with SMTP id a6so8262463plm.3 for ; Thu, 16 Jan 2020 04:02:49 -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=+caAKC0WLqCYkBpLbjW2BCs+g2xVnCdz3YHvi/k7+I4=; b=jZ7zdUn031QYUvuJIbG0GxDVlV2jzRMl0rzZJE7+AAoRzSbDaPJs1cumsFFH0mplHU uqszRsCzTDxG3rRvvfTQE+IRuFlmJlaaMc3sOfyzg4m9FtJrHhAXcQAwSvNsCSFKucqR zHsQZIjrvSXkqGcTNuFdNPICcKES529GxfaFKDbGczAdf5uQF8/RLBtgcv92vxSwWLbW f1vRLLg02b7KZ9zrqaSthPpj+LgmgaCmERpyWNNXQ7eyFCARgivpG7OItbclNxUyLpjb KBz9guTLp6d6LIdguft/GvBJmFUPYJ11+YOnQyfiM2JOBpdXwioZ7a9nb/48CgKSFF+t aT7g== 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=+caAKC0WLqCYkBpLbjW2BCs+g2xVnCdz3YHvi/k7+I4=; b=NdRWO282NLWRFZ0SQxxhQYeDkCdAHFQS1p96RS8l+JbN47Aeu4e5NhOdIbtJBaKt2r 5Z3hwWB3WL5smDmAxoOiKhK5RJ0rI/wB4Znh2r8PidMraovUX1RcJ+qw4+XqA7nXhSj5 SRTB0PQyeho7kQ/1dfb4M3KahuQUSvJaTYqdMnv7Ijz5+Kt0/lCyPr/SePluIRm+B4wK Mm5S8XescN26oPcXYE4GJfIVlmOE3H5zH8DdTDZ2Jd37mEkSovJtYyBNnvmnluTGbRji 0IOV1GNTj1+xi0rajMgLpQ7zYB7knDkUJjx1v3DY0/Jj1roGDP7QWFvD22Pd3mZWfOKK 8rQA== X-Gm-Message-State: APjAAAVKeL5MtoCbsXYiDECHJZBAHAb9TFA6ImAlAKpSXGXHB/4mAukz Qme6uqE5QEmXnTIpYGOq2ScWGXfE X-Google-Smtp-Source: APXvYqzNEP91r4ANhDlhssPsVM801qYeOIhT4CxW6fbsdD3O1kU8K7JS7yzLc0kBz7u3O2s/9PMk6A== X-Received: by 2002:a17:902:d694:: with SMTP id v20mr32032779ply.127.1579176168774; Thu, 16 Jan 2020 04:02:48 -0800 (PST) Received: from localhost.localdomain ([2400:4050:c8c2:de00:98b6:858d:e282:492e]) by smtp.gmail.com with ESMTPSA id u7sm25392890pfh.128.2020.01.16.04.02.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jan 2020 04:02:48 -0800 (PST) From: Yasufumi Ogawa To: spp@dpdk.org, ferruh.yigit@intel.com, yasufum.o@gmail.com Date: Thu, 16 Jan 2020 21:02:33 +0900 Message-Id: <20200116120235.31550-6-yasufum.o@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200116120235.31550-1-yasufum.o@gmail.com> References: <20200116120235.31550-1-yasufum.o@gmail.com> Subject: [spp] [PATCH 5/7] cli: fix terminated if spp_primary is not running 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" If there is no spp_primary is running, SPP CLI is terminated when it requests something to spp-ctl. This update is to fix the issue. Signed-off-by: Yasufumi Ogawa --- src/cli/commands/pri.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/cli/commands/pri.py b/src/cli/commands/pri.py index f7d86bb..b39f911 100644 --- a/src/cli/commands/pri.py +++ b/src/cli/commands/pri.py @@ -77,7 +77,17 @@ class SppPrimary(object): # Get status here for inspecting if forwarder exists. Do not run # command such as `add` or `del` if forwarder does not exist. res = self.spp_ctl_cli.get('primary/status') - status = res.json() + + # Check if spp_primary is running. + error_codes = self.spp_ctl_cli.rest_common_error_codes + if res.status_code in error_codes: + if res.status_code == 404: + print('No spp_primary is running.') + else: + print('Error: spp_primary is not running normaly.') + return None + else: + status = res.json() if subcmd == 'status': if res is not None: -- 2.17.1