commit c5c8840d045f36aba431734b7a0893589de109a6
author Brian O'Connor <bocon@opennetworking.org> Tue Aug 15 17:02:32 2017 -0700
committer Thomas Vachuska <tom@opennetworking.org> Wed Aug 16 00:18:43 2017 +0000
tree 84769d5616b2901adb35b246f8fb49f2cb911248
parent b57fdb00d82d5f01e2b11e7ce87313f6d566b245

Bug fixes for proxy-stc

Change-Id: Ic6d7bb0e58a4837e8bd8e96e3decac199f20c04f

tools/test/bin/onos-push-bits-through-proxy

diff --git a/tools/test/bin/onos-push-bits-through-proxy b/tools/test/bin/onos-push-bits-through-proxy
index 6b909f6..5ba72b7 100755
--- a/tools/test/bin/onos-push-bits-through-proxy
+++ b/tools/test/bin/onos-push-bits-through-proxy
@@ -19,6 +19,8 @@
 ssh $remote "
   for other in ${others//$'\n'/ } ; do
     echo \"Pushing to \$other ...\";
-    scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null $ONOS_TAR $ONOS_USER@\$other:$ONOS_TAR
+    scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \
+        /tmp/\$(basename $ONOS_TAR) \
+        $ONOS_USER@\$other:/tmp/\$(basename $ONOS_TAR)
   done
 "

tools/test/bin/onos-push-test-bits

diff --git a/tools/test/bin/onos-push-test-bits b/tools/test/bin/onos-push-test-bits
index 1965643..4f6ba57 100755
--- a/tools/test/bin/onos-push-test-bits
+++ b/tools/test/bin/onos-push-test-bits
@@ -12,5 +12,5 @@
 scp -q $ONOS_TEST_TAR $remote:/tmp
 ssh $remote "
     rm -f /tmp/onos $ONOS_TEST_BITS
-    cd /tmp && tar zxf $ONOS_TEST_BITS.tar.gz && ln -s $ONOS_TEST_BITS onos
+    cd /tmp && tar zxf $ONOS_TEST_BITS.tar.gz && ln -s onos-test-$ONOS_POM_VERSION onos
 "

tools/test/bin/proxy-stc

diff --git a/tools/test/bin/proxy-stc b/tools/test/bin/proxy-stc
index ac840e4..63e65cc 100755
--- a/tools/test/bin/proxy-stc
+++ b/tools/test/bin/proxy-stc
@@ -6,10 +6,10 @@
 
 . $ONOS_ROOT/tools/build/envDefaults
 
-onos-push-test-bits $OCT
-onos-push-bits $OCT
+onos-push-test-bits $OCN
+onos-push-bits $OCN
 
-ssh -t -t $ONOS_USER@$OCT "
+ssh -t -t $ONOS_USER@$OCN "
     # Unpack the test tools
     cd /tmp; rm -fr \$(ls -Fd onos-test-*/)
     tar xf \$(basename $ONOS_TEST_TAR)
@@ -32,11 +32,12 @@
     topo default
     export stcDumpLogs=true
     export stcColor=$stcColor
+    export TERM=vt100
     stc $1
 "
 status=$?
 
 mkdir -p /tmp/stc
-scp -r ${ONOS_USER}@${OCT}:/tmp/stc/* /tmp/stc/
+scp -r ${ONOS_USER}@${OCN}:/tmp/stc/* /tmp/stc/
 
 exit $status
\ No newline at end of file