X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab%2Fnodes%2Fnode.php;h=52dfddc909d098cac3862beaeed219d112413a7d;hb=1ce86fd37ce8da9b475847a59394c0241a8dbbff;hp=8f1f25f7359e057284646d2b554ead24dcbf665d;hpb=784cfe2a92ff21e58b773b6895e6ea4b82a0c646;p=plewww.git diff --git a/planetlab/nodes/node.php b/planetlab/nodes/node.php index 8f1f25f..52dfddc 100644 --- a/planetlab/nodes/node.php +++ b/planetlab/nodes/node.php @@ -1,7 +1,5 @@ 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); @@ -148,10 +147,20 @@ $details->form_start(l_actions(),array("action"=>"update-node", "node_id"=>$node //$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())); @@ -174,9 +183,15 @@ if ($display_pcus) { $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 : 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 ? "); @@ -187,7 +202,7 @@ if ($display_pcus) { 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()); + $pcu_add_link = href (l_pcu_add(),plc_add_icon() . "Add new"); // first option in pcus if ($pcu_ids) @@ -217,7 +232,7 @@ if ($display_pcus) { $pcu_attach_button = $details->form()->submit_html('attach_pcu',"Attach PCU"); - $pcu_update_area = $pcu_add_link . " " . $pcu_chooser . " " . $port_chooser . " " . $pcu_attach_button; + $pcu_update_area = $pcu_add_link . "
Or, select existing " . $pcu_chooser . " " . $port_chooser . " " . $pcu_attach_button; } if ($pcu_string) @@ -227,11 +242,50 @@ if ($display_pcus) { $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); // let's use plc_objects $Node = new Node($node); @@ -241,7 +295,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; @@ -274,10 +329,11 @@ if ( $local_peer && $privileges) { 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)")); + // 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(); @@ -306,7 +362,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"); @@ -328,7 +384,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(); } @@ -348,9 +403,9 @@ if ( $local_peer ) { $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", @@ -390,7 +445,7 @@ 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")); + $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); @@ -408,14 +463,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; @@ -431,6 +486,8 @@ 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'; @@ -438,7 +495,7 @@ if ( $local_peer ) { $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']; @@ -450,6 +507,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")); @@ -472,7 +531,7 @@ if ( $local_peer ) { $table->row_end(); } $table->end(); - } + // } $toggle->end(); }