EOF;
$toggle_nodes->end();
}
+if ($profiling) plc_debug_prof('06: leases',0);
//////////////////// node configuration panel
if ($first_time_configuration)
@@ -649,9 +648,8 @@ href="http://trac.myslice.info">http://trac.myslice.info.
';
$toggle_nodes=new PlekitToggle('my-slice-nodes-configuration',
"Node table layout",
- array('visible'=>$column_conf_visible,
- 'info_text'=>$layout_info,
- 'info_visible'=>$show_layout_info));
+ array('info-text'=>$layout_info,
+ 'info-visible'=>$show_layout_info));
$toggle_nodes->start();
//usort ($table_headers, create_function('$col1,$col2','return strcmp($col1["header"],$col2["header"]);'));
@@ -669,12 +667,15 @@ print(" ");
print("");
+if ($profiling) plc_debug_prof('07: before configuration_panel',0);
$ConfigureColumns->configuration_panel_html(true);
+if ($profiling) plc_debug_prof('08: before javascript_init',0);
$ConfigureColumns->javascript_init();
$toggle_nodes->end();
+if ($profiling) plc_debug_prof('09: layout',0);
$all_sites=$api->GetSites(NULL, array('site_id','login_base'));
$site_hash=array();
@@ -688,13 +689,12 @@ $interface_hash=array();
foreach ($interfaces as $interface) $interface_hash[$interface['node_id']]=$interface;
-
-
+if ($profiling) plc_debug_prof('10: interfaces',count($interfaces));
//////////////////// nodes currently in
$toggle_nodes=new PlekitToggle('my-slice-nodes-current',
count_english($slice_nodes,"node") . " currently in $name",
- array('visible'=>get_arg('show_nodes_current',!$privileges)));
+ array('visible'=>get_arg('show_nodes_current')));
$toggle_nodes->start();
$headers=array();
@@ -735,7 +735,7 @@ $table->start();
if ($slice_nodes) foreach ($slice_nodes as $node) {
$table->row_start();
-$table->cell($node['node_id'], array('display'=>'none'));
+ $table->cell($node['node_id'], array('display'=>'none'));
$table->cell(l_node_obj($node));
$peers->cell($table,$node['peer_id']);
@@ -776,6 +776,8 @@ if ($privileges) {
$table->end();
$toggle_nodes->end();
+if ($profiling) plc_debug_prof('11: nodes in',count($slice_nodes));
+
//////////////////// nodes to add
if ($privileges) {
$new_potential_nodes = array();
@@ -790,7 +792,7 @@ if ($privileges) {
$count=count($potential_nodes);
$toggle_nodes=new PlekitToggle('my-slice-nodes-add',
count_english($potential_nodes,"more node") . " available",
- array('visible'=>get_arg('show_nodes_add',false)));
+ array('visible'=>get_arg('show_nodes_add')));
$toggle_nodes->start();
if ( $potential_nodes ) {
@@ -825,7 +827,7 @@ $notes [] = "For information about the different columns please see the node
if ($potential_nodes) foreach ($potential_nodes as $node) {
$table->row_start();
-$table->cell($node['node_id'], array('display'=>'none'));
+ $table->cell($node['node_id'], array('display'=>'none'));
$table->cell(l_node_obj($node));
$peers->cell($table,$node['peer_id']);
@@ -861,12 +863,14 @@ $table->cell($node['node_id'], array('display'=>'none'));
$toggle->end();
+if ($profiling) plc_debug_prof('12: nodes to add',count($potential_nodes));
+
//////////////////////////////////////// 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 2 mechanisms (initscript_code, initscript)
// * explain the interface : initscript start|stop|restart slicename
// xxx fixme
@@ -899,42 +903,48 @@ The slice-specific setting has precedence on a shared initscript.
$shared_initscripts=$api->GetInitScripts(array('-SORT'=>'name'),array('name'));
//$shared_initscripts=$api->GetInitScripts();
-if ($profiling) plc_debug_prof('6 initscripts',count($initscripts));
+if ($profiling) plc_debug_prof('13: initscripts',count($initscripts));
// xxx expose this even on foreign slices for now
if ($local_peer) {
$initscript='';
- $initscript_body='';
+ $initscript_code='';
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);
+ if ($tag['tagname']=='initscript_code') {
+ if ($initscript_code!='') drupal_set_error("multiple occurrences of 'initscript_code' tag");
+ $initscript_code=$tag['value'];
+ // plc_debug_txt('retrieved body',$initscript_code);
}
}
$label="No initscript";
- $trimmed=trim($initscript_body);
- if (!empty($trimmed)) $label="Initscript : slice-specific (" . substr($initscript_body,0,20) . " ...)";
+ $trimmed=trim($initscript_code);
+ if (!empty($trimmed)) $label="Initscript : slice-specific (" . substr($initscript_code,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),
- 'info_text'=>$initscript_info
+ 'visible'=>get_arg('show_initscripts'),
+ 'info-text'=>$initscript_info
// not messing with persontags to guess whether this should be displayed or not
// hopefully some day toggle will know how to handle that using web storage
));
$toggle->start();
$details=new PlekitDetails(TRUE);
+ // we expose the previous values so that actions.php can know if changes are really needed
+ // the code needs to be encoded as it may contain any character
+ // as far as the code, this does not work too well b/c what actions.php receives
+ // seems to have spurrious \r chars, and the comparison between old and new values
+ // is not reliable, which results in changes being made although the code hasn't changed
+ // hve spent too much time on this, good enough for now...
$details->form_start(l_actions(),array('action'=>'update-initscripts',
'slice_id'=>$slice_id,
'name'=>$name,
'previous-initscript'=>$initscript,
- 'previous-initscript-body'=>$initscript_body));
+ 'previous-initscript-code'=>htmlentities($initscript_code)));
$details->start();
// comppute a pulldown with available names
$selectors=array();
@@ -960,13 +970,13 @@ if ($local_peer) {
////////// by contents
$script_height=8;
$script_width=60;
- if ($initscript_body) {
- $text=explode("\n",$initscript_body);
+ if ($initscript_code) {
+ $text=explode("\n",$initscript_code);
$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',
+ $details->th_td('slice initscript',$initscript_code,'initscript-code',
array('input_type'=>'textarea', 'width'=>$script_width,'height'=>$script_height));
$details->tr_submit('unused','Update initscripts');
$details->form_end();
@@ -985,13 +995,13 @@ $tag_value_threshold=24;
// xxx expose this even on foreign slices for now
//if ( $local_peer ) {
- if ($profiling) plc_debug_prof('7 slice tags',count($tags));
+ if ($profiling) plc_debug_prof('14: 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 that slice',
- 'visible'=>get_arg('show_tags',false)));
+ 'visible'=>get_arg('show_tags')));
$toggle->start();
$headers=array(
@@ -1030,7 +1040,7 @@ $tag_value_threshold=24;
$nodegroup_name="n/a";
if ($tag['nodegroup_id']) {
$nodegroups=$api->GetNodeGroups(array('nodegroup_id'=>$tag['nodegroup_id']));
- if ($profiling) plc_debug_prof('8 nodegroup for slice tag',$nodegroup);
+ if ($profiling) plc_debug_prof('15: nodegroup for slice tag',$nodegroup);
if ($nodegroup) {
$nodegroup = $nodegroups[0];
$nodegroup_name = $nodegroup['groupname'];
@@ -1057,8 +1067,8 @@ $tag_value_threshold=24;
function tag_selector ($tag) {
return array("display"=>$tag['tagname'],"value"=>$tag['tag_type_id']);
}
- $all_tags= $api->GetTagTypes( array ("category"=>"slice*","-SORT"=>"+tagname"), array("tagname","tag_type_id"));
- if ($profiling) plc_debug_prof('9 tagtypes',count($all_tags));
+ $all_tags= $api->GetTagTypes( array ("category"=>"*slice*","-SORT"=>"+tagname"), array("tagname","tag_type_id"));
+ if ($profiling) plc_debug_prof('16: tagtypes',count($all_tags));
$selector_tag=array_map("tag_selector",$all_tags);
function node_selector($node) {
@@ -1070,7 +1080,7 @@ $tag_value_threshold=24;
return array("display"=>$ng["groupname"],"value"=>$ng['nodegroup_id']);
}
$all_nodegroups = $api->GetNodeGroups( array("groupname"=>"*"), array("groupname","nodegroup_id"));
- if ($profiling) plc_debug_prof('10 nodegroups',count($all_nodegroups));
+ if ($profiling) plc_debug_prof('17: nodegroups',count($all_nodegroups));
$selector_nodegroup=array_map("nodegroup_selector",$all_nodegroups);
$table->cell($form->select_html("tag_type_id",$selector_tag,array('label'=>"Choose Tag")));
@@ -1089,7 +1099,7 @@ $tag_value_threshold=24;
//////////////////////////////////////////////////////////// tab:renew
if ($local_peer ) {
- if ( ! $renew_visible) renew_area ($slice,$site,false);
+ if ( ! $renew_visible) renew_area ($slice,$site,NULL);
}
$peers->block_end($peer_id);