commit 6066bd3b22f092df9749fbddc52532372ac1576d
author Hyunsun Moon <hyunsun.moon@gmail.com> Mon Oct 24 15:35:34 2016 -0700
committer Ali Al-Shabibi <ali@onlab.us> Wed Nov 09 10:21:06 2016 -0800
tree cb4172c3a8c177a36a2ae677915395410efc08ee
parent 7331de803c978159d635116a199768c1dcf46108

CORD-535 Added purge and sync states CLIs

And improved result format of the existing CLIs

Change-Id: I49476ab52f77f6fadddf00dfc113c51153b300ed

src/main/java/org/opencord/cordvtn/cli/CordVtnNodeCheckCommand.java

diff --git a/src/main/java/org/opencord/cordvtn/cli/CordVtnNodeCheckCommand.java b/src/main/java/org/opencord/cordvtn/cli/CordVtnNodeCheckCommand.java
index 17dbb45..9e988ca 100644
--- a/src/main/java/org/opencord/cordvtn/cli/CordVtnNodeCheckCommand.java
+++ b/src/main/java/org/opencord/cordvtn/cli/CordVtnNodeCheckCommand.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.opencord.cordvtn.cli;
 
 import com.jcraft.jsch.Session;
@@ -45,6 +44,11 @@
             required = true, multiValued = false)
     private String hostname = null;
 
+    private static final String COMPLETE = "COMPLETE";
+    private static final String INCOMPLETE = "INCOMPLETE";
+    private static final String HINT = "hint: try init again if the state is INCOMPLETE" +
+            " but all settings OK";
+
     @Override
     protected void execute() {
         CordVtnNodeManager nodeManager = AbstractShellCommand.get(CordVtnNodeManager.class);
@@ -60,7 +64,7 @@
             print("Cannot find %s from registered nodes", hostname);
             return;
         }
-
+        print("Current state: %s (%s)", getState(nodeManager, node), HINT);
         print("%n[Integration Bridge Status]");
         Device device = deviceService.getDevice(node.integrationBridgeId());
         if (device != null) {
@@ -131,4 +135,8 @@
               isUp ? Boolean.TRUE : Boolean.FALSE,
               isIp ? Boolean.TRUE : Boolean.FALSE);
     }
+
+    private String getState(CordVtnNodeManager nodeManager, CordVtnNode node) {
+        return nodeManager.isNodeInitComplete(node) ? COMPLETE : INCOMPLETE;
+    }
 }