initscripts can be managed in the UI

a bit rough for initscript_body wrt \r chars that could use more care,
but good enough as a start
need more doc though

diff --git a/planetlab/common/actions.php b/planetlab/common/actions.php
index ba60104..b0466bd 100644 (file)
--- a/planetlab/common/actions.php
+++ b/planetlab/common/actions.php
@@ -87,6 +87,9 @@ $known_actions []= 'remove-nodes-from-slice';
 //     expects:        slice_id & node_ids
 $known_actions []= 'add-nodes-in-slice';
 //     expects:        slice_id & node_ids
+$known_actions []= 'update-initscripts';
+//     expects:        slice_id & name & previous-initscript & previous-initscript-body 
+//                     & initscript & initscript-body
 $known_actions []= 'delete-slice-tags';
 //      expects:        slice_tag_id
 $known_actions []= 'add-slice-tag';
@@ -705,6 +708,49 @@ Our support team will be glad to answer any question that you might have.
    break;
  }
 
+ case 'update-initscripts': {
+//     expects:        slice_id & name & previous-initscript & previous-initscript-body 
+//                     & initscript & initscript-body
+   $slice_id = intval ($_POST['slice_id']);    
+   $previous_initscript=$_POST['previous-initscript'];
+   $initscript=$_POST['initscript'];
+   $previous_initscript_body=$_POST['previous-initscript-body'];
+   $initscript_body=$_POST['initscript-body'];
+
+   $changes=FALSE;
+   if (strcmp($initscript,$previous_initscript) != 0) {
+     $newvalue=$api->SetSliceInitscript($slice_id,$initscript);
+     $status = (strcmp($newvalue,$initscript)==0) ? "OK" : "failed";
+     if (! $initscript)                drupal_set_message("Removed shared initscript '" . $previous_initscript . "' " . $status);
+     else                      drupal_set_message("Replaced shared initscript with '" . $initscript . "' " . $status);
+     $changes=TRUE;
+   }
+
+   // somehow some \r chars make it here; just ignore them
+   $previous_initscript_body=str_replace("\r","",$previous_initscript_body);
+   //   plc_debug_txt('previous initscript_body after cr',$previous_initscript_body);
+
+   $initscript_body=str_replace("\r","",$initscript_body);
+   // make sure the script ends with a single \n 
+   $initscript_body=trim($initscript_body);
+   if (!empty($initscript_body) && $initscript_body[strlen($initscript_body)-1] != "\n")
+     $initscript_body.="\n";
+   // plc_debug_txt('initscript_body after cr & nl/eof',$initscript_body);
+
+   if (strcmp($initscript_body,$previous_initscript_body) != 0) {
+     $newvalue=$api->SetSliceInitscriptBody($slice_id,$initscript_body);
+     // plc_debug_txt('newvalue',$newvalue);
+     $status=(strcmp($newvalue,$initscript_body)==0) ? "OK" : "failed";
+     if (! $initscript_body)   drupal_set_message("Removed initscript body " . $status);
+     else                      drupal_set_message("Installed new initscript body " . $status);
+     $changes=TRUE;
+   }
+   if (!$changes) drupal_set_message("No changes required in initscript");
+   plc_redirect(l_slice($slice_id) . "&show_details=0&show_initscripts=1" );
+   break;
+ }
+
+
  case 'delete-slice-tags': {
    $slice_id = intval($_POST['slice_id']);
    $slice_tag_ids = array_map("intval", $_POST['slice_tag_ids']);
@@ -719,7 +765,7 @@ Our support team will be glad to answer any question that you might have.
    }
    if ($success)
      drupal_set_message ("Deleted $count slice tag(s)");
-   plc_redirect(l_slice($slice_id) . "&show_tags=true" );
+   plc_redirect(l_slice($slice_id) . "&show_tags=1" );
    break;
  }
   

diff --git a/planetlab/slices/slice.php b/planetlab/slices/slice.php
index c4a06f4..ec2fac8 100644 (file)
--- a/planetlab/slices/slice.php
+++ b/planetlab/slices/slice.php
@@ -876,17 +876,106 @@ $table->cell($node['node_id'], array('display'=>'none'));
 
 $toggle->end();
 
