X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab%2Fslices%2Fslice.php;h=28d714e0490e291fd71451e8191b74c94698ecf3;hb=46d5ed0785050dace2598da42560be82b3da8fd8;hp=a8e49c3a9ebc53f02fe53c08e02a050f5fd5f20e;hpb=09dfe40f5c40b16b7c4d59e3d39e294ae3b6810e;p=plewww.git diff --git a/planetlab/slices/slice.php b/planetlab/slices/slice.php index a8e49c3..28d714e 100644 --- a/planetlab/slices/slice.php +++ b/planetlab/slices/slice.php @@ -442,32 +442,36 @@ $extra_columns[]=array('tagname'=>'deployment', 'header'=>'DL', 'source'=>'myplc } //CoMon Live data -//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); +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 -//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); + +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); +} @@ -480,8 +484,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); @@ -534,12 +536,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(); @@ -566,39 +570,24 @@ $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 permanently -
-
-EOF; -} +This feature is still experimental; feedback is appreciated at devel@planet-lab.org +"; +$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-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 @@ -652,10 +641,21 @@ $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('visible'=>$column_conf_visible, + '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"]);')); @@ -673,21 +673,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(); @@ -885,44 +870,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',false), + '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(); @@ -948,15 +970,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();