X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab%2Fslices%2Fslice.php;h=85eea7cf947fb6576d3fa37c80f45fa6b364152f;hb=28b1156eee0a74d5fc4afe9e22674568459fb96b;hp=c78aea3ebc1341bf5c311d466c61b4ea826152ed;hpb=202f024687fd6d8bafd4f0f98ca20e91b333864a;p=plewww.git diff --git a/planetlab/slices/slice.php b/planetlab/slices/slice.php index c78aea3..85eea7c 100644 --- a/planetlab/slices/slice.php +++ b/planetlab/slices/slice.php @@ -152,36 +152,32 @@ EOF; if ( empty( $selectors ) ) { print <<< EOF
-Slices annot be renewed more than $MAX_WEEKS weeks from now, i.e. not beyond $max_text. +Slices cannot be renewed more than $MAX_WEEKS weeks from now, i.e. not beyond $max_text. For this reason, the current slice cannot be renewed any further into the future, try again closer to expiration date.
EOF; } else { print <<< EOF
-

You are strongly encouraged to provide a short description, -as well as a link to a project website, before renewing it. - -
Please make sure to provide reasonable details on -the kind of traffic, and copyrights if relevant. -Be sure not to provide bogus information; Otherwise, if a complaint is lodged against -your slice and your PlanetLab Operations Center is unable to determine what the normal behavior -of your slice is, your slice may be deleted without your persmission to resolve the complaint.

- -

NOTE: -Slices cannot be renewed beyond another $max_renewal_weeks week(s) ($max_renewal_date). +Important: Please take this opportunity to review and update your slice information in the Details tab. +

+PlanetLab's security model requires that anyone who is concerned about a slice's activity be able to immediately learn about that slice. The details that you provide are your public explanation about why the slice behaves as it does. Be sure to describe the kind of traffic that your slice generates, and how it handles material that is under copyright, if relevant. +

+The PlanetLab Operations Centres regularly respond to concerns raised by third parties about site behaviour. Most incidents are resolved rapidly based upon the publicly posted slice details. However, when these details are not sufficiently clear or accurate, and we cannot immediately reach the slice owner, we must delete the slice.

-
EOF; $form = new PlekitForm (l_actions(), array('action'=>'renew-slice', 'slice_id'=>$slice['slice_id'])); $form->start(); - print $form->label_html('expires','Duration'); + print $form->label_html('expires','Duration: '); print $form->select_html('expires',$selectors,array('label'=>'Pick one')); print $form->submit_html('renew-button','Renew'); $form->end(); + +print("

NOTE: Slices cannot be renewed beyond another $max_renewal_weeks week(s) ($max_renewal_date).

"); +print (""); } } @@ -433,13 +429,32 @@ $visibletags = new VisibleTags ($api, 'node'); $visibletags->columns(); $tag_columns = $visibletags->headers(); -// extra columns that are not tags (for the moment not sorted correctly) - +//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); +//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 +$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); + //Get user's column configuration @@ -519,6 +534,8 @@ $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); @@ -582,8 +599,7 @@ Your slivers will be available only during timeslots where you have obtained leases. You can manage your leases in the tab below.
-Please note that as of August 2010 this feature is experimental. -Feedback is appreciated at devel@planet-lab.org +This feature is still experimental; feedback is appreciated at devel@planet-lab.org hide message @@ -596,10 +612,9 @@ EOF; $resa_offset=$_GET['resa_offset']; if ( ! $resa_offset ) $resa_offset=0; $rough_start=time()+$resa_offset*3600; - // xxx should be configurable + // show the next 36 grains $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; @@ -713,7 +728,7 @@ $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 devel@planet-lab.org +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
@@ -801,8 +816,10 @@ $table->cell($node['node_id'], array('display'=>'none')); //extra columns $node['domain'] = topdomain($hostname); $node['sitename'] = l_site_t($node['site_id'],$site_hash[$node['site_id']]); -$node['ipaddress'] = l_interface_t($interface_id,$ip); - +if ($interface_id) + $node['ipaddress'] = l_interface_t($interface_id,$ip); + else + $node['ipaddress'] = "n/a"; //foreach ($visiblecolumns as $tagname) $table->cell($node[$tagname]); $ConfigureColumns->cells($table, $node); @@ -937,15 +954,24 @@ $tag_value_threshold=24; $form->start(); $table->start(); if ($tags) { + // Get hostnames for nodes in a single pass + $_node_ids = array(); + foreach ($tags as $tag) { + if ($tag['node_id']) { + array_push($_node_ids, $tag['node_id']); + } + } + $_nodes = $api->GetNodes(array('node_id' => $_node_ids), array('node_id', 'hostname')); + $_hostnames = array(); + foreach ($_nodes as $_node) { + $_hostnames[$_node['node_id']] = $_node['hostname']; + } + + // Loop through tags again to display foreach ($tags as $tag) { $node_name = "ALL"; if ($tag['node_id']) { - $tag_nodes = $api->GetNodes(array('node_id'=>$tag['node_id'])); - if ($profiling) plc_debug_prof('9 node for slice tag',count($tag_nodes)); - if($tag_nodes) { - $node = $tag_nodes[0]; - $node_name = $node['hostname']; - } + $node_name = $_hostnames[$tag['node_id']]; } $nodegroup_name="n/a"; if ($tag['nodegroup_id']) {