From 8cc1599f11b94e94d464f734880e41d247be145f Mon Sep 17 00:00:00 2001 From: Jian Li Date: Fri, 3 Jan 2020 10:29:41 +0900 Subject: [PATCH] Fix: harden the post-on-board K8S node state check logic Change-Id: I04bf5c20c92064c75816b864a51ea6ac3b4eac38 --- .../org/onosproject/k8snode/web/K8sNodeWebResource.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/apps/k8s-node/app/src/main/java/org/onosproject/k8snode/web/K8sNodeWebResource.java b/apps/k8s-node/app/src/main/java/org/onosproject/k8snode/web/K8sNodeWebResource.java index 042e932fd8..df4f63f7ef 100644 --- a/apps/k8s-node/app/src/main/java/org/onosproject/k8snode/web/K8sNodeWebResource.java +++ b/apps/k8s-node/app/src/main/java/org/onosproject/k8snode/web/K8sNodeWebResource.java @@ -283,7 +283,12 @@ public class K8sNodeWebResource extends AbstractWebResource { long numOfReadyNodes = nodeAdminService.nodes().stream() .filter(n -> n.state() == POST_ON_BOARD) .count(); - boolean result = numOfAllNodes == numOfReadyNodes; + boolean result; + if (numOfAllNodes == 0) { + result = false; + } else { + result = numOfAllNodes == numOfReadyNodes; + } return ok(mapper().createObjectNode().put(RESULT, result)).build(); }