[pisa-src] r2715 - in trunk/tools/testbed/plugins/classes: default/update hipl/update openwrt/deploy pisa/update vbox/deploy

From: Samuel Richter <samuel.richter@xxxxxxxxxxxxxx>
To: pisa-src@xxxxxxxxxxxxx
Date: Tue, 09 Aug 2011 18:21:35 +0200
Author: richter
Date: Tue Aug  9 18:21:35 2011
New Revision: 2715

Log:
testbed interface: fix deploy and update actions

don't automatically build files on a deploy and build action
apply new syntax for put to deploy

Modified:
   trunk/tools/testbed/plugins/classes/default/update
   trunk/tools/testbed/plugins/classes/hipl/update
   trunk/tools/testbed/plugins/classes/openwrt/deploy
   trunk/tools/testbed/plugins/classes/pisa/update
   trunk/tools/testbed/plugins/classes/vbox/deploy

Modified: trunk/tools/testbed/plugins/classes/default/update
==============================================================================
--- trunk/tools/testbed/plugins/classes/default/update  Tue Aug  9 18:17:37 
2011        (r2714)
+++ trunk/tools/testbed/plugins/classes/default/update  Tue Aug  9 18:21:35 
2011        (r2715)
@@ -2,7 +2,7 @@
 
 load install
 
-add_requirement build__default update__default
+add_dependency build__default update__default
 
 update__default(){
     echo "updating generic files"

Modified: trunk/tools/testbed/plugins/classes/hipl/update
==============================================================================
--- trunk/tools/testbed/plugins/classes/hipl/update     Tue Aug  9 18:17:37 
2011        (r2714)
+++ trunk/tools/testbed/plugins/classes/hipl/update     Tue Aug  9 18:21:35 
2011        (r2715)
@@ -2,7 +2,7 @@
 
 load install run
 
-add_requirement pre_hook___build__hipl__debian update__hipl__debian
+add_dependency pre_hook___build__hipl__debian update__hipl__debian
 add_dependency update__default update__hipl__debian
 
 update__hipl__debian(){
@@ -11,7 +11,7 @@
     run_function install $(ls -t $HIPL_PATH/../hipl-firewall*.deb | head -1) 
-c "dpkg -i"
 }
 
-add_requirement pre_hook___build__hipl__openwrt update__hipl__openwrt
+add_dependency pre_hook___build__hipl__openwrt update__hipl__openwrt
 add_dependency update__default update__hipl__openwrt
 
 update__hipl__openwrt(){

Modified: trunk/tools/testbed/plugins/classes/openwrt/deploy
==============================================================================
--- trunk/tools/testbed/plugins/classes/openwrt/deploy  Tue Aug  9 18:17:37 
2011        (r2714)
+++ trunk/tools/testbed/plugins/classes/openwrt/deploy  Tue Aug  9 18:21:35 
2011        (r2715)
@@ -2,13 +2,13 @@
 
 load put run
 
-add_requirement pre_hook___build__openwrt deploy__openwrt
-add_requirement build__default deploy__openwrt
+add_dependency pre_hook___build__openwrt deploy__openwrt
+add_dependency build__default deploy__openwrt
 
 deploy__openwrt(){
     set +e
-    run_function put "$BIN_PATH/openwrt-$TESTBED_NAME.bin"
-    run_function put "$BIN_PATH/$FULL_NAME.tar.gz"
+    run_function put "$BIN_PATH/openwrt-$TESTBED_NAME.bin" /tmp
+    run_function put "$BIN_PATH/$FULL_NAME.tar.gz" /tmp
     run_function run sysupgrade -n -f "/tmp/$FULL_NAME.tar.gz" 
"/tmp/openwrt-$TESTBED_NAME.bin"
     set -e
 }

Modified: trunk/tools/testbed/plugins/classes/pisa/update
==============================================================================
--- trunk/tools/testbed/plugins/classes/pisa/update     Tue Aug  9 18:17:37 
2011        (r2714)
+++ trunk/tools/testbed/plugins/classes/pisa/update     Tue Aug  9 18:21:35 
2011        (r2715)
@@ -2,7 +2,7 @@
 
 load install run
 
-add_requirement pre_hook___build__pisa__debian update__pisa__debian
+add_dependency pre_hook___build__pisa__debian update__pisa__debian
 add_dependency update__default update__pisa__debian
 add_dependency update__hipl__debian update__pisa__debian
 
@@ -13,7 +13,7 @@
     #run_function install $(ls -t $PISA_PATH/../pisa-community-operator*.deb | 
head -1) -c "dpkg -i"
 }
 
-add_requirement pre_hook___build__pisa__openwrt update__pisa__openwrt
+add_dependency pre_hook___build__pisa__openwrt update__pisa__openwrt
 add_dependency update__default update__pisa__openwrt
 add_dependency update__hipl__openwrt update__pisa__openwrt
 

Modified: trunk/tools/testbed/plugins/classes/vbox/deploy
==============================================================================
--- trunk/tools/testbed/plugins/classes/vbox/deploy     Tue Aug  9 18:17:37 
2011        (r2714)
+++ trunk/tools/testbed/plugins/classes/vbox/deploy     Tue Aug  9 18:21:35 
2011        (r2715)
@@ -21,9 +21,7 @@
 
     VBoxManage -q modifyvm $FULL_NAME --natpf3 
"guestssh,tcp,,$SSH_PORT,10.1.${IP:-254}.15,22"
 
-    VBoxManage -q openmedium dvd $VBOX_ISO
     VBoxManage -q storageattach $FULL_NAME --storagectl "IDE Controller" 
--port 0 --device 0 --type dvddrive --medium $VBOX_ISO
-    VBoxManage -q openmedium dvd "$BIN_PATH/${FULL_NAME}.iso"
     VBoxManage -q storageattach $FULL_NAME --storagectl "IDE Controller" 
--port 0 --device 1 --type dvddrive --medium "$BIN_PATH/${FULL_NAME}.iso"
 
     set -e
-- 
This is the pisa developer mailing list. Please also subscribe to the main pisa 
list at:
//www.freelists.org/list/pisa
[pisa-src] r2715 - in trunk/tools/testbed/plugins/classes: default/update hipl/update openwrt/deploy pisa/update vbox/deploy

Other related posts:
