X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab%2Fslices%2Fslice.php;h=a8e49c3a9ebc53f02fe53c08e02a050f5fd5f20e;hb=09dfe40f5c40b16b7c4d59e3d39e294ae3b6810e;hp=85eea7cf947fb6576d3fa37c80f45fa6b364152f;hpb=28b1156eee0a74d5fc4afe9e22674568459fb96b;p=plewww.git diff --git a/planetlab/slices/slice.php b/planetlab/slices/slice.php index 85eea7c..a8e49c3 100644 --- a/planetlab/slices/slice.php +++ b/planetlab/slices/slice.php @@ -1,7 +1,5 @@ GetSites( array( $site_id ) ); @@ -79,7 +78,7 @@ $site=$sites[0]; $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; @@ -88,7 +87,7 @@ global $MAX_WEEKS; $MAX_WEEKS= 8; // weeks from today 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; @@ -231,7 +230,7 @@ if ($local_peer ) { } -//////////////////// details +//////////////////////////////////////////////////////////// tab:details // default for opening the details section or not ? if ($local_peer) { $default_show_details = true; @@ -275,7 +274,7 @@ $details->end(); $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)) @@ -391,7 +390,7 @@ if ($privileges) { } $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 @@ -443,17 +442,33 @@ $extra_columns[]=array('tagname'=>'deployment', 'header'=>'DL', 'source'=>'myplc } //CoMon Live data -$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); +//NOTE: Uncomment these lines if CoMon provides information for your nodes + +//$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 -//$extra_columns[]=array('tagname'=>'hopcount', 'header'=>'HC', 'source'=>'tophat', 'type'=>'sortAlphaNumericTop', 'title'=>'Hop count from reference node', 'fetched'=>false); +//NOTE: Uncomment these lines if TopHat provides information for your nodes + +//$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 @@ -468,61 +483,45 @@ $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("
person column configuration = ".$column_configuration); -//print("
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; $islice 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 @@ -531,23 +530,18 @@ $ConfigureColumns =new PlekitColumns($full_configuration, $fix_columns, $tag_col $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("
person show configuration = ".$show_configuration); - $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_message = '0'; + else if ($ss =="columns") + $show_columns_message = '0'; } -//print("res:".$show_reservable_message." - cols:".$show_columns_message); - $slice_nodes=array(); $potential_nodes=array(); $reservable_nodes=array(); @@ -578,21 +572,21 @@ if ($count && $privileges) { // 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',false), 'info_div'=>'note_reservable_div')); $toggle_nodes->start(); if ($show_reservable_message) -$note_display = ""; + $note_display = ""; else -$note_display = "display:none;"; + $note_display = "display:none;"; ////////// show a notice to people having attached a reservable node if (count($reservable_nodes) && $privileges) { $mark=reservable_mark(); print << -
-
+
+
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 @@ -600,89 +594,50 @@ where you have obtained leases. You can manage your leases in the tab below.
This feature is still experimental; feedback is appreciated at devel@planet-lab.org -		hide message +hide message permanently
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; - // show the next 36 grains - $resa_slots=$_GET['resa_slots']; - if ( ! $resa_slots ) $resa_slots = 36; - $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 ""; - # pass (slice_id,slicename) as the [0,0] coordinate as thead>tr>td - echo ""; - # 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 ""; - } - echo ""; - // 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 ""; - $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 ""; - $counter=$lease['nuntil']; - } else { - echo ""; - $counter+=1; - } - } - echo ""; - } - echo "
" . $slice['slice_id'] . '&' . $slice['name'] . "" . implode("&",array($timestamp,$label)) . "
". $node['hostname'] . "" . $lease['lease_id'] . '&' . $lease['name'] . "
\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 = 48; + // offset in hours (in the future) from now + $leases_w = $_GET['leases_w']; + if ( ! $leases_w) $leases_w=14; + // number of timeslots to display + + $granularity=$api->GetLeaseGranularity(); + + // these elements are for passing data to the javascript layer + echo ""; + echo ""; + echo ""; + // ditto, and editable - very rough for now + echo "
"; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo "
"; + + // 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 ""; // the general layout for the scheduler echo <<< EOF
- +
EOF; @@ -692,7 +647,6 @@ EOF; //////////////////// node configuration panel - if ($first_time_configuration) $column_conf_visible = '1'; else @@ -716,20 +670,20 @@ print(""); print(""); print(""); print("
"); -print(""); -print(""); +print(""); +print(""); //print ("showing column message = ".$show_columns_message); if ($show_columns_message == '0') -$note_display = "display:none;"; + $note_display = "display:none;"; else -$note_display = ""; + $note_display = ""; print << -
+
+
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 support@myslice.info. You can find more information about the MySlice project at http://trac.myslice.info. -hide message permanently +hide message permanently
EOF; @@ -926,17 +880,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(); @@ -976,7 +1019,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('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']; @@ -1004,7 +1047,7 @@ $tag_value_threshold=24; 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)); + if ($profiling) plc_debug_prof('9 tagtypes',count($all_tags)); $selector_tag=array_map("tag_selector",$all_tags); function node_selector($node) { @@ -1016,7 +1059,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('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"))); @@ -1033,7 +1076,7 @@ $tag_value_threshold=24; //} -//////////////////////// renew slice +//////////////////////////////////////////////////////////// tab:renew if ($local_peer ) { if ( ! $renew_visible) renew_area ($slice,$site,false); }