From 818ff96f70f63464861c6ae14ed21ebd0916478a Mon Sep 17 00:00:00 2001 From: Dominik Vrbovsky Date: Mon, 22 Nov 2021 11:56:26 +0100 Subject: [PATCH 1/1] Rework karaf CLI commands to print results on console Some of these karaf CLI commands may produce return values and some CSIT components need to read them from console. Change-Id: Iae54c9481515c1e8fc42e9b1cf7b1530d523a142 Signed-off-by: Dominik Vrbovsky --- .../cluster/datastore/admin/command/AbstractRpcAction.java | 4 +++- .../clustering/it/karaf/cli/AbstractRpcAction.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/AbstractRpcAction.java b/opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/AbstractRpcAction.java index 0a85b562eb..f16ac25fe6 100644 --- a/opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/AbstractRpcAction.java +++ b/opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/AbstractRpcAction.java @@ -25,8 +25,10 @@ public abstract class AbstractRpcAction implements Action { if (!result.isSuccessful()) { // FIXME: is there a better way to report errors? System.out.println("Invocation failed: " + result.getErrors()); + return null; + } else { + return result.getResult(); } - return null; } protected abstract ListenableFuture> invokeRpc(); diff --git a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/AbstractRpcAction.java b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/AbstractRpcAction.java index d76dbb5bce..eb483bfd76 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/AbstractRpcAction.java +++ b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/AbstractRpcAction.java @@ -23,8 +23,10 @@ public abstract class AbstractRpcAction implements Action { if (!result.isSuccessful()) { // FIXME: is there a better way to report errors? System.out.println("Invocation failed: " + result.getErrors()); + return null; + } else { + return result.getResult(); } - return null; } protected abstract ListenableFuture> invokeRpc(); -- 2.36.6