Commit d07a3e95 authored by Christopher Alfeld's avatar Christopher Alfeld
Browse files

tbrun - Fixed spelling error

tbprerun - Added call for handle_ip
test.ns - Added #TB commands to demo IP handling.
parent cb9747c6
......@@ -21,6 +21,7 @@ if {[file dirname [info script]] == "."} {
}
set ns2ir "$updir/ir/ns2ir/parse.tcl"
set assign "$updir/ir/assign.tcl"
set handle_ip "$updir/ir/handle_ip.tcl"
if {$argc != 1} {
puts stderr "Syntax: $argv0 <ns-file>"
......@@ -69,6 +70,12 @@ if {[catch "exec $assign $irFile >@ $logFp 2>@ $logFp" err]} {
outs "PLACEHODLER - Reserving resources."
outs "Allocating IP addresses."
if {[catch "exec $handle_ip $irFile $nsFile >@ $logFp 2>@ $logFp" err]} {
outs stderr "Error allocating IP addresses. ($err)"
exit 1
}
outs "Setup finished - $irFile generated."
......@@ -72,7 +72,7 @@ if {[catch "exec $snmpit -u -f $irFile >@ $logFp 2>@ $logFp" err]} {
outs "PLACEHOLDER - Verifying virtual network."
outs "PLACEHOLDER - Copying disk images."
outs "PLACEHOLDER - Booting for the first time."
outs "PLACEHOLDER - Verifyin OS functionality."
outs "PLACEHOLDER - Verifying OS functionality."
outs "PLACEHOLDER - Setting up interfaces."
outs "PLACEHOLDER - Installing secondary pacakages."
outs "PLACEHOLDER - Rebooting."
......
......@@ -7,5 +7,8 @@ set n2 [$ns node]
$ns duplex-link $n0 $n1 100Mb 10ms DropTail
$ns duplex-link $n1 $n2 100Mb 10ms DropTail
#TB set-ip n0 192.168.14.52
#TB set-ip-interface n2 n1 192.168.5.1
$ns run
Supports Markdown
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