X-Git-Url: http://git.onelab.eu/?p=plewww.git;a=blobdiff_plain;f=planetlab%2Fnodes%2Fnode.php;h=f7c5e6f50c2ecd1f57f7505eb0aa21c0bf9dc537;hp=3430a8d7ac82155efdab1104ae16f6aaf8adbe2c;hb=9d5da0d9968a075070eb8c5b75d8267d082bec31;hpb=965a36b08077d2e31dcabc30f03dcdbf2099e760 diff --git a/planetlab/nodes/node.php b/planetlab/nodes/node.php index 3430a8d..f7c5e6f 100644 --- a/planetlab/nodes/node.php +++ b/planetlab/nodes/node.php @@ -1,7 +1,5 @@ GetNodeGroups( $nodegroup_ids, array("groupname","tag_type_id","value")); -// xxx Thierry : remaining stuff -// (*) events: should display the latest events relating to that node. -// disabling call to GetEvents, that gets the session deleted in the DB -// (*) conf_files: is fetched but not displayed -if( !empty( $conf_file_ids ) ) - $conf_files= $api->GetConfFiles( $conf_file_ids ); -// (*) idem for PCUs -// gets pcu and port info key to both is $pcu_id -if( !empty( $pcu_ids ) ) - $PCUs= $api->GetPCUs( $pcu_ids ); +// Thierry : remaining stuff +// (*) events: xxx todo xxx for admins xxx +// should display the latest events relating to that node. +// historically we had to turn this off at some point as GetEvents was getting the session deleted in the DB +// (*) conf_files: xxx todo xxx for admins xxx +//if( !empty( $conf_file_ids ) ) +// $conf_files= $api->GetConfFiles( $conf_file_ids ); //////////////////// display node info @@ -102,129 +99,323 @@ $local_peer= ! $peer_id; // extra privileges to admins, and (pi||tech) on this site -$privileges = plc_is_admin () || ( plc_in_site($site_id) && ( plc_is_pi() || plc_is_tech())); +$admin_privileges=(plc_is_admin () && $local_peer); +$privileges = $admin_privileges || ( plc_in_site($site_id) && ( plc_is_pi() || plc_is_tech())); $tabs=array(); // available actions +$tabs [] = tab_nodes_site($site_id); +$tabs [] = tab_site($site_id); +//$tabs [] = tab_nodes(); + if ( $local_peer && $privileges ) { - $tabs['Update'] = array ('url'=>"/db/nodes/node_actions.php", - 'method'=>'POST', - 'values'=>array('action'=>'prompt-update','node_id'=>$node_id), - 'bubble'=>"Update details of $hostname"); - $tabs['Delete'] = array ('url'=>"/db/nodes/node_actions.php", + $tabs["Add Interface"]=array('url'=>l_interface_add($node_id), + 'bubble'=>"Define new network interface on $hostname"); + $tabs['Delete'] = array ('url'=>l_actions(), 'method'=>'POST', - 'values'=>array('action'=>'delete','node_id'=>$node_id), + 'values'=>array('action'=>'delete-node','node_id'=>$node_id), 'bubble'=>"Delete node $hostname", - 'confirm'=>'Are you sure to delete ' . $hostname. ' ?'); - // xxx subject to roles - $tabs["Add Interface"]=array('url'=>l_interface_add($node_id), - 'bubble'=>"Declare new network interface on $hostname"); - $tabs["Events"]=array_merge(tabs_events(), + 'confirm'=>'Are you sure to delete ' . $hostname); + $tabs["Events"]=array_merge(tablook_event(), array('url'=>l_event("Node","node",$node_id), 'bubble'=>"Events for node $hostname")); - $tabs["Comon"]=array_merge(tabs_comon(), + $tabs["Comon"]=array_merge(tablook_comon(), array('url'=>l_comon("node_id",$node_id), 'bubble'=>"Comon page about node $hostname")); } -$tabs["All nodes"]=l_nodes(); - -plc_tabs($tabs); +plekit_linetabs($tabs); // show gray background on foreign objects : start a
with proper class $peers->block_start ($peer_id); -plc_details_start (); +$toggle = new PlekitToggle ('node',"Details", + array('bubble'=>'Display and modify details for that node', + 'visible'=>get_arg('show_details',true))); +$toggle->start(); + +$details=new PlekitDetails($privileges); +$details->start(); if ( ! $local_peer) { - plc_details_line("Peer",$peers->peer_link($peer_id)); - plc_details_space_line(); + $details->th_td("Peer",$peers->peer_link($peer_id)); + $details->space(); } -plc_details_line("Hostname",$hostname); -plc_details_line("Type",$node_type); -plc_details_line("Model",$model); -plc_details_line("Version",$version); -// no tool to implement this multiple-choice setting yet -// xxx would need at least to use the proper class, like plc_details_class() or something -plc_details_space_line (); -echo "Boot State: "; -if ( ! $local_peer) { - echo $boot_state; +$details->form_start(l_actions(),array("action"=>"update-node", "node_id"=>$node_id, "hostname"=>$hostname)); +// xxx can hostname really be changed like this without breaking the rest, bootcd .. ? +//$details->th_td("Hostname",$hostname,"hostname"); +$details->th_td("Hostname",$hostname); +$details->th_td("Model",$model,"model"); +// reservation ? +if ( $admin_privileges) { + $reservation_value = $details->form->select_html("node_type", + node_type_selectors ($api, $node_type)); +} else { + $reservation_value = node_type_display ($api,$node_type); +} +$details->th_td("Reservation",$reservation_value); + +$details->tr_submit("submit","Update Node"); +$details->form_end(); +if ($privileges) $details->space(); + +$display_reboot_button = FALSE; +//////////////////// +// PCU stuff - not too sure why, but GetPCUs is not exposed to the 'user' role +$display_pcus = ( $local_peer && (plc_is_admin() || plc_is_pi() || plc_is_tech())); +if ($display_pcus) { + $pcu_ids= $node['pcu_ids']; + $ports= $node['ports']; + // avoid 2 API calls : get all site PCUs and then search from there + function search_pcu ($site_pcus,$pcu_id) { + if ($site_pcus) foreach ($site_pcus as $site_pcu) if ($site_pcu['pcu_id']==$pcu_id) return $site_pcu; + return FALSE; + } + $site_pcus = $api->GetPCUs(array('site_id'=>$site_id)); + // not sure what the exact semantics is, but I expect pcu_ids and ports should have same cardinality + if (count ($pcu_ids) != count ($ports)) + $pcu_string = plc_error_html("Unexpected condition: " . count($pcu_ids) . " pcu_ids and " . count($ports) . " ports"); + else if (count($pcu_ids) == 0) + $pcu_string = plc_warning_html("No PCU !"); + else if (count($pcu_ids) == 1) { + $pcu_id=$pcu_ids[0]; + $port=$ports[0]; + $pcu_columns = array('hostname'); + $pcu=search_pcu($site_pcus,$pcu_id); + if ( ! $pcu ) { + $pcu_string = plc_error_html("Cannot find PCU " . $pcu_id); + } else { + // else : regular case - don't set pcu_string + // NOTE: temporarily only offer the reboot_button for DC7x00, DRAC, and HPiLO PCU models + if ( $pcu['model'] == "IntelAMT" || $pcu['model'] == "DRAC" || $pcu['model'] == "HPiLO" ){ + $display_reboot_button = TRUE; + } + } + } else + $pcu_string = plc_warning_html("More than one PCU attached ? "); + + // in the regular case, pcu_string is not set here + + $details->form_start(l_actions(),array("action"=>"attach-pcu","node_id"=>$node_id)); + // prepare selectors + if (! $site_pcus) { + $pcu_update_area = "This site has no PCU - " . href ( l_pcu_add(), "add one here"); + } else { + $pcu_add_link = href (l_pcu_add(),plc_add_icon() . "Add new"); + + // first option in pcus + if ($pcu_ids) + $none_detach = 'Detach'; + else + $none_detach='None'; + $pcu_selectors = array(array('display'=>$none_detach,'value'=>-1)); + // one option per site pcu + foreach ($site_pcus as $site_pcu) { + $selector=array('display'=>$site_pcu['hostname'],'value'=>$site_pcu['pcu_id']); + if ($pcu_id == $site_pcu['pcu_id']) $selector['selected']=true; + $pcu_selectors []= $selector; + } + $pcu_chooser = $details->form()->select_html('pcu_id',$pcu_selectors); + + function port_selector ($i,$port) { + $selector = array ('display'=>'port ' . $i, 'value'=>$i); + if ($i == $port) $selector['selected'] = true; + return $selector; + } + $port_selectors = array () ; + $available_ports =range(1,8); + foreach ($available_ports as $available_port) + $port_selectors []= port_selector ($available_port,$port); + $port_chooser = $details->form()->select_html('port',$port_selectors); + + $pcu_attach_button = + $details->form()->submit_html('attach_pcu',"Attach PCU"); + + $pcu_update_area = $pcu_add_link . "
Or, select existing " . $pcu_chooser . " " . $port_chooser . " " . $pcu_attach_button; + } + + if ($pcu_string) + $pcu_value_area=plc_vertical_table(array($pcu_string,$pcu_update_area)); + else + $pcu_value_area=$pcu_update_area; + + $details->th_td("PCU",$pcu_value_area); + $details->form_end(); + } + +//////////////////// Reboot Node +if ( $display_reboot_button ) +{ + if ( ! empty($_SESSION['messages']) ) { + $msg = $_SESSION['messages']['status'][0]; + } else { + $msg = ""; + } + $body="Hello, + +This message is a template from the 'Report a problem' link on the node details page. + +I've experienced a problem rebooting $hostname with the pcu_id $pcu_id; + + http://".PLC_WWW_HOST."/db/sites/pcu.php?id=$pcu_id + http://".PLC_WWW_HOST."/db/nodes/node.php?id=$node_id\n\n"; + + if ( $msg != "" ) { + $body .= "The last time I tried, it returned:\n $msg\n\n"; + } + $body .= "And, this is what I've tried, which leads me to believe that there is a bug on your side:"; + + $url=rawurlencode($body); + $email = ">Report a problem"; + + // NOTE: not sure how to make the buttons display side-by-side... + $reboot = $details->form_start_html(l_actions(),array("action"=>"reboot-node-with-pcu", + "node_id"=>$node_id, "hostname"=>$hostname, "test"=>FALSE)); + $reboot .= $email . $details->form->submit_html("submit","Reboot Node"); + $reboot .= $details->form_end_html(); + + $reboot .= $details->form_start_html(l_actions(),array("action"=>"reboot-node-with-pcu", + "node_id"=>$node_id, "hostname"=>$hostname, "test"=>TRUE)); + $reboot .= $details->form->submit_html("submit","Test PCU"); + $reboot .= $details->form_end_html(); + + $details->tr($reboot, "right"); + +} +$details->space(); + +//////////////////// type & version +$details->th_td("Version",$version); +// let's use plc_objects +$Node = new Node($node); +$details->th_td("Date created",$Node->dateCreated()); +$details->th_td("Last update",$Node->lastUpdated()); +$details->th_td("Last contact",$Node->lastContact()); + +// boot area +$details->space (); +$stale_text = $Node->stale() ? ("... (more than " . Node::stale_text() . " ago)") : "" ; +$details->th_td ("Observed Boot state", $run_level . $stale_text); +if ( ! ($local_peer && $privileges)) { + // just display it + $boot_value=$boot_state; } else { - echo "
\n"; - echo "\n"; - echo "\n"; - echo "
"; + $boot_value .= $boot_form->select_html("boot_state",$selectors,array('autosubmit'=>true)); + $boot_value .= $boot_form->end_html(); } -echo "\n"; +$details->th_td ("Preferred Boot state",$boot_value); // same here for the download area if ( $local_peer && $privileges) { - echo "Download "; - echo "
\n"; - echo "\n"; - echo "
"; - echo "\n"; + $download_value=""; + $download_form = new PlekitForm (l_actions_download(),array("node_id"=>$node_id)); + $download_value .= $download_form->start_html(); + $selectors = array( + array("display"=>"-- All in one images --","disabled"=>true), + array("value"=>"download-node-iso","display"=>"Download ISO image for $hostname"), + array("value"=>"download-node-usb","display"=>"Download USB image for $hostname"), + array("value"=>"download-node-usb-partition", "display"=>"Download partitioned, USB image for $hostname"), + // array("display"=>"-- Floppy + generic image --","disabled"=>true), + // array("value"=>"download-node-floppy","display"=>"Download Floppy file for $hostname"), + // array("value"=>"download-generic-iso","display"=>"Download generic ISO image (requires floppy)"), + // array("value"=>"download-generic-usb","display"=>"Download generic USB image (requires floppy)"), + ); + $download_value .= $download_form->select_html("action",$selectors, + array('label'=>"Download mode",'autosubmit'=>true)); + $download_value .= $download_form->end_html(); + $details->th_td ("Download",$download_value); } // site info and all site nodes -plc_details_space_line (); -plc_details_line("Site",l_site_t($site_id,$site_name)); +$details->space (); +$details->th_td("Site",l_site_t($site_id,$site_name)); // build list of node links $nodes_area=array(); foreach ($site_node_hash as $hash_node_id => $hash_hostname) { $nodes_area []= l_node_t($hash_node_id,$hash_hostname); } -plc_details_line_list ("All site nodes",$nodes_area); - -plc_details_end (); +$details->th_tds ("All site nodes",$nodes_area); + +$details->end (); +$toggle->end(); + +$form=new PlekitForm (l_actions(), array('node_id'=>$node_id)); +$form->start(); + +//////////////////////////////////////////////////////////// slivers +{ + $toggle=new PlekitToggle ('slices',count_english_warning($slices,'sliver'), + array('bubble'=>'Review slices running on that node', + 'visible'=>get_arg('show_slices',false))); + $toggle->start(); + if ( ! $slices ) { + plc_warning ("This node is not associated to any slice"); + } else { + $headers=array(); + $headers['Peer']="string"; + $headers['Slice Name']="string"; + $headers['Sliver']="string"; + $reasonable_page=10; + $table_options = array('notes_area'=>false,"search_width"=>10,'pagesize'=>$reasonable_page); + if (count ($slices) <= $reasonable_page) { + $table_options['search_area']=false; + $table_options['pagesize_area']=false; + } + $table=new PlekitTable("node_slices",$headers,1,$table_options); + $table->start(); -plc_form_start(l_actions(), array('node_id'=>$node_id)); + foreach ($slices as $slice) { + $table->row_start(); + $peers->cell ($table,$slice['peer_id']); + $table->cell (l_slice_t ($slice['slice_id'],$slice['name'])); + $table->cell (l_sliver_t ($node_id,$slice['slice_id'],'sliver tags')); + $table->row_end(); + } + $table->end(); + } + $toggle->end(); +} //////////////////////////////////////////////////////////// Tags -// get tags +// tags section if ( $local_peer ) { $tags=$api->GetNodeTags (array('node_id'=>$node_id)); function get_tagname ($tag) { return $tag['tagname'];} + // xxx looks like tech-only see an error here, + // might be that GetNodeTags is not accessible or something $tagnames = array_map ("get_tagname",$tags); $nodegroups_hash=plc_nodegroup_global_hash($api,$tagnames); - plc_section("Tags"); + $toggle = new PlekitToggle ('tags',count_english($tags,'tag'), + array('bubble'=>'Inspect and set tags on that node', + 'visible'=>get_arg('show_tags',false))); + $toggle->start(); + $headers=array("Name"=>"string", "Value"=>"string", "Nodegroup"=>"string", - "Remove"=>"string", ); + if (plc_is_admin()) $headers[plc_delete_icon()]="none"; $table_options=array("notes_area"=>false,"pagesize_area"=>false,"search_width"=>10); - $table=new PlcTable("node_tags",$headers,0,$table_options); + $table=new PlekitTable("node_tags",$headers,0,$table_options); $table->start(); if ($tags) foreach ($tags as $tag) { // does this match a nodegroup ? @@ -233,10 +424,11 @@ if ( $local_peer ) { $nodegroup=$nodegroups_hash[$nodegroup_key]; if ($nodegroup) $nodegroup_name=l_nodegroup_t($nodegroup['nodegroup_id'],$nodegroup['groupname']); $table->row_start(); - $table->cell($tag['tagname']); + $table->cell(l_tag_obj($tag)); $table->cell($tag['value']); $table->cell($nodegroup_name); - $table->cell (plc_form_checkbox_text('node_tag_ids[]',$tag['node_tag_id'])); + // the remove checkbox + if (plc_is_admin()) $table->cell ($form->checkbox_html('node_tag_ids[]',$tag['node_tag_id'])); $table->row_end(); } @@ -245,132 +437,110 @@ if ( $local_peer ) { // remove tag $table->row_start(); - $table->cell(plc_form_submit_text("remove-node-tags","Remove Tags"), + $table->cell($form->submit_html("delete-node-tags","Remove Tags"), // use the whole columns and right adjust - $table->columns(), "right"); + array('hfill'=>true,'align'=>'right')); $table->row_end(); // set tag area $table->row_start(); // get list of tag names in the node/* category - $all_tags= $api->GetTagTypes( array ("category"=>"node*"), array("tagname","tag_type_id")); + $all_tags= $api->GetTagTypes( array ("category"=>"node*","-SORT"=>"tagname"), array("tagname","tag_type_id")); // xxx cannot use onchange=submit() - would need to somehow pass action name function tag_selector ($tag) { return array("display"=>$tag['tagname'],"value"=>$tag['tag_type_id']); } $selector=array_map("tag_selector",$all_tags); - $table->cell(plc_form_select_text("tag_type_id",$selector,"Choose")); - $table->cell(plc_form_text_text("value","",8)); - $table->cell(plc_form_submit_text("set-tag-on-node","Set Tag"),2,"left"); + $table->cell($form->select_html("tag_type_id",$selector,array('label'=>"Choose"))); + $table->cell($form->text_html("value","",array('width'=>8))); + $table->cell($form->submit_html("set-tag-on-node","Set Tag"),array('columns'=>2,'align'=>'left')); $table->row_end(); } $table->end(); - } - -//////////////////////////////////////////////////////////// slices -// display slices - -plc_section ("Slices"); -if ( ! $slices ) { - plc_warning ("This node is not associated to any slice"); - } else { - $headers=array(); - $headers['Peer']="string"; - $headers['Name']="string"; - $headers['Slivers']="string"; - $reasonable_page=10; - $table_options = array('notes_area'=>false,"search_width"=>10,'pagesize'=>$reasonable_page); - if (count ($slices) <= $reasonable_page) { - $table_options['search_area']=false; - $table_options['pagesize_area']=false; - } - $table=new PlcTable("node_slices",$headers,1,$table_options); - $table->start(); - - foreach ($slices as $slice) { - $table->row_start(); - $table->cell ($peers->shortname($peer_id)); - $table->cell (l_slice_t ($slice['slice_id'],$slice['name'])); - $table->cell (l_sliver_t ($node_id,$slice['slice_id'],'view')); - $table->row_end(); - } - $table->end(); - } + $toggle->end(); +} //////////////////////////////////////////////////////////// interfaces if ( $local_peer ) { - - plc_section ("Interfaces"); + $toggle=new PlekitToggle ('interfaces',count_english_warning($interfaces,'interface'), + array('bubble'=>'Inspect and tune interfaces on that node', + 'visible'=>get_arg('show_interfaces',false))); + $toggle->start(); // display interfaces if( ! $interfaces ) { echo '