+//////////////////////////////////////// retrieve all slice tags
+$tags=$api->GetSliceTags (array('slice_id'=>$slice_id));
+//////////////////////////////////////////////////////////// tab:initscripts
+// xxx fixme
+// * add a message on how to use this:
+// * explain the 2 mechanisms (initscript_body, initscript)
+// * explain the interface : initscript start|stop|restart slicename
+// xxx fixme
+
+$shared_initscripts=$api->GetInitScripts(array('-SORT'=>'name'),array('name'));
+//$shared_initscripts=$api->GetInitScripts();
+if ($profiling) plc_debug_prof('6 initscripts',count($initscripts));
+// xxx expose this even on foreign slices for now
+if ($local_peer) {
+  $initscript='';
+  $initscript_body='';
+  if ($tags) foreach ($tags as $tag) {
+      if ($tag['tagname']=='initscript') {
+       if ($initscript!='') drupal_set_error("multiple occurrences of 'initscript' tag");
+       $initscript=$tag['value'];
+      }
+      if ($tag['tagname']=='initscript_body') {
+       if ($initscript_body!='') drupal_set_error("multiple occurrences of 'initscript_body' tag");
+       $initscript_body=$tag['value'];
+       // plc_debug_txt('retrieved body',$initscript_body);
+      }
+    }
+  $label="No initscript";
+  $trimmed=trim($initscript_body);
+  if (!empty($trimmed)) $label="Initscript : slice-specific (" . substr($initscript_body,0,20) . " ...)";
+  else if (!empty($initscript)) $label="Initscript: shared " . $initscript;
+
+  $toggle = new PlekitToggle('slice-initscripts',$label,
+                            array('bubble'=>'Manage initscript on that slice',
+                                  'visible'=>get_arg('show_initscripts',false)));
+  $toggle->start();
+
+  $details=new PlekitDetails(TRUE);
+  $details->form_start(l_actions(),array('action'=>'update-initscripts',
+                                        'slice_id'=>$slice_id,
+                                        'name'=>$name,
+                                        'previous-initscript'=>$initscript,
+                                        'previous-initscript-body'=>$initscript_body));
+  $details->start();
+  // comppute a pulldown with available names
+  $selectors=array();
+  $is_found=FALSE;
+  if ($shared_initscripts) foreach ($shared_initscripts as $is) {
+      $is_selector=array('display'=>$is['name'],'value'=>$is['name']);
+      if ($is['name']==$initscript) {
+       $is_selector['selected']=TRUE;
+       $is_found=TRUE;
+      }
+      $selectors[]=$is_selector;
+    }
+  // display a warning when initscript references an unknown script
+  $details->tr_submit('unused','Update initscripts');
+  ////////// by name
+  $details->th_td("shared initscript name",
+                 $details->form()->select_html('initscript',$selectors,array('label'=>'none')),
+                 'initscript',
+                 array('input_type'=>'select'));
+  if ($initscript && ! $is_found) 
+    // xxx better rendering ?
+    $details->th_td('WARNING',plc_warning_html("Current name '" . $initscript . "' is not a known shared initscript name"));
+  ////////// by contents
+  $script_height=8;
+  $script_width=60;
+  if ($initscript_body) {
+    $text=explode("\n",$initscript_body);
+    $script_height=count($text);
+    $script_width=10;
+    foreach ($text as $line) $script_width=max($script_width,strlen($line));
+  }
+  $details->th_td('slice initscript',$initscript_body,'initscript-body',
+                 array('input_type'=>'textarea', 'width'=>$script_width,'height'=>$script_height));
+  $details->th_td('Howto',"xxx yourscript start|stop|restart slicename");
+  $details->tr_submit('unused','Update initscripts');
+  $details->form_end();
+  $details->end();  
+  $toggle->end();
+}
+
+//////////////////////////////////////////////////////////// tab:tags
 // very wide values get abbreviated
 $tag_value_threshold=24;
-//////////////////////////////////////////////////////////// Tags
+// xxx fixme
+// * this area could use a help message about some special tags:
+// * initscript-related should be taken out
+// * sliverauth-related (ssh_key & hmac) should have a toggle to hide or show
+// xxx fixme
+
+// xxx expose this even on foreign slices for now
 //if ( $local_peer ) {
-  $tags=$api->GetSliceTags (array('slice_id'=>$slice_id));
-  if ($profiling) plc_debug_prof('8 slice tags',count($tags));
+  if ($profiling) plc_debug_prof('7 slice tags',count($tags));
   function get_tagname ($tag) { return $tag['tagname'];}
   $tagnames = array_map ("get_tagname",$tags);
   
   $toggle = new PlekitToggle ('slice-tags',count_english_warning($tags,'tag'),
-                             array('bubble'=>'Inspect and set tags on tat slice',
+                             array('bubble'=>'Inspect and set tags on that slice',
                                    'visible'=>get_arg('show_tags',false)));
   $toggle->start();