From 3ab34851fbc72d5e61d846dc03f22403e422534d Mon Sep 17 00:00:00 2001
From: Tino Vazquez <tinova@opennebula.org>
Date: Fri, 26 Sep 2014 18:22:26 +0200
Subject: [PATCH] feature #2911: Solve snapshot bugs in vCenter

---
 src/vmm_mad/remotes/vcenter/snapshot_create   | 4 ++--
 src/vmm_mad/remotes/vcenter/snapshot_revert   | 2 +-
 src/vmm_mad/remotes/vcenter/vcenter_driver.rb | 6 ++++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/vmm_mad/remotes/vcenter/snapshot_create b/src/vmm_mad/remotes/vcenter/snapshot_create
index cc89040dc0..9912df4db9 100644
--- a/src/vmm_mad/remotes/vcenter/snapshot_create
+++ b/src/vmm_mad/remotes/vcenter/snapshot_create
@@ -34,8 +34,8 @@ snapshot_name = ARGV[1]
 host          = ARGV[3]
 
 begin
-    VCenterDriver::VCenterVm.create_snapshot(deploy_id, 
-                                                  host, 
+    puts VCenterDriver::VCenterVm.create_snapshot(deploy_id,
+                                                  host,
                                                   snapshot_name)
 rescue Exception => e
     STDERR.puts "Snapshot of VM #{deploy_id} on host #{host} failed " +
diff --git a/src/vmm_mad/remotes/vcenter/snapshot_revert b/src/vmm_mad/remotes/vcenter/snapshot_revert
index fa96fc4e6e..372ce44c32 100644
--- a/src/vmm_mad/remotes/vcenter/snapshot_revert
+++ b/src/vmm_mad/remotes/vcenter/snapshot_revert
@@ -38,7 +38,7 @@ begin
                                              host, 
                                              snapshot_name)
 rescue Exception => e
-    STDERR.puts "Snapshot of VM #{deploy_id} on host #{host} could not be  " +
+    STDERR.puts "Snapshot of VM #{deploy_id} on host #{host} could not be " +
                 "reverted due to \"#{e.message}\""
     exit -1
 end
diff --git a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb
index 6b3c57503e..ac52879fb0 100644
--- a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb
+++ b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb
@@ -560,6 +560,8 @@ class VCenterVm
         vm          = connection.find_vm_template(deploy_id)
 
         vm.CreateSnapshot_Task(snapshot_hash).wait_for_completion
+
+        return snapshot_name
     end
 
     ############################################################################
@@ -583,7 +585,7 @@ class VCenterVm
             :removeChildren => true
         }
 
-        vm.RemoveSnapshot_Task(delete_snapshot_hash).wait_for_completion
+        snapshot.RemoveSnapshot_Task(delete_snapshot_hash).wait_for_completion
     end
 
     ############################################################################
@@ -606,7 +608,7 @@ class VCenterVm
             :_this => snapshot
         }
 
-        vm.RevertToSnapshot_Task(revert_snapshot_hash).wait_for_completion
+        snapshot.RevertToSnapshot_Task(revert_snapshot_hash).wait_for_completion
     end
 
     ########################################################################