From ef97a6e8a9fe1d351d9461aea54c8bda3d5c319e Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Wed, 14 May 2014 17:07:09 +0200 Subject: [PATCH] Bug #2873: Check if VM is defined and acquire it instead of cowardly failing --- src/vmm_mad/remotes/vmware/vmware_driver.rb | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/vmm_mad/remotes/vmware/vmware_driver.rb b/src/vmm_mad/remotes/vmware/vmware_driver.rb index 35fd18833a..dee542c4ee 100644 --- a/src/vmm_mad/remotes/vmware/vmware_driver.rb +++ b/src/vmm_mad/remotes/vmware/vmware_driver.rb @@ -198,9 +198,9 @@ class VMwareDriver # ------------------------------------------------------------------------ # def restore(checkpoint) begin + vm_id = File.basename(File.dirname(checkpoint)) vm_folder=VAR_LOCATION << - "/vms/" << - File.basename(File.dirname(checkpoint)) + "/vms/" << vm_id dfile=`ls -1 #{vm_folder}/deployment*|tail -1` dfile.strip! rescue => e @@ -208,9 +208,12 @@ class VMwareDriver exit(-1) end - deploy_id = define_domain(dfile) - - exit(-1) if deploy_id.nil? + if not domain_defined?(id) + deploy_id = define_domain(dfile) + exit(-1) if deploy_id.nil? + else + deploy_id = "one-#{id}" + end # Revert snapshot VM # Note: This assumes the checkpoint name is "checkpoint", to change