X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab%2Fnodes%2Fnode.php;h=61c9db4a1e0869692e21cbb1293158a95f5b3ef4;hb=HEAD;hp=5236503f410c38b744612eb8cfdb768117bc0860;hpb=c5fc97fe7c431211347d2e3305f050a567627fea;p=plewww.git diff --git a/planetlab/nodes/node.php b/planetlab/nodes/node.php index 5236503..25b5e7a 100644 --- a/planetlab/nodes/node.php +++ b/planetlab/nodes/node.php @@ -1,7 +1,5 @@ GetNodes( array($node_id)); +// Need to mention columns explicitly as we want hrn which is a tag +$columns=array ('hostname','boot_state','run_level','site_id','model','node_type','version', + 'slice_ids','conf_file_ids','interface_ids','nodegroup_ids','peer_id', + 'pcu_ids','ports','hrn'); +$nodes= $api->GetNodes( array($node_id),$columns); if (empty($nodes)) { drupal_set_message ("Node " . $node_id . " not found"); @@ -40,12 +41,13 @@ if (empty($nodes)) { $node=$nodes[0]; // node info $hostname= $node['hostname']; +$hrn=$node['hrn']; $boot_state= $node['boot_state']; $run_level = $node['run_level']; $site_id= $node['site_id']; $model= $node['model']; +$node_type= $node['node_type']; $version= $node['version']; -$node_type = $node['node_type']; // arrays of ids of node info $slice_ids= $node['slice_ids']; @@ -68,12 +70,12 @@ $site_node_hash=array(); if( !empty( $site_node_ids ) ) { // get site node info basics $site_nodes= $api->GetNodes( $site_node_ids ); - + foreach( $site_nodes as $site_node ) { $site_node_hash[$site_node['node_id']]= $site_node['hostname']; } } - + // gets slice info for each slice if( !empty( $slice_ids ) ) $slices= $api->GetSlices( $slice_ids, array( "slice_id", "name" , "peer_id" ) ); @@ -87,7 +89,7 @@ if( !empty( $nodegroup_ids ) ) $nodegroups= $api->GetNodeGroups( $nodegroup_ids, array("groupname","tag_type_id","value")); // Thierry : remaining stuff -// (*) events: xxx todo xxx for admins xxx +// (*) 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 @@ -99,10 +101,11 @@ if( !empty( $nodegroup_ids ) ) drupal_set_title("Details for node " . $hostname); $local_peer= ! $peer_id; - + // extra privileges to admins, and (pi||tech) on this site -$privileges = (plc_is_admin () && $local_peer) || ( 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); @@ -110,7 +113,7 @@ $tabs [] = tab_site($site_id); //$tabs [] = tab_nodes(); if ( $local_peer && $privileges ) { - + $tabs["Add Interface"]=array('url'=>l_interface_add($node_id), 'bubble'=>"Define new network interface on $hostname"); $tabs['Delete'] = array ('url'=>l_actions(), @@ -130,10 +133,10 @@ plekit_linetabs($tabs); // show gray background on foreign objects : start a
with proper class $peers->block_start ($peer_id); - + $toggle = new PlekitToggle ('node',"Details", array('bubble'=>'Display and modify details for that node', - 'visible'=>get_arg('show_details',true))); + 'visible'=>get_arg('show_details'))); $toggle->start(); $details=new PlekitDetails($privileges); @@ -145,13 +148,25 @@ if ( ! $local_peer) { $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("Hostname",$hostname,"hostname"); +$details->th_td("Hostname",$hostname); +if ($hrn) $details->th_td("SFA hrn",$hrn); +else $details->tr("SFA hrn not set","center"); $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())); @@ -165,23 +180,29 @@ if ($display_pcus) { } $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)) + 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) + 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 ) + if ( ! $pcu ) { $pcu_string = plc_error_html("Cannot find PCU " . $pcu_id); - // else : regular case - don't set pcu_string - } else + } 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) { @@ -190,9 +211,9 @@ if ($display_pcus) { $pcu_add_link = href (l_pcu_add(),plc_add_icon() . "Add new"); // first option in pcus - if ($pcu_ids) + if ($pcu_ids) $none_detach = 'Detach'; - else + else $none_detach='None'; $pcu_selectors = array(array('display'=>$none_detach,'value'=>-1)); // one option per site pcu @@ -203,36 +224,75 @@ if ($display_pcus) { } $pcu_chooser = $details->form()->select_html('pcu_id',$pcu_selectors); - function port_selector ($i,$port) { - $selector = array ('display'=>'port ' . $i, 'value'=>$i); + 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) + 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 = + $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) + if ($pcu_string) $pcu_value_area=plc_vertical_table(array($pcu_string,$pcu_update_area)); - else + else $pcu_value_area=$pcu_update_area; - + $details->th_td("PCU",$pcu_value_area); $details->form_end(); - $details->space(); } +//////////////////// 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("Type",$node_type); -$details->th_td("Version",$version); +$details->th_td("CD Version",$version); // let's use plc_objects $Node = new Node($node); $details->th_td("Date created",$Node->dateCreated()); @@ -241,7 +301,8 @@ $details->th_td("Last contact",$Node->lastContact()); // boot area $details->space (); -$details->th_td ("Observed Boot state",$run_level . ( $Node->stale() ? " -- stale value" : "" )); +$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; @@ -250,10 +311,11 @@ if ( ! ($local_peer && $privileges)) { $boot_form = new PlekitForm (l_actions(), array("node_id"=>$node_id, "action"=>"node-boot-state")); $boot_value .= $boot_form->start_html(); - $states = array( 'boot'=>'Boot', 'safeboot'=>'SafeBoot', - 'disabled' => 'Disabled', 'reinstall'=>'Reinstall'); + $states = array( 'boot'=>'Boot', 'safeboot'=>'SafeBoot', + 'disabled' => 'Disabled', 'reinstall'=>'Reinstall', + 'upgrade' => 'Upgrade'); $selectors=array(); - foreach ($states as $dbname=>$displayname) { + foreach ($states as $dbname=>$displayname) { $selector=array("display"=>$displayname, "value"=>$dbname); if ($dbname == $boot_state) $selector['selected']=true; $selectors []= $selector; @@ -269,7 +331,7 @@ if ( $local_peer && $privileges) { $download_value=""; $download_form = new PlekitForm (l_actions_download(),array("node_id"=>$node_id)); $download_value .= $download_form->start_html(); - $selectors = array( + $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"), @@ -289,7 +351,7 @@ if ( $local_peer && $privileges) { // site info and all site nodes $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) { @@ -307,7 +369,7 @@ $form->start(); { $toggle=new PlekitToggle ('slices',count_english_warning($slices,'sliver'), array('bubble'=>'Review slices running on that node', - 'visible'=>get_arg('show_slices',false))); + 'visible'=>get_arg('show_slices'))); $toggle->start(); if ( ! $slices ) { plc_warning ("This node is not associated to any slice"); @@ -329,7 +391,6 @@ $form->start(); $table->row_start(); $peers->cell ($table,$slice['peer_id']); $table->cell (l_slice_t ($slice['slice_id'],$slice['name'])); - # xxx l_sliver not implemented yet - what should we show exactly ? $table->cell (l_sliver_t ($node_id,$slice['slice_id'],'sliver tags')); $table->row_end(); } @@ -341,17 +402,17 @@ $form->start(); //////////////////////////////////////////////////////////// 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, + // 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); - - $toggle = new PlekitToggle ('tags',count_english_warning($tags,'tag'), + + $toggle = new PlekitToggle ('tags',count_english($tags,'tag'), array('bubble'=>'Inspect and set tags on that node', - 'visible'=>get_arg('show_tags',false))); + 'visible'=>get_arg('show_tags'))); $toggle->start(); $headers=array("Name"=>"string", @@ -359,7 +420,7 @@ if ( $local_peer ) { "Nodegroup"=>"string", ); if (plc_is_admin()) $headers[plc_delete_icon()]="none"; - + $table_options=array("notes_area"=>false,"pagesize_area"=>false,"search_width"=>10); $table=new PlekitTable("node_tags",$headers,0,$table_options); $table->start(); @@ -377,11 +438,11 @@ if ( $local_peer ) { if (plc_is_admin()) $table->cell ($form->checkbox_html('node_tag_ids[]',$tag['node_tag_id'])); $table->row_end(); } - + if ($privileges) { $table->tfoot_start(); - // remove tag + // remove tag $table->row_start(); $table->cell($form->submit_html("delete-node-tags","Remove Tags"), // use the whole columns and right adjust @@ -390,9 +451,9 @@ if ( $local_peer ) { // 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")); - // xxx cannot use onchange=submit() - would need to somehow pass action name + // get list of tag names in the node/* category + $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($form->select_html("tag_type_id",$selector,array('label'=>"Choose"))); @@ -400,7 +461,7 @@ if ( $local_peer ) { $table->cell($form->submit_html("set-tag-on-node","Set Tag"),array('columns'=>2,'align'=>'left')); $table->row_end(); } - + $table->end(); $toggle->end(); } @@ -409,14 +470,14 @@ if ( $local_peer ) { if ( $local_peer ) { $toggle=new PlekitToggle ('interfaces',count_english_warning($interfaces,'interface'), array('bubble'=>'Inspect and tune interfaces on that node', - 'visible'=>get_arg('show_interfaces',false))); + 'visible'=>get_arg('show_interfaces'))); $toggle->start(); // display interfaces if( ! $interfaces ) { echo '

'; 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; @@ -432,14 +493,16 @@ if ( $local_peer ) { $headers["Type"]="string"; $headers["MAC"]="string"; $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 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']; @@ -451,6 +514,8 @@ if ( $local_peer ) { $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['is_primary']) { $table->cell(plc_bubble("p","Cannot delete a primary interface")); @@ -466,14 +531,14 @@ if ( $local_peer ) { // 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"), + $table->cell($form->submit_html("new-interface","Add Interface"), array('columns'=> 3,'align'=>'left')); - $table->cell($form->submit_html("delete-interfaces","Remove Interfaces"), + $table->cell($form->submit_html("delete-interfaces","Remove Interfaces"), array('columns'=>$table->columns()-3,'align'=>'right')); $table->row_end(); } $table->end(); - } + // } $toggle->end(); }