'; - plc_warning_text("This node has no interface"); + plc_warning_html("This node has no interface"); echo "Please add an interface to make this a usable PLC node.

\n"; - } else { + } // else { // show this unconditionnally as otherwise there's no mean to create one.. + + // display a hostname column iff at least one interface has a hostname + $need_hostname=false; + if ($interfaces) foreach ($interfaces as $interface) if ($interface['hostname']) $need_hostname=true; + $headers=array(); - if ( $privileges ) { - // a single symbol, marking 'p' for primary and a delete button for non-primary - $headers[' ']='string'; - } - - $headers["IP"]="IPAddress"; + + $sort_column=0; + if (plc_is_admin()) { $headers['I']='int'; $sort_column +=1;} + $headers["IP"]="sortIPAddress"; + if ($need_hostname) $headers['hostname']='string'; $headers["Method"]="string"; $headers["Type"]="string"; $headers["MAC"]="string"; - $headers["bw limit"]="FileSize"; + $headers["bw limit"]="sortBandwidth"; + $headers["tags"]=array('type'=>'int', + 'title'=>"number of tags set on interface"); + // a single symbol, marking 'p' for primary and a delete button for non-primary + if ( $privileges ) $headers[plc_delete_icon()]='string'; $table_options=array('search_area'=>false,"pagesize_area"=>false,'notes_area'=>false); - $table=new PlcTable("node_interfaces",$headers,2,$table_options); + $table=new PlekitTable("node_interfaces",$headers,$sort_column,$table_options); $table->start(); - foreach ( $interfaces as $interface ) { + if ($interfaces) foreach ( $interfaces as $interface ) { $interface_id= $interface['interface_id']; $interface_ip= $interface['ip']; - $interface_broad= $interface['broadcast']; - $interface_primary= $interface['is_primary']; - $interface_network= $interface['network']; - $interface_dns1= $interface['dns1']; - $interface_dns2= $interface['dns2']; - $interface_hostname= $interface['hostname']; - $interface_netmaks= $interface['netmask']; - $interface_gatewary= $interface['gateway']; - $interface_mac= $interface['mac']; - $interface_bwlimit= $interface['bwlimit']; - $interface_type= $interface['type']; - $interface_method= $interface['method']; $table->row_start(); + if (plc_is_admin()) $table->cell(l_interface_t($interface_id,$interface_id)); + $table->cell(l_interface_t($interface_id,$interface_ip)); + if ($need_hostname) $table->cell($interface['hostname']); + $table->cell($interface['method']); + $table->cell($interface['type']); + $table->cell($interface['mac']); + $table->cell(pretty_bandwidth($interface['bwlimit'])); + $table->cell(href(l_interface_tags($interface_id), + count($interface['interface_tag_ids']))); if ( $privileges ) { - if (!$interface_primary) { - // xxx - $table->cell (plc_delete_link_button ('interfaces.php?id=' . $interface_id . '&delete=1&submitted=1', - '\\nInterface ' . $interface_ip)); + if ($interface['is_primary']) { + $table->cell(plc_bubble("p","Cannot delete a primary interface")); } else { - $table->cell('p'); + $table->cell ($form->checkbox_html('interface_ids[]',$interface_id)); } } - $table->cell(l_interface_t($interface_id,$interface_ip)); - $table->cell($interface_method); - $table->cell($interface_type); - $table->cell($interface_mac); - $table->cell($interface_bwlimit); $table->row_end(); } if ($privileges) { $table->tfoot_start(); $table->row_start(); - $table->cell(plc_form_simple_button(l_interface_add($node_id),"Add interface","GET"), - $table->columns(),"right"); + // we should have 6 cols, use 3 for the left (new) and the rest for the right (remove) + //$add_button=new PlekitFormButton (l_interface_add($node_id),"add","Add Interface","GET"); + //$table->cell($add_button->html(),array('columns'=> 3,'align'=>'left')); + $table->cell($form->submit_html("new-interface","Add Interface"), + array('columns'=> 3,'align'=>'left')); + $table->cell($form->submit_html("delete-interfaces","Remove Interfaces"), + array('columns'=>$table->columns()-3,'align'=>'right')); $table->row_end(); } $table->end(); - } + // } + $toggle->end(); } -plc_form_end(); +$form->end(); //////////////////////////////////////////////////////////// $peers->block_end($peer_id); +//plekit_linetabs ($tabs,"bottom"); // Print footer include 'plc_footer.php';