X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab%2Fslices%2Fslice.php;h=af265b6e00100a2925f9d2a66e3eb5caccfc3fc8;hb=1ce86fd37ce8da9b475847a59394c0241a8dbbff;hp=d6de73e87777f1e6303932bd148b8518d37fb3aa;hpb=40412783f6f14920fb8ace5349c83186623ef6c8;p=plewww.git diff --git a/planetlab/slices/slice.php b/planetlab/slices/slice.php index d6de73e..af265b6 100644 --- a/planetlab/slices/slice.php +++ b/planetlab/slices/slice.php @@ -1,7 +1,5 @@ - '); // -------------------- admins potentially need to get full list of users -ini_set('memory_limit','32M'); +//error_reporting(0); $profiling=false; if ($_GET['profiling']) $profiling=true; @@ -57,7 +55,7 @@ if (empty($slices)) { $slice=$slices[0]; -if ($profiling) plc_debug_prof('2: slice',count($slices)); +if ($profiling) plc_debug_prof('1: slice',count($slices)); // pull all node info to vars $name= $slice['name']; $expires = date( "d/m/Y", $slice['expires'] ); @@ -70,14 +68,15 @@ $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('2: peers',count($peers)); // gets site info $sites= $api->GetSites( array( $site_id ) ); $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; @@ -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; @@ -150,36 +149,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 must 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. -Do not provide bogus information; 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 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 (""); } } @@ -233,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); @@ -277,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)) @@ -294,10 +282,10 @@ $count=count($persons); if ($profiling) plc_debug_prof('4: persons',count($persons)); $toggle= - new PlekitToggle ('my-slice-persons',"$count Users", + 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 @@ -307,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(); @@ -349,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 @@ -393,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 @@ -404,17 +392,151 @@ $toggle->end(); // (.) type is passed to the javascript table, for sorting (default is 'string') // minimal list as a start -$node_fixed_columns = array('hostname','node_id','peer_id','slice_ids_whitelist', +$node_fixed_columns = array('hostname','node_id','peer_id','slice_ids_whitelist', 'site_id', 'run_level','boot_state','last_contact','node_type'); // create a VisibleTags object : basically the list of tag columns to show -$visibletags = new VisibleTags ($api, 'node'); -$visiblecolumns = $visibletags->column_names(); -$node_columns=array_merge($node_fixed_columns,$visiblecolumns); +//$visibletags = new VisibleTags ($api, 'node'); +//$visiblecolumns = $visibletags->column_names(); // optimizing calls to GetNodes -$all_nodes=$api->GetNodes(NULL,$node_columns); +//$all_nodes=$api->GetNodes(NULL,$node_columns); //$slice_nodes=$api->GetNodes(array('node_id'=>$slice['node_ids']),$node_columns); //$potential_nodes=$api->GetNodes(array('~node_id'=>$slice['node_ids']),$node_columns); + + +//NEW CODE FOR ENABLING COLUMN CONFIGURATION + +//prepare fix and configurable columns + +$fix_columns = array(); +$fix_columns[]=array('tagname'=>'hostname', 'header'=>'hostname', 'type'=>'string', 'title'=>'The name of the node'); +$fix_columns[]=array('tagname'=>'peer_id', 'header'=>'AU', 'type'=>'string', 'title'=>'Authority'); +$fix_columns[]=array('tagname'=>'run_level', 'header'=>'ST', 'type'=>'string', 'title'=>'Status'); +$fix_columns[]=array('tagname'=>'node_type', 'header'=>'RES', 'type'=>'string', 'title'=>'Reservable'); + +// columns that correspond to the visible tags for nodes (*node/ui*) +$visibletags = new VisibleTags ($api, 'node'); +$visibletags->columns(); +$tag_columns = $visibletags->headers(); + +//columns that are not defined as extra myslice tags +$extra_columns = array(); +//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 + +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 + +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 + +$first_time_configuration = false; +$default_configuration = "hostname:f|ST:f|AU:f|RES:f"; +//$extra_default = ""; +$column_configuration = ""; +$slice_column_configuration = ""; + +$show_configuration = ""; + +$PersonTags=$api->GetPersonTags (array('person_id'=>$plc->person['person_id'])); +//plc_debug('ptags',$PersonTags); +foreach ($PersonTags as $ptag) { + 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']; + } +} + +$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; $inode_tags(); + +$node_columns=array_merge($node_fixed_columns,$visiblecolumns); +$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_info = FALSE; + else if ($ss =="columns") + $show_layout_info = '0'; +} + $slice_nodes=array(); $potential_nodes=array(); $reservable_nodes=array(); @@ -434,127 +556,150 @@ 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(); -////////// 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 area +$leases_info=" +You have attached one or more reservable nodes to your slice. Reservable nodes show up with the '$mark' mark. -Your slice will be available only during timeslots -where you have obtained leases. +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 -

-EOF; -} - -//////////////////// reservable nodes area +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',false))); + array('visible'=>get_arg('show_nodes_resa'), + 'info-text'=>$leases_info, + 'info-visible'=>$show_reservable_info)); $toggle_nodes->start(); - $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; - // xxx should be configurable - $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; - $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 = 36; + // offset in hours (in the future) from now + $leases_w = $_GET['leases_w']; + if ( ! $leases_w) $leases_w=18; + // 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; $toggle_nodes->end(); } + +//////////////////// node configuration panel +if ($first_time_configuration) +$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('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"]);')); +//print("

TABLE HEADERS

"); +//print_r($table_headers); + +print("

