From 84bffaa3359d445a72d7590f76148bfd790be64f Mon Sep 17 00:00:00 2001
From: Chad Barb <barb@flux.utah.edu>
Date: Wed, 14 May 2003 23:10:25 +0000
Subject: [PATCH] Modify experiment is now deployed/documented... We can
 announce it tomorrow.

---
 www/faq.html       | 38 ++++++++++++++++++++++++++++++++++++++
 www/modifyexp.php3 | 16 ++++++++++------
 www/showexp.php3   | 23 ++++++++---------------
 3 files changed, 56 insertions(+), 21 deletions(-)

diff --git a/www/faq.html b/www/faq.html
index 1a8dcb7d5..14c4e0673 100644
--- a/www/faq.html
+++ b/www/faq.html
@@ -53,6 +53,8 @@
                            counts) for my experiment?</a> 
      <li> <a href="#UTT-Naming">What names should I use to refer to the
 			   nodes in my experiment?</a>
+     <li> <a href="#UTT-Modify">Can I modify my experiment 
+                           after creating it?</a> 
      </ul>
 
 <li> <a href="#HDS">Hardware setup</a>
@@ -806,6 +808,42 @@
 	    </li>
 	</li>
     </ul>
+<br>
+<li><a NAME="UTT-Modify"></a>
+    <font size='+1'><b>Can I modify my experiment after creating it?
+    </b></font>
+
+    <p>Yes. On the experiment view page, choose "Modify this Experiment".
+       This will allow you to modify an experiment, either swapped-out or in,
+       by editing its NS file.</p>
+    <p>If the experiment is swapped-out, 
+       Experiment Modify will simply replace its topology with the
+       newly specified one;
+       this new topology will be mapped when the experiment is swapped in.</p>
+    <p>If the experiment is already swapped-in, Modify will change the topology
+       and map in the portions which have been changed. This allows dynamic
+       addition, subtraction, and replacement of an experiment's nodes and links.
+       However, when modifying swapped-in experiments, there are a couple
+       things to keep in mind:
+       <ul>
+         <li>Any node with the same name in the old and new topology will remain
+	 on the same physical machine, unaffected-- its disk will not be reloaded.
+	 If you want to, for example, change the hardware on a machine, you will
+	 have to call the machine something different in the new topology.
+	 </li>
+	 <br>
+	 <li>
+	 It is highly recommended that you leave the
+	 "Reboot nodes in experiment" box checked in the Experiment Modify form.
+	 This is especially important if changing your experiment topology 
+         (adding or removing nodes, links, and LANs).
+	 If adding/removing a delay to/from an existing link, or replacing 
+	 a lost node <i>without modifying the experiment topology</i>,
+	 this won't be necessary.
+	 </li>
+       </ul>
+    </p>
+
 
 </ul>
 
diff --git a/www/modifyexp.php3 b/www/modifyexp.php3
index d581afba0..22717ba09 100644
--- a/www/modifyexp.php3
+++ b/www/modifyexp.php3
@@ -64,12 +64,15 @@ if (strcmp($expstate, $TB_EXPTSTATE_ACTIVE) &&
 
 
 if (! isset($go)) {
-
+	echo "<h3>Experiment Modify ";
+	echo "<a href='faq.php3#UTT-Modify'>Documentation (FAQ)</a></h3>";
+	echo "<br>";
 	echo "<form action='modifyexp.php3' method='post'>";
 	echo "<textarea cols='100' rows='40' name='nsdata'>";
 
 	$query_result =
-	    DBQueryFatal("SELECT nsfile from nsfiles where pid='$pid' and eid='$eid'");
+	    DBQueryFatal("SELECT nsfile from nsfiles ".
+                         "where pid='$pid' and eid='$eid'");
 	if (mysql_num_rows($query_result)) {
 	    $row    = mysql_fetch_array($query_result);
 	    $nsfile = stripslashes($row[nsfile]);
@@ -83,14 +86,15 @@ if (! isset($go)) {
 
 	echo "<br />";
 	if (0 == strcmp($expstate, $TB_EXPTSTATE_ACTIVE)) {
-	    echo "<p><b>Note!</b> If changing your experiment topology 
-              (adding or removing nodes, links, and LANs), you will most likely 
-	      have to reboot all nodes in your experiment (check the box below.)
+	    echo "<p><b>Note!</b> It is recommended that you 
+	      reboot all nodes in your experiment by checking the box below.
+	      This is especially important if changing your experiment topology 
+              (adding or removing nodes, links, and LANs).
 	      If adding/removing a delay to/from an existing link, or replacing 
 	      a lost node <i>without modifying the experiment topology</i>,
 	      this won't be necessary.</p>";
 	    echo "<input type='checkbox' name='reboot' value='1' checked='1'>
-	      Reboot nodes in experiment</input>";
+	      Reboot nodes in experiment (Highly Recommended)</input>";
 	}
 	echo "<br />";
 	echo "<input type='hidden' name='pid' value='$pid' />";
diff --git a/www/showexp.php3 b/www/showexp.php3
index 8b78495d7..1f8ff31dd 100644
--- a/www/showexp.php3
+++ b/www/showexp.php3
@@ -108,25 +108,18 @@ if (TBExptAccessCheck($uid, $exp_pid, $exp_eid, $TB_EXPT_UPDATEACCOUNTS)) {
 if (TBExptAccessCheck($uid, $exp_pid, $exp_eid, $TB_EXPT_MODIFY)) {
     WRITESUBMENUBUTTON("Reboot All Nodes",
 		       "boot.php3?pid=$exp_pid&eid=$exp_eid");
+    WRITESUBMENUBUTTON("Modify this Experiment",
+		       "modifyexp.php3?pid=$exp_pid&eid=$exp_eid");
+
 }
 
 if (ISADMIN($uid)) {
-    if (strcmp($expstate, $TB_EXPTSTATE_ACTIVE) == 0 ||
-	strcmp($expstate, $TB_EXPTSTATE_SWAPPED) == 0) {
-
+    if (strcmp($expstate, $TB_EXPTSTATE_ACTIVE) == 0) {		
 	SUBMENUSECTION("Beta-Test Options");
-	
-	if (strcmp($expstate, $TB_EXPTSTATE_ACTIVE) == 0) {		
-	    WRITESUBMENUBUTTON("Restart this Experiment",
-			       "swapexp.php3?inout=restart&pid=$exp_pid".
-			       "&eid=$exp_eid");
-	}              
-	
-	WRITESUBMENUBUTTON("Modify this Experiment",
-			   "modifyexp.php3?pid=$exp_pid&eid=$exp_eid");
-    }
-    
-    if (strcmp($expstate, $TB_EXPTSTATE_ACTIVE) == 0) {	
+	WRITESUBMENUBUTTON("Restart this Experiment",
+			   "swapexp.php3?inout=restart&pid=$exp_pid".
+			   "&eid=$exp_eid");
+
 	SUBMENUSECTION("Admin Options");
 	
 	WRITESUBMENUBUTTON("Send a Swap Request",
-- 
2.22.0