[pisa-src] r2500 - trunk/tools/testbed/pisa-testbed_vms/config

From: Samuel Richter <samuel.richter@xxxxxxxxxxxxxx>
To: pisa-src@xxxxxxxxxxxxx
Date: Sun, 03 Apr 2011 19:40:42 +0200
Author: richter
Date: Sun Apr  3 19:40:42 2011
New Revision: 2500

Log:
cosmetics: remove confuse mandatory/optional comments; reorder settings

Modified:
   trunk/tools/testbed/pisa-testbed_vms/config

Modified: trunk/tools/testbed/pisa-testbed_vms/config
==============================================================================
--- trunk/tools/testbed/pisa-testbed_vms/config Sun Apr  3 19:39:05 2011        
(r2499)
+++ trunk/tools/testbed/pisa-testbed_vms/config Sun Apr  3 19:40:42 2011        
(r2500)
@@ -1,13 +1,13 @@
 #!/bin/sh
-# Optional: List name of the testbed, default is the current directory
+# list name of the testbed, default is the current directory
 TESTBED_NAME="pisa-testbed"
-# Mandatory: Give version number
+# Give version number
 VERSION=1
 
-# Mandatory: List targets
+# list targets
 NODES="server routera routerb client"
 
-# Mandatory: List dependencies (prep_* and build_* functions to call)
+# list dependencies (prep_* and build_* functions to call)
 SERVER="default"
 ROUTERA="default"
 ROUTERB="default"
@@ -17,6 +17,18 @@
 PISA_PATH=$HOME/src/pisa
 HIPL_PATH=$HOME/src/hipl
 
+# live-cd image, created as root with the ubuntu_live script in the pisa-tree
+VBOX_ISO="/projects/pisa/live-cds/PisaLive-tester_amd64_maverick.iso"
+
+# Specify ssh access
+SSH_HOST=localhost
+SSH_USER=pisa
+SERVER_SSH_PORT=34105
+ROUTERA_SSH_PORT=34106
+ROUTERB_SSH_PORT=34107
+CLIENT_SSH_PORT=34108
+
+# specify network  TODO: needs generic design
 SERVER_IP=1
 ROUTERA_IP=100
 ROUTERB_IP=101
@@ -28,20 +40,3 @@
 CLIENT_VBOX_ETH0=pisa
 ROUTERA_VBOX_ETH1=pisa
 ROUTERB_VBOX_ETH1=pisa
-
-# Mandatory: Specify ssh access
-SSH_HOST=localhost
-SSH_USER=pisa
-SERVER_SSH_PORT=34105
-ROUTERA_SSH_PORT=34106
-ROUTERB_SSH_PORT=34107
-CLIENT_SSH_PORT=34108
-
-# live-cd image, created as root with the ubuntu_live script in the pisa-tree
-VBOX_ISO="/projects/pisa/live-cds/PisaLive-tester_amd64_maverick.iso"
-
-# Optional: Specify disk-image to be used in vbox
-#SERVER_DISKFILE=/srv/power/pisa/vms/richter/pisa-testbed-server.vdi
-#ROUTERA_DISKFILE=/srv/power/pisa/vms/richter/pisa-testbed-router_a.vdi
-#ROUTERB_DISKFILE=/srv/power/pisa/vms/richter/pisa-testbed-router_b.vdi
-#CLIENT_DISKFILE=/srv/power/pisa/vms/richter/pisa-testbed-client.vdi
-- 
This is the pisa developer mailing list. Please also subscribe to the main pisa 
list at:
//www.freelists.org/list/pisa
[pisa-src] r2500 - trunk/tools/testbed/pisa-testbed_vms/config

Other related posts:
