X-Git-Url: http://git.onelab.eu/?p=plewww.git;a=blobdiff_plain;f=planetlab%2Fnodes%2Fnode.php;h=f45712120636b1a05be6b156b7bc68a90d269ffe;hp=338983221097085fd7ef2f5f6ff85957556431bd;hb=15c340da9dcec704b94592a1a7cb27feb2787279;hpb=41433e5efc50187b3dab95b4aefbe855eafad6d7 diff --git a/planetlab/nodes/node.php b/planetlab/nodes/node.php index 3389832..f457121 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']; @@ -101,7 +103,8 @@ $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 @@ -133,7 +136,7 @@ $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); @@ -147,7 +150,18 @@ $details->form_start(l_actions(),array("action"=>"update-node", "node_id"=>$node // xxx can hostname really be changed like this without breaking the rest, bootcd .. ? //$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(); @@ -256,20 +270,29 @@ I've experienced a problem rebooting $hostname with the pcu_id $pcu_id; if ( $msg != "" ) { $body .= "The last time I tried, it returned:\n $msg\n\n"; } - $body .= "And, this what I've tried, which leads me to believe that there is a bug on your side:"; + $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"; - $details->form_start(l_actions(),array("action"=>"reboot-node-with-pcu", "node_id"=>$node_id, "hostname"=>$hostname)); - print $details->tr_html($email . $details->form->submit_html("submit","Reboot Node"), "right"); - $details->form_end(); + // 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()); @@ -345,7 +368,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"); @@ -388,7 +411,7 @@ if ( $local_peer ) { $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", @@ -428,7 +451,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); @@ -446,14 +469,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; @@ -478,7 +501,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']; @@ -514,7 +537,7 @@ if ( $local_peer ) { $table->row_end(); } $table->end(); - } + // } $toggle->end(); }