Commit 7a012d67 authored by Leigh Stoller's avatar Leigh Stoller

Add output of tbreport to the shownsfile link, as per Mike's request.

Not exactly what Mike wanted, but this was quick and easy. I'll make
it pretty later (sure you say!).
parent 5e7499d8
......@@ -1038,7 +1038,7 @@ outfiles="$outfiles Makeconf GNUmakefile \
tbsetup/resetvlans tbsetup/rmacct-ctrl tbsetup/rmproj \
tbsetup/sched_reload tbsetup/sched_reserve tbsetup/reload_daemon \
tbsetup/batchexp tbsetup/killbatchexp tbsetup/batch_daemon \
tbsetup/webbatchexp tbsetup/webkillbatchexp \
tbsetup/webbatchexp tbsetup/webkillbatchexp tbsetup/webreport \
tbsetup/startexp tbsetup/endexp tbsetup/webstartexp tbsetup/webendexp \
tbsetup/snmpit tbsetup/ns2ir/GNUmakefile \
tbsetup/ns2ir/parse.tcl tbsetup/ns2ir/tb_compat.tcl \
......
......@@ -160,7 +160,7 @@ outfiles="$outfiles Makeconf GNUmakefile \
tbsetup/resetvlans tbsetup/rmacct-ctrl tbsetup/rmproj \
tbsetup/sched_reload tbsetup/sched_reserve tbsetup/reload_daemon \
tbsetup/batchexp tbsetup/killbatchexp tbsetup/batch_daemon \
tbsetup/webbatchexp tbsetup/webkillbatchexp \
tbsetup/webbatchexp tbsetup/webkillbatchexp tbsetup/webreport \
tbsetup/startexp tbsetup/endexp tbsetup/webstartexp tbsetup/webendexp \
tbsetup/snmpit tbsetup/ns2ir/GNUmakefile \
tbsetup/ns2ir/parse.tcl tbsetup/ns2ir/tb_compat.tcl \
......
......@@ -22,7 +22,7 @@ SBIN_STUFF = resetvlans console_setup.proxy sched_reload named_setup \
console_reset db2ns bwconfig
LIBEXEC_STUFF = mkprojdir rmproj mkacct-ctrl rmacct-ctrl \
os_setup mkexpdir console_setup webnscheck \
os_setup mkexpdir console_setup webnscheck webreport \
webstartexp webendexp webbatchexp webkillbatchexp \
assign_wrapper ptopgen
......
#!/usr/bin/perl -w
use English;
#
# This gets invoked from the Web interface. Simply a wrapper for tbreport.
#
# usage: webreport <pid> <eid>
#
#
# Configure variables
#
my $TB = "@prefix@";
#
# Run the real thing, and never return.
#
exec "$TB/bin/tbreport", "-v", @ARGV;
die("webreport: Could not exec tbreport: $!");
......@@ -66,6 +66,23 @@ $nsfile = $row[nsfile];
echo "<XMP>$nsfile</XMP>\n";
echo "<br>
<center><h3>
Here is the physical mapping for this experiment
</h3></center>\n";
$output = array();
$retval = 0;
$result = exec("$TBSUEXEC_PATH nobody flux webreport $exp_pid $exp_eid",
$output, $retval);
echo "<XMP>\n";
for ($i = 1; $i < count($output); $i++) {
echo "$output[$i]\n";
}
echo "</XMP>\n";
#
# Standard Testbed Footer
#
......
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