Commit 02ef5783 authored by Leigh B. Stoller's avatar Leigh B. Stoller

Minor changes for experiment activation and swapping. Have the

experiment info page redraw every 30 seconds when the exp state is in
the activating or swapping state. Eventually will stop when the state
changes.
parent 25fe0976
......@@ -307,12 +307,16 @@ if ($retval) {
echo "<br><br>";
echo "<h3>
Experiment `$exp_id' in project `$exp_pid' is configuring!<br><br>
Experiment
<a href='showexp.php3?pid=$exp_pid&eid=$exp_id'>$exp_id</a>
in project <A href='showproject.php3?pid=$exp_pid'>$exp_pid</A>
is configuring!<br><br>
You will be notified via email when the experiment has been fully
configured and you are able to proceed. This typically takes less
than 10 minutes, depending on the number of nodes you have requested.
If you do not receive email notification within a reasonable amount
of time, please contact $TBMAILADDR.
<br>
</h3>\n";
#
......
......@@ -91,7 +91,9 @@ $TB_IMAGEID_MIN = $TB_IMAGEID_READINFO;
$TB_IMAGEID_MAX = $TB_IMAGEID_DESTROY;
# Experiment states (that matter to us).
$TB_EXPTSTATE_SWAPPING = "swapping";
$TB_EXPTSTATE_SWAPPED = "swapped";
$TB_EXPTSTATE_ACTIVATING = "activating";
$TB_EXPTSTATE_ACTIVE = "active";
#
......
......@@ -416,21 +416,21 @@ function PAGEHEADER($title) {
<head>
<title>Emulab.Net - $title</title>\n";
$timeo = ($TBAUTHTIMEOUT + 120) * 1000;
#
# If logged in, initialize the refresh process.
#
if ($login_status == $STATUS_LOGGEDIN) {
$timeo = $TBAUTHTIMEOUT + 120;
echo "<noscript>
<META HTTP-EQUIV=\"refresh\" CONTENT=\"$timeo\">
</noscript>\n";
$timeo *= 1000;
echo "<script language=\"JavaScript\">
<!--
var sURL = \"$TBDOCBASE/index.php3\";
var sURL = \"$TBDOCBASE/index.php3\";
function doLoad() {
setTimeout(\"refresh()\", $timeo );
function doLoad(timeo) {
setTimeout(\"refresh()\", timeo );
}
//-->
</script>\n";
......@@ -451,7 +451,7 @@ function PAGEHEADER($title) {
# If logged in, start the refresh process.
#
if ($login_status == $STATUS_LOGGEDIN) {
echo "<body onload=\"doLoad()\">\n";
echo "<body onload='doLoad($timeo)'>\n";
}
else {
echo "<body>\n";
......
......@@ -113,6 +113,17 @@ echo "</table>\n";
#
SHOWNODES($exp_pid, $exp_eid);
if ($expstate &&
(strcmp($expstate, $TB_EXPTSTATE_SWAPPING) == 0 ||
strcmp($expstate, $TB_EXPTSTATE_ACTIVATING) == 0)) {
echo "<script language=\"JavaScript\">
<!--
doLoad(30000);
//-->
</script>\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