Fix p4vm script to export ova and tutorial script
- Modify missing command in tutorial-bootstrap.sh
- Modify command order in ova-cleanup.sh
- Modify the way to execute ovs-cleanup.sh in vm
Change-Id: Ib010d07b31d9b06f3c4b04d34b2036c0058ca300
diff --git a/tools/dev/p4vm/export-ova.sh b/tools/dev/p4vm/export-ova.sh
index d7d8447..96500f2 100755
--- a/tools/dev/p4vm/export-ova.sh
+++ b/tools/dev/p4vm/export-ova.sh
@@ -70,9 +70,7 @@
fi
# Cleanup
-sshpass -p 'rocks' \
- ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no \
- -p ${SSH_PORT} sdn@127.0.0.1 "bash /vagrant/ova-cleanup.sh"
+vagrant ssh -c 'bash /vagrant/ova-cleanup.sh' ${VM_TYPE}
sleep 5
vboxmanage controlvm ${VB_UUID} acpipowerbutton
wait_vm_shutdown ${VB_UUID}