/[projects]/misc/xenconsole/ajaxdata.php
ViewVC logotype

Diff of /misc/xenconsole/ajaxdata.php

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2028 by torben, Fri Jul 19 12:11:36 2013 UTC revision 2029 by torben, Tue Jul 23 19:00:14 2013 UTC
# Line 108  foreach($vms_array as $vmref => $vm) { Line 108  foreach($vms_array as $vmref => $vm) {
108          $maxmem = 0;          $maxmem = 0;
109          $guestversion = "";          $guestversion = "";
110    
111          if ( $vm["power_state"] == "Running" ) {          if ( $vm["power_state"] == "Running" ) {
112                  if ($vm["guest_metrics"] != "OpaqueRef:NULL") {//guest tools installed                  if ($vm["guest_metrics"] != "OpaqueRef:NULL") {//guest tools installed
113                          //$guest_metrics = $xenserver->VM_guest_metrics__get_record( $vm["guest_metrics"] );                          //$guest_metrics = $xenserver->VM_guest_metrics__get_record( $vm["guest_metrics"] );
114                          $guest_metrics = $guestmetricmap[  $vm["guest_metrics"] ];                          $guest_metrics = $guestmetricmap[  $vm["guest_metrics"] ];
115                          $network = get_network_string($guest_metrics["networks"])  ;                          $network = get_network_string($guest_metrics["networks"])  ;
116                          $tmpos =  explode('|', $guest_metrics["os_version"]["name"]);                          $tmpos =  explode('|', $guest_metrics["os_version"]["name"]);
117                          $os = $tmpos[0];                          $os = $tmpos[0];
118                          $guestversion = $guest_metrics["PV_drivers_version"]["major"] . "." . $guest_metrics["PV_drivers_version"]["minor"] . "." .  $guest_metrics["PV_drivers_version"]["micro"];                          $guestversion = $guest_metrics["PV_drivers_version"]["major"] . "." . $guest_metrics["PV_drivers_version"]["minor"] . "." .  $guest_metrics["PV_drivers_version"]["micro"];
# Line 120  foreach($vms_array as $vmref => $vm) { Line 120  foreach($vms_array as $vmref => $vm) {
120                          $maxmem = round($xenserver->VM__query_data_source($vmref, "memory") / (1024*1024) );                          $maxmem = round($xenserver->VM__query_data_source($vmref, "memory") / (1024*1024) );
121                          $free = round( $xenserver->VM__query_data_source($vmref, "memory_internal_free") / 1024 );                                $free = round( $xenserver->VM__query_data_source($vmref, "memory_internal_free") / 1024 );      
122                          $curmem = $maxmem - $free;                          $curmem = $maxmem - $free;
123                    } else {                        
124                            $maxmem = $vm["memory_static_max"] / (1024*1024);
125                  }                  }
126    
127                  $cpusum = 0.0;                  $cpusum = 0.0;
128                  for ($i=0; $i<$cpus; $i++) {                  for ($i=0; $i<$cpus; $i++) {
129                          $cpusum += $xenserver->VM__query_data_source($vmref, "cpu" . $i);                          $cpusum += $xenserver->VM__query_data_source($vmref, "cpu" . $i);
# Line 137  foreach($vms_array as $vmref => $vm) { Line 140  foreach($vms_array as $vmref => $vm) {
140                          }                          }
141                  }                  }
142    
143          } else {      } else {
144                  $maxmem = $vm["memory_static_max"] / (1024*1024);                  $maxmem = $vm["memory_static_max"] / (1024*1024);
145          }          }
146    
Legend:
Removed from v.2028  
changed lines
  Added in v.2029
  ViewVC Help
Powered by ViewVC 1.1.20