Fixes to allow running p4 trellis scenario

Change-Id: I4882668168521b9119692ecd696189b2b8d5f9de
(cherry picked from commit a61ba5792d9e7a25d3446f37179fbf13ac152098)
diff --git a/tools/test/bin/onos-push-bmv2 b/tools/test/bin/onos-push-bmv2
index 271c31d..d72f41e 100755
--- a/tools/test/bin/onos-push-bmv2
+++ b/tools/test/bin/onos-push-bmv2
@@ -10,9 +10,6 @@
 user=$ONOS_WEB_USER
 pass=$ONOS_WEB_PASS
 
-ssh $ONOS_USER@$node sudo rm -f ~/bmv2-mininet
-scp -qr $ONOS_ROOT/tools/dev/mininet/bmv2.py $ONOS_USER@[$node]:~/bmv2-mininet
-ssh $ONOS_USER@$node "
-       echo 'export ONOS_WEB_USER=`$user`' >> ~/.bashrc
-       echo 'export ONOS_WEB_PASS=`$pass`' >> ~/.bashrc
-      "
\ No newline at end of file
+ssh $ONOS_USER@$node "sudo rm -rf ~/bmv2-mininet"
+ssh $ONOS_USER@$node "mkdir ~/bmv2-mininet"
+scp -qr $ONOS_ROOT/tools/dev/mininet/bmv2.py $ONOS_USER@[$node]:~/bmv2-mininet/