<?php
-// $Id$
-
// Require login
require_once 'plc_login.php';
// keep css separate for now
drupal_set_html_head('
<link href="/planetlab/css/my_slice.css" rel="stylesheet" type="text/css" />
-<script src="/planetlab/slices/leases.js" type="text/javascript" charset="utf-8"></script>
');
// -------------------- admins potentially need to get full list of users
-ini_set('memory_limit','32M');
+//error_reporting(0);
$profiling=false;
if ($_GET['profiling']) $profiling=true;
$slice=$slices[0];
-if ($profiling) plc_debug_prof('2: slice',count($slices));
+if ($profiling) plc_debug_prof('1: slice',count($slices));
// pull all node info to vars
$name= $slice['name'];
$expires = date( "d/m/Y", $slice['expires'] );
$peers=new Peers ($api);
$local_peer = ! $peer_id;
-if ($profiling) plc_debug_prof('3: peers',count($peers));
+if ($profiling) plc_debug_prof('2: peers',count($peers));
// gets site info
$sites= $api->GetSites( array( $site_id ) );
$site_name= $site['name'];
$max_slices = $site['max_slices'];
-if ($profiling) plc_debug_prof('4: sites',count($sites));
+if ($profiling) plc_debug_prof('3: sites',count($sites));
//////////////////////////////////////// building blocks for the renew area
// Constants
global $DAY; $DAY = 24*60*60;
global $GRACE_DAYS; $GRACE_DAYS=10; // days for renewal promoted on top
global $NOW; $NOW=mktime();
-////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////// utility for the renew tab
// make the renew area on top and open if the expiration time is less than 10 days from now
function renew_needed ($slice) {
global $DAY, $NOW, $GRACE_DAYS;
}
-//////////////////// details
-// default for opening the details section or not ?
-if ($local_peer) {
- $default_show_details = true;
- } else {
- $default_show_details = ! $renew_visible;
- }
-
+//////////////////////////////////////////////////////////// tab:details
$toggle =
new PlekitToggle ('my-slice-details',"Details",
array('bubble'=>
'Display and modify details for that slice',
- 'visible'=>get_arg('show_details',$default_show_details)));
+ 'visible'=>get_arg('show_details')));
$toggle->start();
$details=new PlekitDetails($privileges);
$details->form_end();
$toggle->end();
-//////////////////// persons
+//////////////////////////////////////////////////////////// tab:persons
$person_columns = array('email','person_id','first_name','last_name','roles');
// get persons in slice
if (!empty($person_ids))
new PlekitToggle ('my-slice-persons',"$count users",
array('bubble'=>
'Manage accounts attached to this slice',
- 'visible'=>get_arg('show_persons',false)));
+ 'visible'=>get_arg('show_persons')));
$toggle->start();
////////// people currently in
// show otherwise
$toggle_persons = new PlekitToggle ('my-slice-persons-current',
"$count people currently in $name",
- array('visible'=>get_arg('show_persons_current',!$privileges)));
+ array('visible'=>get_arg('show_persons_current')));
$toggle_persons->start();
$headers=array();
$count=count($potential_persons);
$toggle_persons = new PlekitToggle ('my-slice-persons-add',
"$count people may be added to $name",
- array('visible'=>get_arg('show_persons_add',false)));
+ array('visible'=>get_arg('show_persons_add')));
$toggle_persons->start();
if ( ! $potential_persons ) {
// xxx improve style
}
$toggle->end();
-//////////////////////////////////////////////////////////// Nodes
+//////////////////////////////////////////////////////////// tab:nodes
// the nodes details to display here
// (1) we search for the tag types for which 'category' matches 'node*/ui*'
// all these tags will then be tentatively displayed in this area
$visibletags->columns();
$tag_columns = $visibletags->headers();
+//columns that are not defined as extra myslice tags
$extra_columns = array();
-$extra_columns[]=array('tagname'=>'sitename', 'header'=>'SN', 'type'=>'string', 'title'=>'Site name', 'fetched'=>true);
-$extra_columns[]=array('tagname'=>'domain', 'header'=>'DN', 'type'=>'string', 'title'=>'Toplevel domain name', 'fetched'=>true);
-$extra_columns[]=array('tagname'=>'ipaddress', 'header'=>'IP', 'type'=>'string', 'title'=>'IP Address', 'fetched'=>true);
-$extra_columns[]=array('tagname'=>'fcdistro', 'header'=>'OS', 'type'=>'string', 'title'=>'Operating system', 'fetched'=>false);
-$extra_columns[]=array('tagname'=>'uptime', 'header'=>'UT', 'source'=>'comon', 'type'=>'sortAlphaNumericTop', 'title'=>'Continuous uptime until now', 'fetched'=>false);
+//MyPLC columns
+$extra_columns[]=array('tagname'=>'sitename', 'header'=>'SN', 'type'=>'string', 'title'=>'Site name', 'fetched'=>true, 'source'=>'myplc');
+$extra_columns[]=array('tagname'=>'domain', 'header'=>'DN', 'type'=>'string', 'title'=>'Toplevel domain name', 'fetched'=>true, 'source'=>'myplc');
+$extra_columns[]=array('tagname'=>'ipaddress', 'header'=>'IP', 'type'=>'string', 'title'=>'IP Address', 'fetched'=>true, 'source'=>'myplc');
+$extra_columns[]=array('tagname'=>'fcdistro', 'header'=>'OS', 'type'=>'string', 'title'=>'Operating system', 'fetched'=>false, 'source'=>'myplc');
$extra_columns[]=array('tagname'=>'date_created', 'header'=>'DA', 'source'=>'myplc', 'type'=>'date', 'title'=>'Date added', 'fetched'=>false);
+$extra_columns[]=array('tagname'=>'arch', 'header'=>'A', 'source'=>'myplc', 'type'=>'string', 'title'=>'Architecture', 'fetched'=>false);
+if (plc_is_admin()) {
+$extra_columns[]=array('tagname'=>'deployment', 'header'=>'DL', 'source'=>'myplc', 'type'=>'string', 'title'=>'Deployment', 'fetched'=>false);
+}
+
+//CoMon Live data
+
+if (MYSLICE_COMON_AVAILABLE)
+{
+$extra_columns[]=array('tagname'=>'bwlimit', 'header'=>'BW', 'source'=>'comon', 'type'=>'sortAlphaNumericTop', 'title'=>'Bandwidth limit', 'fetched'=>false);
+$extra_columns[]=array('tagname'=>'numcores', 'header'=>'CC', 'source'=>'comon', 'type'=>'sortAlphaNumericTop', 'title'=>'Number of CPU Cores', 'fetched'=>false);
+$extra_columns[]=array('tagname'=>'cpuspeed', 'header'=>'CR', 'source'=>'comon', 'type'=>'sortAlphaNumericTop', 'title'=>'CPU clock rate', 'fetched'=>false);
+$extra_columns[]=array('tagname'=>'disksize', 'header'=>'DS', 'source'=>'comon', 'type'=>'sortAlphaNumericTop', 'title'=>'Disk size', 'fetched'=>false);
+$extra_columns[]=array('tagname'=>'gbfree', 'header'=>'DF', 'source'=>'comon', 'type'=>'sortAlphaNumericTop', 'title'=>'Currently available disk space', 'fetched'=>false);
+$extra_columns[]=array('tagname'=>'memsize', 'header'=>'MS', 'source'=>'comon', 'type'=>'sortAlphaNumericTop', 'title'=>'Memory size', 'fetched'=>false);
+$extra_columns[]=array('tagname'=>'numslices', 'header'=>'SM', 'source'=>'comon', 'type'=>'sortAlphaNumericTop', 'title'=>'Number of slices in memory', 'fetched'=>false);
+$extra_columns[]=array('tagname'=>'uptime', 'header'=>'UT', 'source'=>'comon', 'type'=>'sortAlphaNumericTop', 'title'=>'Continuous uptime until now', 'fetched'=>false);
+}
+
+//TopHat Live data
+
+if (MYSLICE_TOPHAT_AVAILABLE)
+{
+$extra_columns[]=array('tagname'=>'asn', 'header'=>'AS', 'source'=>'tophat', 'type'=>'string', 'title'=>'AS Number', 'fetched'=>false);
+$extra_columns[]=array('tagname'=>'city', 'header'=>'LCY', 'source'=>'tophat', 'type'=>'string', 'title'=>'City', 'fetched'=>false);
+$extra_columns[]=array('tagname'=>'region', 'header'=>'LRN', 'source'=>'tophat', 'type'=>'string', 'title'=>'Region', 'fetched'=>false);
+$extra_columns[]=array('tagname'=>'country', 'header'=>'LCN', 'source'=>'tophat', 'type'=>'string', 'title'=>'Country', 'fetched'=>false);
+$extra_columns[]=array('tagname'=>'continent', 'header'=>'LCT', 'source'=>'tophat', 'type'=>'string', 'title'=>'Continent', 'fetched'=>false);
+//$extra_columns[]=array('tagname'=>'hopcount', 'header'=>'HC', 'source'=>'tophat', 'type'=>'sortAlphaNumericTop', 'title'=>'Hop count from reference node', 'fetched'=>false);
+////$extra_columns[]=array('tagname'=>'rtt', 'header'=>'RTT', 'source'=>'tophat', 'type'=>'sortAlphaNumericTop', 'title'=>'Round trip time from reference node', 'fetched'=>false);
+//////$extra_columns[]=array('tagname'=>'agents', 'header'=>'MA', 'source'=>'tophat', 'type'=>'sortAlphaNumericTop', 'title'=>'Co-located measurement agents', 'fetched'=>true);
+////$extra_columns[]=array('tagname'=>'agents_sonoma', 'header'=>'MAS', 'source'=>'tophat', 'type'=>'sortAlphaNumericTop', 'title'=>'Co-located SONoMA agents', 'fetched'=>true);
+////$extra_columns[]=array('tagname'=>'agents_etomic', 'header'=>'MAE', 'source'=>'tophat', 'type'=>'sortAlphaNumericTop', 'title'=>'Co-located ETOMIC agents', 'fetched'=>true);
+////$extra_columns[]=array('tagname'=>'agents_tdmi', 'header'=>'MAT', 'source'=>'tophat', 'type'=>'sortAlphaNumericTop', 'title'=>'Co-located TDMI agents', 'fetched'=>true);
+////$extra_columns[]=array('tagname'=>'agents_dimes', 'header'=>'MAD', 'source'=>'tophat', 'type'=>'sortAlphaNumericTop', 'title'=>'Co-located DIMES agents', 'fetched'=>true);
+}
+
//Get user's column configuration
$slice_column_configuration = "";
$show_configuration = "";
-$show_reservable_message = '1';
-$show_columns_message = '1';
-
-//$PersonTags=$api->GetPersonTags (array('person_id'=>$plc->person['person_id']));
$PersonTags=$api->GetPersonTags (array('person_id'=>$plc->person['person_id']));
-//print_r($PersonTags);
+//plc_debug('ptags',$PersonTags);
foreach ($PersonTags as $ptag) {
- if ($ptag['tagname'] == 'columnconf')
- {
- $column_configuration = $ptag['value'];
- $conf_tag_id = $ptag['person_tag_id'];
- }
- if ($ptag['tagname'] == 'showconf')
- {
- $show_configuration = $ptag['value'];
- $show_tag_id = $ptag['person_tag_id'];
- }
+ if ($ptag['tagname'] == 'columnconf') {
+ $column_configuration = $ptag['value'];
+ $conf_tag_id = $ptag['person_tag_id'];
+ } else if ($ptag['tagname'] == 'showconf') {
+ $show_configuration = $ptag['value'];
+ $show_tag_id = $ptag['person_tag_id'];
+ }
}
-//print("<br>person column configuration = ".$column_configuration);
-//print("<br>person show configuration = ".$show_configuration);
-
$sliceconf_exists = false;
-if ($column_configuration == "")
-{
- $first_time_configuration = true;
- $column_configuration = $slice_id.";default";
- $sliceconf_exists = true;
-}
-else {
- $slice_conf = explode(";",$column_configuration);
- for ($i=0; $i<count($slice_conf); $i++ ) {
- if ($slice_conf[$i] == $slice_id)
- {
- $i++;
- $slice_column_configuration = $slice_conf[$i];
- $sliceconf_exists = true;
- break;
- }
- else
- {
- $i++;
- $slice_column_configuration = $slice_conf[$i];
- }
- }
+if ($column_configuration == "") {
+ $first_time_configuration = true;
+ $column_configuration = $slice_id.";default";
+ $sliceconf_exists = true;
+} else {
+ $slice_conf = explode(";",$column_configuration);
+ for ($i=0; $i<count($slice_conf); $i++ ) {
+ if ($slice_conf[$i] == $slice_id) {
+ $i++;
+ $slice_column_configuration = $slice_conf[$i];
+ $sliceconf_exists = true;
+ break;
+ } else {
+ $i++;
+ $slice_column_configuration = $slice_conf[$i];
+ }
+ }
}
if ($sliceconf_exists == false)
- $column_configuration = $column_configuration.";".$slice_id.";default";
-
-//print("<br>slice configuration = ".$slice_column_configuration);
-
+ $column_configuration = $column_configuration.";".$slice_id.";default";
if ($slice_column_configuration == "")
- $full_configuration = $default_configuration;
+ $full_configuration = $default_configuration;
else
- $full_configuration = $default_configuration."|".$slice_column_configuration;
+ $full_configuration = $default_configuration."|".$slice_column_configuration;
//instantiate the column configuration class, which prepares the headers array
$visiblecolumns = $ConfigureColumns->node_tags();
$node_columns=array_merge($node_fixed_columns,$visiblecolumns);
-//print_r($node_columns);
$all_nodes=$api->GetNodes(NULL,$node_columns);
$ConfigureColumns->fetch_live_data($all_nodes);
-//print("<br>person show configuration = ".$show_configuration);
-
+$show_reservable_info = TRUE;
+$show_layout_info = '1';
$show_conf = explode(";",$show_configuration);
foreach ($show_conf as $ss) {
- if ($ss =="reservable")
- $show_reservable_message = '0';
- if ($ss =="columns")
- $show_columns_message = '0';
+ if ($ss =="reservable")
+ $show_reservable_info = FALSE;
+ else if ($ss =="columns")
+ $show_layout_info = '0';
}
-//print("res:".$show_reservable_message." - cols:".$show_columns_message);
-
$slice_nodes=array();
$potential_nodes=array();
$reservable_nodes=array();
$toggle=new PlekitToggle ('my-slice-nodes',$nodes_message,
array('bubble'=>
'Manage nodes attached to this slice',
- 'visible'=>get_arg('show_nodes',false)));
+ 'visible'=>get_arg('show_nodes')));
$toggle->start();
//////////////////// reservable nodes area
-
+$leases_info="
+You have attached one or more reservable nodes to your slice.
+Reservable nodes show up with the '$mark' mark.
+Your slivers will be available only during timeslots
+where you have obtained leases.
+You can manage your leases in the tab below.
+<br>
+This feature is still experimental; feedback is appreciated at <a href='mailto:devel@planet-lab.org'>devel@planet-lab.org</a>
+";
$count=count($reservable_nodes);
if ($count && $privileges) {
+ // include leases.js only if needed
+ drupal_set_html_head('<script src="/planetlab/slices/leases.js" type="text/javascript" charset="utf-8"></script>');
+
// having reservable nodes in white lists looks a bit off scope for now...
$toggle_nodes=new PlekitToggle('my-slice-nodes-reserve',
"Leases - " . count($reservable_nodes) . " reservable node(s)",
- array('visible'=>$show_reservable_message, 'info_div'=>'note_reservable_div'));
+ array('visible'=>get_arg('show_nodes_resa'),
+ 'info-text'=>$leases_info,
+ 'info-visible'=>$show_reservable_info));
$toggle_nodes->start();
-if ($show_reservable_message)
-$note_display = "";
-else
-$note_display = "display:none;";
-
-////////// show a notice to people having attached a reservable node
-if (count($reservable_nodes) && $privileges) {
- $mark=reservable_mark();
- print <<<EOF
-<br>
-<div id='note_reservable_div' style="align:center; background-color:#CAE8EA; padding:4px; width:800px; $note_display">
-<table align=center><tr><td valign=top>
-You have attached one or more reservable nodes to your slice.
-Reservable nodes show up with the '$mark' mark.
-Your slivers will be available only during timeslots
-where you have obtained leases.
-You can manage your leases in the tab below.
-<br>
-Please note that as of August 2010 this feature is experimental.
-Feedback is appreciated at <a href="mailto:devel@planet-lab.org">devel@planet-lab.org</a>
-</td><td valign=top><span onClick=closeMessage('reservable')><img class='reset' src="/planetlab/icons/clear.png" alt="hide message"></span>
-</td></tr></table>
-</div>
-EOF;
-}
-
- $grain=$api->GetLeaseGranularity();
- if ($profiling) plc_debug_prof('6 granul',$grain);
- // where to start from, expressed as an offset in hours from now
- $resa_offset=$_GET['resa_offset'];
- if ( ! $resa_offset ) $resa_offset=0;
- $rough_start=time()+$resa_offset*3600;
- // xxx should be configurable
- $resa_slots=$_GET['resa_slots'];
- if ( ! $resa_slots ) $resa_slots = 36;
- // for now, show the next 72 hours, or 72 grains, which ever is smaller
- $duration=$resa_slots*$grain;
- $steps=$duration/$grain;
- $start=intval($rough_start/$grain)*$grain;
- $end=$rough_start+$duration;
- $lease_columns=array('lease_id','name','t_from','t_until','hostname','name');
- $leases=$api->GetLeases(array(']t_until'=>$rough_start,'[t_from'=>$end,'-SORT'=>'t_from'),$lease_columns);
- if ($profiling) plc_debug_prof('7 leases',count($leases));
- // hash nodes -> leases
- $host_hash=array();
- foreach ($leases as $lease) {
- $hostname=$lease['hostname'];
- if ( ! $host_hash[$hostname] ) {
- $host_hash[$hostname]=array();
- }
- // resync within the table
- $lease['nfrom']=($lease['t_from']-$start)/$grain;
- $lease['nuntil']=($lease['t_until']-$start)/$grain;
- $host_hash[$hostname] []= $lease;
- }
- # leases_data is the name used by leases.js to locate this table
- echo "<table id='leases_data'>";
- # pass (slice_id,slicename) as the [0,0] coordinate as thead>tr>td
- echo "<thead><tr><td>" . $slice['slice_id'] . '&' . $slice['name'] . "</td>";
- # the timeslot headers read (timestamp,label)
- $day_names=array('Su','M','Tu','W','Th','F','Sa');
- for ($i=0; $i<$steps; $i++) {
- $timestamp=($start+$i*$grain);
- $day=$day_names[intval(strftime("%w",$timestamp))];
- $label=$day . strftime(" %H:%M",$timestamp);
- // expose in each header cell the full timestamp, and how to display it - use & as a separator*/
- echo "<th>" . implode("&",array($timestamp,$label)) . "</th>";
- }
- echo "</tr></thead><tbody>";
- // todo - sort on hostnames
- function sort_hostname ($a,$b) { return ($a['hostname']<$b['hostname'])?-1:1;}
- usort($reservable_nodes,sort_hostname);
- foreach ($reservable_nodes as $node) {
- echo "<tr><th scope='row'>". $node['hostname'] . "</th>";
- $hostname=$node['hostname'];
- $leases=$host_hash[$hostname];
- $counter=0;
- while ($counter<$steps) {
- if ($leases && ($leases[0]['nfrom']<=$counter)) {
- $lease=array_shift($leases);
- /* nicer display, merge two consecutive leases for the same slice
- avoid doing that for now, as it might makes things confusing */
- /* while ($leases && ($leases[0]['name']==$lease['name']) && ($leases[0]['nfrom']==$lease['nuntil'])) {
- $lease['nuntil']=$leases[0]['nuntil'];
- array_shift($leases);
- }*/
- $duration=$lease['nuntil']-$counter;
- echo "<td colspan='$duration'>" . $lease['lease_id'] . '&' . $lease['name'] . "</td>";
- $counter=$lease['nuntil'];
- } else {
- echo "<td></td>";
- $counter+=1;
- }
- }
- echo "</tr>";
- }
- echo "</tbody></table>\n";
+ // get settings from environment, otherwise set to defaults
+ // when to start, in hours in the future from now
+ $leases_offset=$_GET['leases_offset'];
+ if ( ! $leases_offset ) $leases_offset=0;
+ // how many timeslots to show
+ $leases_slots=$_GET['leases_slots'];
+ if ( ! $leases_slots ) $leases_slots = 36;
+ // offset in hours (in the future) from now
+ $leases_w = $_GET['leases_w'];
+ if ( ! $leases_w) $leases_w=18;
+ // number of timeslots to display
+
+ $granularity=$api->GetLeaseGranularity();
+
+ // these elements are for passing data to the javascript layer
+ echo "<span class='hidden' id='leases_slicename'>" . $slice['name'] . "</span>";
+ echo "<span class='hidden' id='leases_slice_id'>" . $slice['slice_id']. "</span>";
+ echo "<span class='hidden' id='leases_granularity'>" . $granularity . "</span>";
+ // ditto, and editable - very rough for now
+ echo "<div class='center' id='leases_settings'>";
+ echo "<label id='leases_offset_label' class='leases_label'>start, in hours from now</label>";
+ echo "<input type='text' class='leases_input' id='leases_offset_input' value='$leases_offset' />";
+ echo "<label id='leases_slots_label' class='leases_label'># of timeslots</label>";
+ echo "<input type='text' class='leases_input' id='leases_slots_input' value='$leases_slots' />";
+ echo "<label id='leases_w_label' class='leases_label'>slot width, in pixels</label>";
+ echo "<input type='text' class='leases_input' id='leases_w_input' value='$leases_w' />";
+ echo "</div>";
+
+ // leases_data is the name used by leases.js to locate this place
+ // first population will be triggered by init_scheduler from leases.js
+ echo "<table id='leases_data' class='hidden'></table>";
// the general layout for the scheduler
echo <<< EOF
<div id='leases_area'></div>
<div id='leases_buttons'>
- <button id='leases_clear' type='submit'>Clear</button>
- <button id='leases_submit' type='submit'>Submit</button>
+ <button id='leases_refresh' type='submit'>Refresh (Pull)</button>
+ <button id='leases_submit' type='submit'>Submit (Push)</button>
</div>
EOF;
//////////////////// node configuration panel
-
if ($first_time_configuration)
$column_conf_visible = '1';
else
$column_conf_visible = '0';
-
+$layout_info='
+This tab allows you to customize the columns in the node tables,
+below. Information on the nodes comes from a variety of monitoring
+sources. If you, as either a user or a provider of monitoring data,
+would like to see additional columns made available, please send us
+your request in mail to <a
+href="mailto:support@myslice.info">support@myslice.info</a>. You can
+find more information about the MySlice project at <a
+href="http://trac.myslice.info">http://trac.myslice.info</a>.
+';
$toggle_nodes=new PlekitToggle('my-slice-nodes-configuration',
"Node table layout",
- array('visible'=>$column_conf_visible, 'info_div'=>'note_columns_div'));
+ 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"]);'));
print("<input type='hidden' id='show_configuration' value='".$show_configuration."' />");
print("<input type='hidden' id='column_configuration' value='".$slice_column_configuration."' />");
print("<br><input type='hidden' size=80 id='full_column_configuration' value='".$column_configuration."' />");
-print("<input type='hidden' id='previousConf' value='".$slice_column_configuration."'></input>");
-print("<input type='hidden' id='defaultConf' value='".$default_configuration."'></input>");
-
-//print ("showing column message = ".$show_columns_message);
-if ($show_columns_message == '0')
-$note_display = "display:none;";
-else
-$note_display = "";
-
- print <<<EOF
-<div id='note_columns_div' style="align:center; background-color:#CAE8EA; padding:4px; width:800px; $note_display">
-<table align=center><tr><td valign=top>
-This tab allows you to customize the columns in the node tables, below. Information on the nodes comes from a variety of monitoring sources. If you, as either a user or a provider of monitoring data, would like to see additional columns made available, please send us your request in mail to <a href="mailto:support@myslice.info">support@myslice.info</a>. You can find more information about the MySlice project at <a href="http://trac.myslice.info">http://trac.myslice.info</a>.
-</td><td valign=top><span onClick=closeMessage('columns')><img class='reset' src="/planetlab/icons/clear.png" alt="hide message permanently"></span>
-</td></tr></table>
-</div>
-EOF;
+print("<input type='hidden' id='previousConf' value='".$slice_column_configuration."' />");
+print("<input type='hidden' id='defaultConf' value='".$default_configuration."' />");
$ConfigureColumns->configuration_panel_html(true);
//////////////////// 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();
$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 ) {
$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_code, initscript)
+// * explain the interface : initscript start|stop|restart slicename
+// xxx fixme
+
+$initscript_info="
+There are two ways to attach an initscript to a slice:<ul>
+
+<li> <span class='bold'> Shared initscripts </span> are global to the
+MyPLC, and managed by the Operations Team. For that reason, regular
+users cannot change these scripts, but can reference one of the
+available names in the drop down below. </li>
+
+<li> You also have the option to provide <span class='bold'> your own
+code </span>, with the following conventions: <ul>
+
+<li> Like regular initscripts, your script must except to receive as a
+first argument <span class='bold'> start </span>, <span class='bold'>
+stop </span> or <span class='bold'> restart </span>. It is important
+to honor this argument, as your slice may be stopped and restarted at
+any time; also this is used whenever the installed code gets changed.
+</li>
+
+<li> As a second argument, you will receive the slicename; in most
+cases this can be safely ignored. </li>
+
+</ul>
+</li>
+ </ul>
+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));
+// xxx expose this even on foreign slices for now
+if ($local_peer) {
+ $initscript='';
+ $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_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_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'),
+ '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-code'=>htmlentities($initscript_code)));
+ $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_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_code,'initscript-code',
+ array('input_type'=>'textarea', 'width'=>$script_width,'height'=>$script_height));
+ $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',
- 'visible'=>get_arg('show_tags',false)));
+ array('bubble'=>'Inspect and set tags on that slice',
+ 'visible'=>get_arg('show_tags')));
$toggle->start();
$headers=array(
$nodegroup_name="n/a";
if ($tag['nodegroup_id']) {
$nodegroups=$api->GetNodeGroups(array('nodegroup_id'=>$tag['nodegroup_id']));
- if ($profiling) plc_debug_prof('10 nodegroup for slice tag',$nodegroup);
+ if ($profiling) plc_debug_prof('8 nodegroup for slice tag',$nodegroup);
if ($nodegroup) {
$nodegroup = $nodegroups[0];
$nodegroup_name = $nodegroup['groupname'];
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('11 tagtypes',count($all_tags));
+ $all_tags= $api->GetTagTypes( array ("category"=>"*slice*","-SORT"=>"+tagname"), array("tagname","tag_type_id"));
+ if ($profiling) plc_debug_prof('9 tagtypes',count($all_tags));
$selector_tag=array_map("tag_selector",$all_tags);
function node_selector($node) {
return array("display"=>$ng["groupname"],"value"=>$ng['nodegroup_id']);
}
$all_nodegroups = $api->GetNodeGroups( array("groupname"=>"*"), array("groupname","nodegroup_id"));
- if ($profiling) plc_debug_prof('13 nodegroups',count($all_nodegroups));
+ if ($profiling) plc_debug_prof('10 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")));
//}
-//////////////////////// renew slice
+//////////////////////////////////////////////////////////// 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);
git://git.onelab.eu / plewww.git / blobdiff