Commit 9e11a0f3 authored by Robert Ricci's avatar Robert Ricci
Browse files

Removed unncessary tb-set-node-os commands, which prevented some tests

from funning outside the 'real' testbed.

Left them, however, in the tbcmd tests, since these are not site-
specific, and are acutally checked to make sure they occur correctly.

As a result of this, added 3 tests back into the frontend-generic list.
parent 441dfb4a
......@@ -12,3 +12,6 @@ trivial
fixed
simplex
mini_multilink
buddycache
ping
trafgen
......@@ -12,12 +12,4 @@ set or [$ns node]
set lan0 [$ns make-lan "$fe1 $fe2 $fe3 $fe4 $fe5 $proxy $or" 100Mb .1ms]
tb-set-node-lan-delay $or $lan0 20ms
tb-set-node-os $fe1 RHL62-STD
tb-set-node-os $fe2 RHL62-STD
tb-set-node-os $fe3 RHL62-STD
tb-set-node-os $fe4 RHL62-STD
tb-set-node-os $fe5 RHL62-STD
tb-set-node-os $or RHL62-STD
tb-set-node-os $proxy RHL62-STD
$ns run
......@@ -12,10 +12,6 @@ set echo [$ns node]
# each direction of 150 ms
$ns duplex-link $ping $echo 100Mb 150ms DropTail
# Set OSes for the nodes
tb-set-node-os ping FBSD40-STD
tb-set-node-os echo MAC-PINGREPLY
tb-set-ip ping 192.168.101.1
tb-set-ip echo 192.168.101.2
......
set ns [new Simulator]
source tb_compat.tcl
set router [$ns node]
tb-set-node-os $router FBSD40-STD
tb-set-node-startup $router /proj/Spinglass/router.script
set node0 [$ns node]
tb-set-hardware $node0 shark
......
......@@ -15,7 +15,6 @@ set routers {}
foreach supernet $supernets {
set router [set router$supernet [$ns node]]
lappend routers $router
tb-set-node-os $router FBSD40-STD
tb-set-node-startup $router "/proj/Spinglass/router.script $nsupernets
$j $nnets"
foreach net $nets {
......
......@@ -28,12 +28,9 @@ set server [$ns node]
set client-lan [$ns make-lan "$send $router $client" 100Mb 1ms]
set server-lan [$ns make-lan "$consume $server $router" 100Mb 1ms]
tb-set-node-os $router FBSD40-STD
tb-set-node-startup $router /users/newbold/trafgen/fbsd-router-startup
tb-set-node-os $client FBSD40-STD
tb-set-node-startup $client /users/newbold/trafgen/clientroutecmd
tb-set-node-os $server FBSD40-STD
tb-set-node-startup $server /users/newbold/trafgen/serverroutecmd
########## Magic code ###############
......
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