From cbba052c86226a44eb76eb5d192cf5573be5ef7b Mon Sep 17 00:00:00 2001
From: Thomas Vachuska <tom@onlab.us>
Date: Wed, 3 Dec 2014 19:03:31 -0800
Subject: [PATCH] Added onos-die command and added some info output to
 onos-kill command.

Change-Id: I32968907b5f69a334d82048658210e08b109ba23
---
 tools/test/bin/onos-die  |  6 ++++++
 tools/test/bin/onos-kill | 11 ++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100755 tools/test/bin/onos-die

diff --git a/tools/test/bin/onos-die b/tools/test/bin/onos-die
new file mode 100755
index 0000000000..09bf91fabd
--- /dev/null
+++ b/tools/test/bin/onos-die
@@ -0,0 +1,6 @@
+#!/bin/bash
+# -----------------------------------------------------------------------------
+# Remotely kills and stops the ONOS service on the specified node.
+# -----------------------------------------------------------------------------
+
+onos-kill "${1:-$OCI}" && onos-service "${1:-$OCI}" stop
diff --git a/tools/test/bin/onos-kill b/tools/test/bin/onos-kill
index a6c2333dc8..47e5360bfb 100755
--- a/tools/test/bin/onos-kill
+++ b/tools/test/bin/onos-kill
@@ -6,4 +6,13 @@
 [ ! -d "$ONOS_ROOT" ] && echo "ONOS_ROOT is not defined" >&2 && exit 1
 . $ONOS_ROOT/tools/build/envDefaults
 
-ssh $ONOS_USER@${1:-$OCI} "kill -9 \$(ps -ef | grep karaf.jar | grep -v grep | cut -c10-15)"
+ssh $ONOS_USER@${1:-$OCI} "
+    pid=\$(ps -ef | grep karaf.jar | grep -v grep | cut -c10-15 | tr -d ' ')
+    if [ -n \"\$pid\" ]; then
+        echo \"Killing ONOS process \$pid on \$(hostname)...\"
+        kill -9 \$pid
+    else
+        echo \"ONOS process is not running...\"
+        exit 1
+    fi
+"