X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab%2Fslices%2Fslice.php;h=3b27b11542526d8ed25b6e0d935bf21694e43f79;hb=4b96dd01a3283a5dbcd6e859e8713102dc685937;hp=744a718e370b2f5484d4228e86f5c03ff3436626;hpb=6a1d8248f67a405efd7e175f5593455757f55cc2;p=plewww.git diff --git a/planetlab/slices/slice.php b/planetlab/slices/slice.php index 744a718..3b27b11 100644 --- a/planetlab/slices/slice.php +++ b/planetlab/slices/slice.php @@ -27,11 +27,10 @@ require_once 'columns.php'; // keep css separate for now drupal_set_html_head(' - '); // -------------------- admins potentially need to get full list of users -ini_set('memory_limit','32M'); +//error_reporting(0); $profiling=false; if ($_GET['profiling']) $profiling=true; @@ -56,7 +55,7 @@ if (empty($slices)) { $slice=$slices[0]; -if ($profiling) plc_debug_prof('2: slice',count($slices)); +if ($profiling) plc_debug_prof('01: slice',count($slices)); // pull all node info to vars $name= $slice['name']; $expires = date( "d/m/Y", $slice['expires'] ); @@ -69,7 +68,7 @@ $peer_id= $slice['peer_id']; $peers=new Peers ($api); $local_peer = ! $peer_id; -if ($profiling) plc_debug_prof('3: peers',count($peers)); +if ($profiling) plc_debug_prof('02: peers',count($peers)); // gets site info $sites= $api->GetSites( array( $site_id ) ); @@ -77,7 +76,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('03: sites',count($sites)); //////////////////////////////////////// building blocks for the renew area // Constants global $DAY; $DAY = 24*60*60; @@ -86,7 +85,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; @@ -229,19 +228,12 @@ if ($local_peer ) { } -//////////////////// 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); @@ -273,7 +265,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)) @@ -288,12 +280,12 @@ $potential_persons= $person_columns); $count=count($persons); -if ($profiling) plc_debug_prof('4: persons',count($persons)); +if ($profiling) plc_debug_prof('04: persons',count($persons)); $toggle= 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 @@ -303,7 +295,7 @@ $toggle->start(); // 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(); @@ -345,7 +337,7 @@ if ($privileges) { $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 @@ -389,7 +381,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 @@ -441,6 +433,9 @@ $extra_columns[]=array('tagname'=>'deployment', 'header'=>'DL', 'source'=>'myplc } //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); @@ -449,9 +444,26 @@ $extra_columns[]=array('tagname'=>'gbfree', 'header'=>'DF', 'source'=>'comon', ' $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 @@ -463,8 +475,6 @@ $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'])); //plc_debug('ptags',$PersonTags); @@ -517,12 +527,14 @@ $all_nodes=$api->GetNodes(NULL,$node_columns); $ConfigureColumns->fetch_live_data($all_nodes); +$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'; + $show_reservable_info = FALSE; else if ($ss =="columns") - $show_columns_message = '0'; + $show_layout_info = '0'; } $slice_nodes=array(); @@ -536,7 +548,7 @@ foreach ($all_nodes as $node) { $potential_nodes[]=$node; } } -if ($profiling) plc_debug_prof('5: nodes',count($slice_nodes)); +if ($profiling) plc_debug_prof('05: nodes',count($slice_nodes)); //////////////////// // outline the number of reservable nodes $nodes_message=count_english($slice_nodes,"node"); @@ -544,44 +556,32 @@ if (count($reservable_nodes)) $nodes_message .= " (" . count($reservable_nodes) $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 - -$count=count($reservable_nodes); -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'=>get_arg('show_nodes_resa',false), 'info_div'=>'note_reservable_div')); - $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 << -
-
+$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.
-This feature is still experimental; feedback is appreciated at devel@planet-lab.org -
hide message -
-
-EOF; -} +This feature is still experimental; feedback is appreciated at devel@planet-lab.org +"; +$count=count($reservable_nodes); +if ($count && $privileges) { + // include leases.js only if needed + drupal_set_html_head(''); + + // 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'=>get_arg('show_nodes_resa'), + 'info-text'=>$leases_info, + 'info-visible'=>$show_reservable_info)); + $toggle_nodes->start(); // get settings from environment, otherwise set to defaults // when to start, in hours in the future from now @@ -589,10 +589,10 @@ EOF; if ( ! $leases_offset ) $leases_offset=0; // how many timeslots to show $leases_slots=$_GET['leases_slots']; - if ( ! $leases_slots ) $leases_slots = 48; + if ( ! $leases_slots ) $leases_slots = 36; // offset in hours (in the future) from now $leases_w = $_GET['leases_w']; - if ( ! $leases_w) $leases_w=14; + if ( ! $leases_w) $leases_w=18; // number of timeslots to display $granularity=$api->GetLeaseGranularity(); @@ -620,14 +620,15 @@ EOF;
- - + +
EOF; $toggle_nodes->end(); } +if ($profiling) plc_debug_prof('06: leases',0); //////////////////// node configuration panel if ($first_time_configuration) @@ -635,10 +636,20 @@ $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 support@myslice.info. You can +find more information about the MySlice project at http://trac.myslice.info. +'; $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"]);')); @@ -656,27 +667,15 @@ print("
"); print(""); -//print ("showing column message = ".$show_columns_message); -if ($show_columns_message == '0') - $note_display = "display:none;"; -else - $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 -
- -EOF; - +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(); @@ -690,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(); @@ -737,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']); @@ -778,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(); @@ -792,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 ) { @@ -827,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']); @@ -863,18 +863,145 @@ $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_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:
    + +
  • Shared initscripts 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.
  • + +
  • You also have the option to provide your own +code , with the following conventions:
      + +
    • Like regular initscripts, your script must except to receive as a +first argument start , +stop or restart . 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. +
    • + +
    • As a second argument, you will receive the slicename; in most +cases this can be safely ignored.
    • + +
    +
  • +
+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('13: 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('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 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( @@ -913,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('10 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']; @@ -940,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('11 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) { @@ -953,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('13 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"))); @@ -970,9 +1097,9 @@ $tag_value_threshold=24; //} -//////////////////////// 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);