Check node init status when probing node health through REST API
Support to inject controller IP address to API config.
Change-Id: Iece8a84b698ef0da9803f11d473257c84e5adc4d
(cherry picked from commit 6a08072a2c1c3094818268ebf22ffa82f9713125)
diff --git a/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/cli/KubevirtListApiConfigsCommand.java b/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/cli/KubevirtListApiConfigsCommand.java
index d01c33a..5b9c268 100644
--- a/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/cli/KubevirtListApiConfigsCommand.java
+++ b/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/cli/KubevirtListApiConfigsCommand.java
@@ -33,7 +33,7 @@
description = "Lists all KubeVirt API server configs registered to the service")
public class KubevirtListApiConfigsCommand extends AbstractShellCommand {
- private static final String FORMAT = "%-10s%-25s%-10s%-10s";
+ private static final String FORMAT = "%-10s%-20s%-10s%-25s%-10s";
@Override
protected void doExecute() throws Exception {
@@ -43,10 +43,14 @@
if (outputJson()) {
print("%s", json(config));
} else {
- print(FORMAT, "Scheme", "IpAddress", "Port", "State");
+ print(FORMAT, "Scheme", "Server IP", "Port", "Controller IP", "State");
+ String controllerIp = "N/A";
if (config != null) {
+ if (config.controllerIp() != null) {
+ controllerIp = config.controllerIp().toString();
+ }
print(FORMAT, config.scheme().name(), config.ipAddress().toString(),
- config.port(), config.state().name());
+ config.port(), controllerIp, config.state().name());
} else {
print("Kubevirt config not found!");
}