From 93c88292bc4a5a7e5b51e832e1dfa65c2bff42fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Constantino=20V=C3=A1zquez=20Blanco?= Date: Mon, 13 Jul 2009 17:07:25 +0000 Subject: [PATCH] Automatic deregistering of VMWare VM if it cannot be powered on. git-svn-id: http://svn.opennebula.org/one/trunk@683 3034c82b-c49b-4eb3-8279-a7acafdc01c0 --- src/vmm_mad/vmware/OneVmmVmware.java | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/vmm_mad/vmware/OneVmmVmware.java b/src/vmm_mad/vmware/OneVmmVmware.java index 3259220fa2..3524e69652 100644 --- a/src/vmm_mad/vmware/OneVmmVmware.java +++ b/src/vmm_mad/vmware/OneVmmVmware.java @@ -90,7 +90,7 @@ class OneVmmVmware extends Thread hostName = null; fileName = null; - // Read a line a parse it + // Read a line and parse it try { str = in.readLine(); @@ -163,6 +163,15 @@ class OneVmmVmware extends Thread if(!dVM.shapeVM()) { + // Will try and deregister VM + try + { + oVM = new OperationsOverVM(arguments,hostName); + String vmName = pXML.getName() + "-" + vid_str; + oVM.deregisterVM(vmName); + } + catch(Exception e){} + throw new Exception("Error reconfiguring VM (" + pXML.getName() + ")."); } @@ -182,6 +191,14 @@ class OneVmmVmware extends Thread if(!oVM.powerOn(pXML.getName() + "-" + vid_str)) { + // Will try and deregister VM + try + { + oVM = new OperationsOverVM(arguments,hostName); + String vmName = pXML.getName() + "-" + vid_str; + oVM.deregisterVM(vmName); + } + catch(Exception e){} throw new Exception("Error powering on VM(" + pXML.getName() + ")."); }