From fb27c07c86f418229f67f5bdb384a9621a563fdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Constantino=20V=C3=A1zquez=20Blanco?= Date: Thu, 17 Sep 2009 12:58:37 +0000 Subject: [PATCH] Better state handling in VMware drivers git-svn-id: http://svn.opennebula.org/one/trunk@792 3034c82b-c49b-4eb3-8279-a7acafdc01c0 --- src/vmm_mad/vmware/OneVmmVmware.java | 40 ++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/src/vmm_mad/vmware/OneVmmVmware.java b/src/vmm_mad/vmware/OneVmmVmware.java index af1a9784aa..57bd8f95a6 100644 --- a/src/vmm_mad/vmware/OneVmmVmware.java +++ b/src/vmm_mad/vmware/OneVmmVmware.java @@ -605,20 +605,38 @@ class OneVmmVmware extends Thread { throw new Exception(); } - - String vmCPUMhz = - gPVM.getObjectProperty("summary.quickStats.overallCpuUsage").toString(); - String vmMEMMb = - gPVM.getObjectProperty("summary.quickStats.guestMemoryUsage").toString(); + String powerState = + gPVM.getObjectProperty("runtime.powerState").toString(); + + if (powerState.equals("poweredOn")) + { - gPVM.disconnect(); - - int hostCPUMhz_i = Integer.parseInt(hostCPUMhz); - int vmCPUMhz_i = Integer.parseInt(vmCPUMhz); - int vmCPUperc = (vmCPUMhz_i / hostCPUMhz_i) * 100; + String vmCPUMhz = + gPVM.getObjectProperty("summary.quickStats.overallCpuUsage").toString(); - pollInfo = "STATE=a USEDMEMORY=" + vmMEMMb + " USEDCPU=" + vmCPUperc; + String vmMEMMb = + gPVM.getObjectProperty("summary.quickStats.guestMemoryUsage").toString(); + + gPVM.disconnect(); + + int hostCPUMhz_i = Integer.parseInt(hostCPUMhz); + int vmCPUMhz_i = Integer.parseInt(vmCPUMhz); + int vmCPUperc = (vmCPUMhz_i / hostCPUMhz_i) * 100; + + pollInfo = "STATE=a USEDMEMORY=" + vmMEMMb + " USEDCPU=" + vmCPUperc; + } + else + { + if (powerState.equals("suspended")) + { + pollInfo = "STATE=p"; + } + else // Machine poweredOff + { + pollInfo = "STATE=d"; + } + } } catch(Exception e)