add result checking for snapshot delete

scalefactory · Sep 23, 2014 · 779adbf · 779adbf
1 parent 5d52dcd
commit 779adbf
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 9 deletions.
diff --git a/lib/vagrant-multiprovider-snap/providers/virtualbox/action.rb b/lib/vagrant-multiprovider-snap/providers/virtualbox/action.rb
@@ -35,9 +35,13 @@ def self.action_snapshot_delete
                             b2.use Call, HasSnapshot do |env2, b3|
                                 if env2[:result]
                                     b3.use CheckAccessible
-                                    b3.use SnapshotDelete
+                                    b3.use Call, SnapshotDelete do |env3,b4|
+                                        unless env3[:result]
+                                            b4.use MessageSnapshotNotDeleted
+                                        end
+                                    end
                                 else
-                                    b3.use MessageSnapshotNotDeleted
+                                    b3.use MessageSnapshotNotCreated
                                 end
                             end
                         else

diff --git a/lib/vagrant-multiprovider-snap/providers/virtualbox/action/snapshot_delete.rb b/lib/vagrant-multiprovider-snap/providers/virtualbox/action/snapshot_delete.rb
@@ -17,7 +17,7 @@ def call(env)
                         :prefix => false
                     )
 
-                    env[:machine].provider.driver.snapshot_delete(snap_name)
+                    env[:result] = env[:machine].provider.driver.snapshot_delete(env[:snap_name])
 
                     @app.call(env)
 

diff --git a/lib/vagrant-multiprovider-snap/providers/vmware_fusion/action.rb b/lib/vagrant-multiprovider-snap/providers/vmware_fusion/action.rb
@@ -33,9 +33,13 @@ def self.action_snapshot_delete
                         if env[:result]
                             b2.use Call, HasSnapshot do |env2, b3|
                                 if env2[:result]
-                                    b3.use SnapshotDelete
+                                    b3.use Call, SnapshotDelete do |env3,b4|
+                                        unless env3[:result]
+                                            b4.use MessageSnapshotNotDeleted
+                                        end
+                                    end
                                 else
-                                    b3.use MessageSnapshotNotDeleted
+                                    b3.use MessageSnapshotNotCreated
                                 end
                             end
                         else
@@ -64,6 +68,7 @@ def self.action_snapshot_rollback
                     end
                 end
             end
+
        end
 
     end

diff --git a/lib/vagrant-multiprovider-snap/providers/vmware_fusion/action/snapshot_delete.rb b/lib/vagrant-multiprovider-snap/providers/vmware_fusion/action/snapshot_delete.rb
@@ -17,7 +17,7 @@ def call(env)
                         :prefix => false
                     )
 
-                    env[:machine].provider.driver.snapshot_delete(env[:snap_name])
+                    env[:result] = env[:machine].provider.driver.snapshot_delete(env[:snap_name])
 
                     @app.call(env)
 

diff --git a/lib/vagrant-multiprovider-snap/providers/vmware_workstation/action/snapshot_delete.rb b/lib/vagrant-multiprovider-snap/providers/vmware_workstation/action/snapshot_delete.rb
@@ -17,7 +17,7 @@ def call(env)
                         :prefix => false
                     )
 
-                    env[:machine].provider.driver.snapshot_delete(env[:snap_name])
+                    env[:result] = env[:machine].provider.driver.snapshot_delete(env[:snap_name])
 
                     @app.call(env)
 

diff --git a/locales/en.yml b/locales/en.yml
@@ -31,5 +31,4 @@ en:
             Snapshot - %{snapshot} - does not exist
         snapshot_not_deleted:
           not_deleted: |-
-            Snapshot - %{snapshot} - not deleted for this VM
-
+            Could not delete snapshot - %{snapshot} ...