Commit 4fd155fe authored by Robert Ricci's avatar Robert Ricci

Added an option to run the new stub (magent) rather than the old one.

Off by default for now. Not well tested (syntax checks).
parent 1317f2c2
......@@ -106,6 +106,11 @@ set serverprog "/usr/bin/iperf -s "
# NOTE: No client support for now, you'll have to run the client yourself
set clientprog "/usr/bin/iperf -t 60 -c "
#
# If non-zero, uses the new stub (magent) instead of the old one
#
set use_magent 0
# End of user-settable options
##########
......@@ -129,6 +134,11 @@ if {$fake_plab && $delay_os != "FBSD54-DNODE"} {
#
set tarfiles "/local $pelab_tar"
set rpms "/proj/tbres/auto-pelab/libpcap-0.8.3-3.i386.rpm /proj/tbres/auto-pelab/iperf-2.0.2-1.1.fc2.rf.i386.rpm"
if {$use_magent} {
set stubcommand "/bin/sh /local/pelab/magent/auto-magent.sh"
} else {
set stubcommand "/bin/sh /local/pelab/stub/auto-stub.sh"
}
set elan_string ""
set plan_string ""
......@@ -155,7 +165,7 @@ for {set i 1} {$i <= $num_pcs} {incr i} {
set planet($i) [$ns node]
tb-set-hardware $planet($i) pcplab
append inet_string "$planet(${i}) "
set planetstub($i) [$planet($i) program-agent -command "/bin/sh /local/pelab/stub/auto-stub.sh"]
set planetstub($i) [$planet($i) program-agent -command $stubcommand]
lappend stublist $planetstub($i)
lappend planetstublist $planetstub($i)
......@@ -179,7 +189,7 @@ for {set i 1} {$i <= $num_pcs} {incr i} {
tb-set-node-os $plab($i) PLAB-DEVBOX
tb-set-hardware $plab($i) $hwtype
append plan_string "$plab(${i}) "
set plabstub($i) [$plab($i) program-agent -command "/bin/sh /local/pelab/stub/auto-stub.sh"]
set plabstub($i) [$plab($i) program-agent -command $stubcommand]
lappend stublist $plabstub($i)
lappend plabstublist $plabstub($i)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment