X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab%2Fnodes%2Fnode.php;h=5236503f410c38b744612eb8cfdb768117bc0860;hb=0a4d3b62dea80c253ca2d9611d865a62976a72aa;hp=341e525ef3db20049e86f87c990bdcadac75b732;hpb=5f2f81a03fbecad477f4e515a725553c8f578d41;p=plewww.git

diff --git a/planetlab/nodes/node.php b/planetlab/nodes/node.php
index 341e525..5236503 100644
--- a/planetlab/nodes/node.php
+++ b/planetlab/nodes/node.php
@@ -143,7 +143,7 @@ if ( ! $local_peer) {
   $details->space();
  }
 
-$details->form_start(l_actions(),array("action"=>"update-node", "node_id"=>$node_id));
+$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); 
@@ -152,8 +152,9 @@ $details->tr_submit("submit","Update Node");
 $details->form_end();
 if ($privileges) $details->space();
 
+////////////////////
 // PCU stuff - not too sure why, but GetPCUs is not exposed to the 'user' role
-$display_pcus = (plc_is_admin() || plc_is_pi() || plc_is_tech());
+$display_pcus = ( $local_peer && (plc_is_admin() || plc_is_pi() || plc_is_tech()));
 if ($display_pcus) {
   $pcu_ids= $node['pcu_ids'];
   $ports= $node['ports'];
@@ -165,7 +166,7 @@ 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)) 
-    $pcu_string = "Unexpected condition: " . count($pcu_ids) . " pcu_ids and " . count($ports) . " 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) {
@@ -174,21 +175,27 @@ if ($display_pcus) {
     $pcu_columns = array('hostname');
     $pcu=search_pcu($site_pcus,$pcu_id);
     if ( ! $pcu ) 
-      $pcu_string = "Cannot find PCU " . $pcu_id;
-    else
-      $pcu_string = $pcu['hostname'] . " on port " . $port;
+      $pcu_string = plc_error_html("Cannot find PCU " . $pcu_id);
+    // else : regular case - don't set pcu_string
   } 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());
-
-    $pcu_selectors = array(array('display'=>'None','value'=>-1));
+    $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;
@@ -210,21 +217,27 @@ 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 . "<br>Or, select existing  " . $pcu_chooser . " " . $port_chooser . " " . $pcu_attach_button;
   }
 
-  $details->th_td("PCU",plc_vertical_table(array($pcu_string,$pcu_update_area)));
+  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();
   $details->space();
  }
 
+//////////////////// type & version
 $details->th_td("Type",$node_type);
 $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 contact",$Node->lastContact());
 $details->th_td("Last update",$Node->lastUpdated());
+$details->th_td("Last contact",$Node->lastContact());
 
 // boot area
 $details->space ();
@@ -261,10 +274,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();
@@ -403,44 +417,42 @@ if ( $local_peer ) {
     plc_warning_html("This node has no interface");
     echo "Please add an interface to make this a usable PLC node.</p>\n";
   } else {
+
+    // 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();
 
-    $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";
     // 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,2,$table_options);
+    $table=new PlekitTable("node_interfaces",$headers,$sort_column,$table_options);
     $table->start();
 	
     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));
-      $table->cell($interface_method);
-      $table->cell($interface_type);
-      $table->cell($interface_mac);
-      $table->cell($interface_bwlimit);
+      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']));
       if ( $privileges ) {
-	if ($interface_primary) {
+	if ($interface['is_primary']) {
 	  $table->cell(plc_bubble("p","Cannot delete a primary interface"));
 	} else {
 	  $table->cell ($form->checkbox_html('interface_ids[]',$interface_id));
@@ -451,9 +463,11 @@ if ( $local_peer ) {
     if ($privileges) {
       $table->tfoot_start();
       $table->row_start();
-      $add_button=new PlekitFormButton (l_interface_add($node_id),"add","Add Interface","GET");
       // we should have 6 cols, use 3 for the left (new) and the rest for the right (remove)
-      $table->cell($add_button->html(),array('columns'=> 3,'align'=>'left'));
+      //$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();