From 6ac0d554b020290daa7af6f8e25d27b8b61a9eb5 Mon Sep 17 00:00:00 2001
From: Marc De Leenheer <marc@onlab.us>
Date: Tue, 2 Dec 2014 16:44:02 -0800
Subject: [PATCH] Allocate pseudo tty for ssh

Change-Id: I43e977ce5099b9d593e3e36bd6f2a0f540b54419
---
 tools/test/bin/onos-config    | 2 +-
 tools/test/bin/onos-install   | 3 ++-
 tools/test/bin/onos-service   | 2 +-
 tools/test/bin/onos-uninstall | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/tools/test/bin/onos-config b/tools/test/bin/onos-config
index d8bc8c2f09..6ef95aeceb 100755
--- a/tools/test/bin/onos-config
+++ b/tools/test/bin/onos-config
@@ -18,7 +18,7 @@ echo "  { \"id\": \"$OC1\", \"ip\": \"$OC1\", \"tcpPort\": 9876 }" >> $CDEF_FILE
 echo "]}" >> $CDEF_FILE
 scp -q $CDEF_FILE $remote:$ONOS_INSTALL_DIR/config/cluster.json
 
-ssh $remote "
+ssh -t $remote "
     sudo perl -pi.bak -e \"s/            <interface>.*</            <interface>${ONOS_NIC:-192.168.56.*}</g\" \
         $ONOS_INSTALL_DIR/$KARAF_DIST/etc/hazelcast.xml
     sudo perl -pi -e \"s/        <name>onos</        <name>${ONOS_CELL:-onos}</g\" \
diff --git a/tools/test/bin/onos-install b/tools/test/bin/onos-install
index c13b8b9122..661736de79 100755
--- a/tools/test/bin/onos-install
+++ b/tools/test/bin/onos-install
@@ -23,7 +23,7 @@ remote=$ONOS_USER@$node
 
 scp -q $ONOS_TAR $remote:/tmp
 
-ssh $remote "
+ssh -t $remote "
     [ -d $ONOS_INSTALL_DIR/bin ] && echo \"ONOS is already installed\" && exit 1
 
     # Prepare a landing zone and unroll the bits
@@ -45,6 +45,7 @@ ssh $remote "
 
     # Remove any previous ON.Lab bits from ~/.m2 repo and re-stage it.
     rm -fr ~/.m2/repository/org/onlab
+    mkdir -p ~/.m2/repository/org/onlab
     cp -r $ONOS_INSTALL_DIR/$KARAF_DIST/system/org/onlab ~/.m2/repository/org/onlab
 
     # Drop log level for the console
diff --git a/tools/test/bin/onos-service b/tools/test/bin/onos-service
index d5fabe5a9e..d7b0a08d45 100755
--- a/tools/test/bin/onos-service
+++ b/tools/test/bin/onos-service
@@ -40,5 +40,5 @@ fi
 
 # Execute the remote commands
 for node in $nodes; do
-    ssh $ONOS_USER@${node} "sudo service onos ${2:-status}"
+    ssh -t $ONOS_USER@${node} "sudo service onos ${2:-status}"
 done
diff --git a/tools/test/bin/onos-uninstall b/tools/test/bin/onos-uninstall
index e2a2816883..84db3401ba 100755
--- a/tools/test/bin/onos-uninstall
+++ b/tools/test/bin/onos-uninstall
@@ -8,7 +8,7 @@
 
 remote=$ONOS_USER@${1:-$OCI}
 
-ssh $remote "
+ssh -t $remote "
     sudo service onos stop 1>/dev/null 2>/dev/null
     sudo rm -fr $ONOS_INSTALL_DIR
 "