commit 51cf307e6c5a96633ca31d8a93e1b4d84cba6e6c
author Ray Milkey <ray@opennetworking.org> Tue Dec 11 08:46:52 2018 -0800
committer Ray Milkey <ray@opennetworking.org> Thu Dec 13 22:20:02 2018 +0000
tree 867ffc3a624cd734814681446521392959f1c065
parent b73ca6d3c85f22687c9aa5cc7d402adc8327fd21

Fixes to allow running p4 trellis scenario

Change-Id: I4882668168521b9119692ecd696189b2b8d5f9de
(cherry picked from commit a61ba5792d9e7a25d3446f37179fbf13ac152098)

tools/test/scenarios/bin/mininet-p4-trellis

diff --git a/tools/test/scenarios/bin/mininet-p4-trellis b/tools/test/scenarios/bin/mininet-p4-trellis
index 889fb77..aeb9ef6 100755
--- a/tools/test/scenarios/bin/mininet-p4-trellis
+++ b/tools/test/scenarios/bin/mininet-p4-trellis
@@ -1,18 +1,19 @@
 #!/bin/bash
 
 remote=$ONOS_USER@$OCN
+remote_scp=$ONOS_USER@[$OCN]
 mininet="ssh -t -t $remote screen -L -S mininet"
 
 CONTROLLERS="$OC1"
 
-echo >/tmp/invoke_trellis_p4 "cd routing/trellis && sudo -E env PYTHONPATH=$PYTHONPATH:~/bmv2-mininet ./trellisp4.py --onos-ip '$CONTROLLERS'"
+echo >/tmp/invoke_trellis_p4 "export ONOS_WEB_USER=$ONOS_WEB_USER && export ONOS_WEB_PASS=$ONOS_WEB_PASS && cd routing/trellis && sudo -E env PYTHONPATH=$PYTHONPATH:/home/sdn/bmv2-mininet ./trellisp4.py --onos-ip '$CONTROLLERS'"
 chmod +x /tmp/invoke_trellis_p4
-scp /tmp/invoke_trellis_p4 [$remote]:
+scp /tmp/invoke_trellis_p4 $remote_scp:
 
 ssh $remote "rm -f $log; echo logfile flush 1 > ~/.screenrc"
     (
     $mininet ./invoke_trellis_p4
-    scp [$remote]:$log /tmp/mininet.log
+    scp $remote_scp:$log /tmp/mininet.log
     ssh $remote rm -f $log
     ) &