commit 5af2e4f898a3f36c1d038c288e55228e223f254b
author Thomas Vachuska <tom@onlab.us> Fri Dec 16 12:07:33 2016 -0800
committer Thomas Vachuska <tom@onlab.us> Fri Dec 16 22:30:47 2016 +0000
tree 971f2164bfebaba44aed38ee5bd86e0bec9626aa
parent 3e1bac23ed96d242a1393edd2dfb644b08e2a190

Eliminating use of Apache Karaf CLI client and of ONOS_USE_SSH env. variable.

All CLI access is now through the raw SSH client.
To enable passwordless access, the 'onos-user-key' tool should be used to add user keys.
Added 'onos-user-password' tool in the similar vein and usage as the 'onos-user-key' tool.

Change-Id: Ic5482fc8012369edc818691402ba45d13f130452

tools/test/scenarios/prerequisites.xml

diff --git a/tools/test/scenarios/prerequisites.xml b/tools/test/scenarios/prerequisites.xml
index ad6545d..e9dcc29 100644
--- a/tools/test/scenarios/prerequisites.xml
+++ b/tools/test/scenarios/prerequisites.xml
@@ -17,8 +17,6 @@
     <group name="Prerequisites">
         <step name="Check-Environment"
               exec="test -n ${ONOS_ROOT} -a -n ${ONOS_NIC} -a -n ${OC1}"/>
-        <step name="Check-Secure-SSH"
-              exec="test '${ONOS_USE_SSH}' == 'true' -o '${ONOS_USE_SSH}' == ''"/>
         <step name="Check-ONOS-Bits" exec="onos-check-bits"/>
         <parallel var="${OC#}">
             <step name="Check-Passwordless-Login-${#}"

tools/test/scenarios/setup.xml

diff --git a/tools/test/scenarios/setup.xml b/tools/test/scenarios/setup.xml
index dd3db19..845380e 100644
--- a/tools/test/scenarios/setup.xml
+++ b/tools/test/scenarios/setup.xml
@@ -30,8 +30,7 @@
                   requires="Kill-${#},Push-Bits-${#},Push-Bits"/>
 
             <step name="Secure-SSH-${#}" requires="Install-${#}"
-                  exec="onos-secure-ssh -u ${ONOS_WEB_USER} -p ${ONOS_WEB_PASS} ${OC#}"
-                  if="${ONOS_USE_SSH}"/>
+                  exec="onos-secure-ssh -u ${ONOS_WEB_USER} -p ${ONOS_WEB_PASS} ${OC#}"/>
 
             <step name="Wait-for-Start-${#}" exec="onos-wait-for-start ${OC#}"
                   requires="Install-${#},~Secure-SSH-${#}"/>

tools/test/scenarios/tar-setup.xml

diff --git a/tools/test/scenarios/tar-setup.xml b/tools/test/scenarios/tar-setup.xml
index a0b5f47..c6e8201 100644
--- a/tools/test/scenarios/tar-setup.xml
+++ b/tools/test/scenarios/tar-setup.xml
@@ -16,7 +16,7 @@
 <scenario name="tar-setup" description="ONOS cluster setup via onos.tar.gz">
     <group name="Setup-Instances">
         <step name="Push-Bits" exec="onos-push-bits-through-proxy" if="${OCT}"/>
-        <step name="Secure-SSH" exec="onos-secure-ssh -u ${ONOS_WEB_USER} -p ${ONOS_WEB_PASS}" if="${ONOS_USE_SSH}"/>
+        <step name="Secure-SSH" exec="onos-secure-ssh -u ${ONOS_WEB_USER} -p ${ONOS_WEB_PASS}"/>
 
         <parallel var="${OC#}">
             <step name="Push-Bits-${#}" exec="onos-push-bits ${OC#}" unless="${OCT}"/>