X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab%2Fnodes%2Fnode.php;h=220f508c2877be52eaf313aac887e83b80da6d30;hb=75319539bcac22d71324c0e007b13437b313b080;hp=4d8ccb5988da5e7709cc8794d66627d6f3b25e69;hpb=f20e546535306a5fe875d2b8c5585cec0e22db46;p=plewww.git

diff --git a/planetlab/nodes/node.php b/planetlab/nodes/node.php
index 4d8ccb5..220f508 100644
--- a/planetlab/nodes/node.php
+++ b/planetlab/nodes/node.php
@@ -27,8 +27,11 @@ $node_id=intval($_GET['id']);
 if ( ! $node_id ) { plc_error('Malformed URL - id not set'); return; }
 
 ////////////////////
-// Get all columns as we focus on only one entry
-$nodes= $api->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");
@@ -38,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'];
@@ -99,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
@@ -131,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);
@@ -145,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();
@@ -276,8 +292,7 @@ I've experienced a problem rebooting $hostname with the pcu_id $pcu_id;
 $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());
@@ -297,7 +312,8 @@ if ( ! ($local_peer && $privileges)) {
 					       "action"=>"node-boot-state"));
   $boot_value .= $boot_form->start_html();
   $states = array( 'boot'=>'Boot', 'safeboot'=>'SafeBoot', 
-		   'disabled' => 'Disabled', 'reinstall'=>'Reinstall');
+		   'disabled' => 'Disabled', 'reinstall'=>'Reinstall',
+		   'upgrade' => 'Upgrade');
   $selectors=array();
   foreach ($states as $dbname=>$displayname) { 
     $selector=array("display"=>$displayname, "value"=>$dbname);
@@ -353,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");
@@ -396,7 +412,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",
@@ -454,7 +470,7 @@ 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 ) {