"); +print(""); +print(""); +print(""); +print(""); +print(""); +print(""); +print("
"); +print(""); +print(""); + +$ConfigureColumns->configuration_panel_html(true); + +$ConfigureColumns->javascript_init(); + +$toggle_nodes->end(); + + +$all_sites=$api->GetSites(NULL, array('site_id','login_base')); +$site_hash=array(); +foreach ($all_sites as $tmp_site) $site_hash[$tmp_site['site_id']]=$tmp_site['login_base']; + +$interface_columns=array('ip','node_id','interface_id'); +$interface_filter=array('is_primary'=>TRUE); +$interfaces=$api->GetInterfaces($interface_filter,$interface_columns); + +$interface_hash=array(); +foreach ($interfaces as $interface) $interface_hash[$interface['node_id']]=$interface; + + + + + //////////////////// 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(); $notes=array(); +//$notes=array_merge($notes,$visibletags->notes()); +$notes [] = "For information about the different columns please see the node table layout tab above or mouse over the column headers"; + +/* $headers['peer']='string'; $headers['hostname']='string'; $short="-S-"; $long=Node::status_footnote(); $type='string'; @@ -563,27 +708,53 @@ $short=reservable_mark(); $long=reservable_legend(); $type='string'; $headers[$short]=array('type'=>$type,'title'=>$long); $notes []= "$short = $long"; // the extra tags, configured for the UI $headers=array_merge($headers,$visibletags->headers()); -$notes=array_merge($notes,$visibletags->notes()); if ($privileges) $headers[plc_delete_icon()]="none"; +*/ + +$edit_header = array(); +if ($privileges) $edit_header[plc_delete_icon()]="none"; +$headers = array_merge($ConfigureColumns->get_headers(),$edit_header); + +//print("

HEADERS

"); +//print_r($headers); $table_options = array('notes'=>$notes, 'search_width'=>15, - 'pagesize'=>20); -$table=new PlekitTable('nodes',$headers,'1',$table_options); + 'pagesize'=>20, + 'configurable'=>true); + +$table=new PlekitTable('nodes',$headers,NULL,$table_options); $form=new PlekitForm(l_actions(),array('slice_id'=>$slice['slice_id'])); $form->start(); $table->start(); if ($slice_nodes) foreach ($slice_nodes as $node) { $table->row_start(); - $peers->cell($table,$node['peer_id']); + +$table->cell($node['node_id'], array('display'=>'none')); + $table->cell(l_node_obj($node)); + $peers->cell($table,$node['peer_id']); $run_level=$node['run_level']; list($label,$class) = Node::status_label_class_($node); $table->cell ($label,array('class'=>$class)); $table->cell( ($node['node_type']=='reservable')?reservable_mark():"" ); - foreach ($visiblecolumns as $tagname) $table->cell($node[$tagname]); + + $hostname=$node['hostname']; + $ip=$interface_hash[$node['node_id']]['ip']; + $interface_id=$interface_hash[$node['node_id']]['interface_id']; + +//extra columns +$node['domain'] = topdomain($hostname); +$node['sitename'] = l_site_t($node['site_id'],$site_hash[$node['site_id']]); +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); if ($privileges) $table->cell ($form->checkbox_html('node_ids[]',$node['node_id'])); $table->row_end(); @@ -616,12 +787,15 @@ 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 ) { $headers=array(); $notes=array(); + + +/* $headers['peer']='string'; $headers['hostname']='string'; $short="-S-"; $long=Node::status_footnote(); $type='string'; @@ -630,22 +804,43 @@ if ($privileges) { $headers[$short]=array('type'=>$type,'title'=>$long); $notes []= "$short = $long"; // the extra tags, configured for the UI $headers=array_merge($headers,$visibletags->headers()); - $notes=array_merge($notes,$visibletags->notes()); $headers['+']="none"; +*/ + + $add_header = array(); + $add_header['+']="none"; + $headers = array_merge($ConfigureColumns->get_headers(),$add_header); + + //$notes=array_merge($notes,$visibletags->notes()); +$notes [] = "For information about the different columns please see the node table layout tab above or mouse over the column headers"; - $table=new PlekitTable('add_nodes',$headers,'1', $table_options); + $table=new PlekitTable('add_nodes',$headers,NULL, $table_options); $form=new PlekitForm(l_actions(), array('slice_id'=>$slice['slice_id'])); $form->start(); $table->start(); if ($potential_nodes) foreach ($potential_nodes as $node) { $table->row_start(); - $peers->cell($table,$node['peer_id']); + +$table->cell($node['node_id'], array('display'=>'none')); + $table->cell(l_node_obj($node)); + $peers->cell($table,$node['peer_id']); list($label,$class) = Node::status_label_class_($node); $table->cell ($label,array('class'=>$class)); $table->cell( ($node['node_type']=='reservable')?reservable_mark():"" ); - foreach ($visiblecolumns as $tagname) $table->cell($node[$tagname]); + + //extra columns + $hostname=$node['hostname']; + $ip=$interface_hash[$node['node_id']]['ip']; + $interface_id=$interface_hash[$node['node_id']]['interface_id']; + $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); + + //foreach ($visiblecolumns as $tagname) $table->cell($node[$tagname]); + $ConfigureColumns->cells($table, $node); + $table->cell ($form->checkbox_html('node_ids[]',$node['node_id'])); $table->row_end(); } @@ -663,18 +858,143 @@ if ($privileges) { $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_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_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('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', - 'visible'=>get_arg('show_tags',false))); + array('bubble'=>'Inspect and set tags on that slice', + 'visible'=>get_arg('show_tags'))); $toggle->start(); $headers=array( @@ -691,20 +1011,29 @@ $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']) { $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']; @@ -731,8 +1060,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('9 tagtypes',count($all_tags)); $selector_tag=array_map("tag_selector",$all_tags); function node_selector($node) { @@ -744,7 +1073,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"))); @@ -761,9 +1090,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);