X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab%2Fslices%2Fslice.php;h=af265b6e00100a2925f9d2a66e3eb5caccfc3fc8;hb=1ce86fd37ce8da9b475847a59394c0241a8dbbff;hp=ec2fac8d3d6141067b8b87831a08b168755b7f72;hpb=943aa87a34c6728e5c41db662dd70c08e9bdb7e4;p=plewww.git diff --git a/planetlab/slices/slice.php b/planetlab/slices/slice.php index ec2fac8..af265b6 100644 --- a/planetlab/slices/slice.php +++ b/planetlab/slices/slice.php @@ -27,11 +27,9 @@ 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; @@ -231,18 +229,11 @@ if ($local_peer ) { //////////////////////////////////////////////////////////// tab:details -// default for opening the details section or not ? -if ($local_peer) { - $default_show_details = true; - } else { - $default_show_details = ! $renew_visible; - } - $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); @@ -294,7 +285,7 @@ $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 @@ -304,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(); @@ -346,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 @@ -442,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); @@ -450,22 +444,27 @@ $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'=>'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 @@ -476,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); @@ -530,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(); @@ -557,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 @@ -602,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(); @@ -633,8 +620,8 @@ EOF;
- - + +
EOF; @@ -648,10 +635,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"]);')); @@ -669,21 +666,6 @@ 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; - $ConfigureColumns->configuration_panel_html(true); $ConfigureColumns->javascript_init(); @@ -709,7 +691,7 @@ foreach ($interfaces as $interface) $interface_hash[$interface['node_id']]=$inte //////////////////// 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(); @@ -805,7 +787,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 ) { @@ -881,44 +863,81 @@ $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 +$initscript_info=" +There are two ways to attach an initscript to a slice: +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_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))); + '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(); @@ -944,15 +963,14 @@ 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->th_td('Howto',"xxx yourscript start|stop|restart slicename"); $details->tr_submit('unused','Update initscripts'); $details->form_end(); $details->end(); @@ -976,7 +994,7 @@ $tag_value_threshold=24; $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( @@ -1042,7 +1060,7 @@ $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")); + $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); @@ -1074,7 +1092,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);