vagrant-multiprovider-snap 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02da544bcb07fe508d365dc393528b7a7b656318
-  data.tar.gz: c9d8a12e14ab03ebe0423f53fe947501044f4f9f
+  metadata.gz: b8535b4c78d8d27d50dc47ef1e24783f955a260c
+  data.tar.gz: f3818f62f0f5e6009a9b950714faf4c39039854f
 SHA512:
-  metadata.gz: 2a21eed86cf3b8d3d3a3d487d9021d78f46d504694477ad37b56bec79d548c7e9b11d8039a23b1c67c752a169f4685f6b4f891e9c67f4b27e875ef303cf7eb4d
-  data.tar.gz: 42954d9edf17c022c715ff5013b06fdfe5af9e762e6a292a981c7fde93916d6315498546cc6a75086c66aeae1a907fa28167d462ca8eb5de212475e54dd9315f
+  metadata.gz: 79356318a909944fff35bfa1517b325a0550030b4f5ee79da628532bd82c5a43de7301dc976ec27559bc5bf14ffdec2c6249e7236f3a044d6ffbdf85f6edaf8f
+  data.tar.gz: d2475efd23f11451b3218833f7cb8eef67a540b2a0b137c1328c6e980a3bfb8e1a38e496a11ac7ecfcf00996040c3dc9edabe976a52de1933c12abe86e511c50

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.0.13 (September 28, 2014)
+
+ - Support for Snapshot deletion
+ - Fix bug causing VMWare Fusion VMs to always open GUI on rollback
+ - Support for Hyper-V provider 
+
 ## 0.0.12 (August 10, 2014)
 
  - Support named snapshots and arbitrary rollback

data/README.md

@@ -10,6 +10,7 @@ running Vagrant boxes.  It currently supports the following providers:
  * VirtualBox
  * VMWare Fusion (via the commercial VMWare plugin)
  * VMWare Workstation (via the commercial VMWare plugin)
+ * Hyper-V
 
 
 Installation
@@ -45,6 +46,10 @@ Roll back to a named snapshot:
 
     vagrant snap rollback [vm] --name=snap01
 
+Delete a snapshot
+
+    vagrant snap delete [vm] --name=snap01
+
 Limitations
 -----------
 

data/lib/vagrant-multiprovider-snap/command/delete.rb

@@ -0,0 +1,52 @@
+require 'optparse'
+require 'vagrant'
+
+module VagrantSnap
+
+    module Command
+
+        class Delete < Vagrant.plugin("2", :command)
+
+            def execute
+
+                options = {}
+                options[:snap_name] = nil
+
+                opts = OptionParser.new do |o|
+
+                    o.banner    = "Usage: vagrant snap delete [vm-name] --name=<snapname>"
+                    o.separator ""
+
+                    o.on("--name SNAPNAME", "Snapshot to delete - mandatory option") do |n|
+                        options[:snap_name] = n
+                    end
+
+                end
+
+                begin
+
+                    argv = parse_options(opts)
+                    return if !argv
+                    raise OptionParser::MissingArgument if options[:snap_name].nil?
+
+                rescue OptionParser::InvalidOption, OptionParser::MissingArgument
+                    puts $!.to_s
+                    puts opts
+                    return false
+                end
+
+                with_target_vms(argv) do |vm|
+
+                    vm.action(:snapshot_delete, :snap_name => options[:snap_name])
+
+                end
+
+                0
+
+            end
+
+        end
+
+    end
+
+end

data/lib/vagrant-multiprovider-snap/command/root.rb

@@ -19,6 +19,11 @@ module VagrantSnap
                     Take
                 end
 
+                @subcommands.register(:delete) do
+                    require_relative "delete"
+                    Delete
+                end
+
                 @subcommands.register(:rollback) do
                     require_relative "rollback"
                     Rollback

data/lib/vagrant-multiprovider-snap/plugin.rb

@@ -9,6 +9,9 @@ module VagrantSnap
         require_relative "providers/virtualbox/driver/base"
         require_relative "providers/virtualbox/driver/meta"
 
+	require_relative "providers/hyperv/action"
+	require_relative "providers/hyperv/driver/base"
+
         begin
 
             # Make sure the fusion plugin is installed (explicitly

data/lib/vagrant-multiprovider-snap/providers/hyperv/action.rb

@@ -0,0 +1,78 @@
+require "vagrant/action/builder"
+
+module VagrantPlugins
+
+    module HyperV
+
+        module Action
+
+            autoload :SnapshotTake,              File.expand_path("../action/snapshot_take.rb", __FILE__)
+            autoload :SnapshotDelete,            File.expand_path("../action/snapshot_delete.rb", __FILE__)
+            autoload :SnapshotRollback,          File.expand_path("../action/snapshot_rollback.rb", __FILE__)
+            autoload :HasSnapshot,               File.expand_path("../action/has_snapshot.rb", __FILE__)
+            autoload :MessageSnapshotNotDeleted, File.expand_path("../action/message_snapshot_not_deleted.rb", __FILE__)
+            autoload :MessageSnapshotNotCreated, File.expand_path("../action/message_snapshot_not_created.rb", __FILE__)
+
+            def self.action_snapshot_take
+                Vagrant::Action::Builder.new.tap do |b|
+                    b.use HandleBox
+                    b.use Call, IsState, :not_created do |env, b1|
+                        if env[:result]
+                            b1.use Message, I18n.t("vagrant_hyperv.message_not_created")
+                            next
+                        end
+
+                        b1.use SnapshotTake
+                    end
+                end
+            end
+
+            def self.action_snapshot_delete
+                Vagrant::Action::Builder.new.tap do |b|
+                    b.use HandleBox
+                    b.use Call, IsState, :not_created do |env, b1|
+
+                        if env[:result]
+                            b1.use Message, I18n.t("vagrant_hyperv.message_not_created")
+                            next
+                        end
+
+                        b1.use Call, HasSnapshot do |env1, b2|
+                            if env1[:result]
+                                b2.use Call, SnapshotDelete do |env2,b3|
+                                    if env2[:result]
+                                        b3.use MessageSnapshotNotDeleted
+                                    end
+                                end
+			    else
+				b2.use MessageSnapshotNotCreated
+			    end
+                        end
+
+                    end
+                end
+            end
+
+            def self.action_snapshot_rollback
+                Vagrant::Action::Builder.new.tap do |b|
+                    b.use HandleBox
+                    b.use Call, IsState, :not_created do |env, b1|
+                        if env[:result]
+                            b1.use Message, I18n.t("vagrant_hyperv.message_not_created")
+                            next
+                        end
+
+                        b1.use SnapshotRollback
+                        b1.use WaitForIPAddress
+                        b1.use WaitForCommunicator, [:running]
+                    end
+                end
+            end
+
+       end
+
+    end
+
+end
+
+        

data/lib/vagrant-multiprovider-snap/providers/hyperv/action/has_snapshot.rb

@@ -0,0 +1,31 @@
+module VagrantPlugins
+
+    module HyperV
+
+        module Action
+
+            class HasSnapshot
+
+                def initialize(app, env)
+                    @app = app
+                end
+
+                def call(env)
+
+		    if env[:snap_name].nil?
+                        env[:result] = env[:machine].provider.driver.has_snapshot?
+		    else
+			env[:result] = env[:machine].provider.driver.has_snapshot?(env[:snap_name])
+		    end
+
+                    @app.call(env)
+
+                end
+
+            end
+
+        end
+
+    end
+
+end

data/lib/vagrant-multiprovider-snap/providers/hyperv/action/message_snapshot_not_created.rb

@@ -0,0 +1,33 @@
+module VagrantPlugins
+
+    module HyperV
+
+        module Action
+
+            class MessageSnapshotNotCreated
+
+                def initialize(app, env)
+                    @app = app
+                end
+
+                def call(env)
+
+		    if env[:snap_name].nil?
+                        env[:ui].info I18n.t("vagrant_snap.actions.vm.snapshot_not_created")
+		    else
+			env[:ui].info I18n.t("vagrant_snap.actions.vm.snapshot_not_created.named_not_exist",
+                            :snapshot => env[:snap_name]
+	                )
+		    end
+
+                    @app.call(env)
+
+                end
+
+            end
+
+        end
+
+    end
+
+end

data/lib/vagrant-multiprovider-snap/providers/hyperv/action/message_snapshot_not_deleted.rb

@@ -0,0 +1,27 @@
+module VagrantPlugins
+
+    module HyperV
+
+        module Action
+
+            class MessageSnapshotNotDeleted
+
+                def initialize(app, env)
+                    @app = app
+                end
+
+                def call(env)
+
+                    env[:ui].info I18n.t("vagrant_snap.actions.vm.snapshot_not_deleted")
+
+                    @app.call(env)
+
+                end
+
+            end
+
+        end
+
+    end
+
+end

data/lib/vagrant-multiprovider-snap/providers/hyperv/action/snapshot_delete.rb

@@ -0,0 +1,31 @@
+module VagrantPlugins
+
+    module HyperV
+
+        module Action
+
+            class SnapshotDelete
+
+                def initialize(app, env)
+                    @app = app
+                end
+
+                def call(env)
+
+                    env[:ui].info(I18n.t("vagrant_snap.actions.vm.snapshot_delete.deleting",
+                        :snapshot => env[:snap_name]),
+                    )
+
+                    env[:result] = env[:machine].provider.driver.snapshot_delete(env[:snap_name])
+
+                    @app.call(env)
+
+                end
+
+            end
+
+        end
+
+    end
+
+end

data/lib/vagrant-multiprovider-snap/providers/hyperv/action/snapshot_rollback.rb

@@ -0,0 +1,29 @@
+module VagrantPlugins
+
+    module HyperV
+
+        module Action
+
+            class SnapshotRollback
+
+                def initialize(app, env)
+                    @app = app
+                end
+
+                def call(env)
+
+                    env[:ui].info I18n.t("vagrant_snap.actions.vm.snapshot_rollback.rolling_back")
+
+                    env[:machine].provider.driver.snapshot_rollback(env[:snap_name])
+
+                    @app.call(env)
+
+                end
+
+            end
+
+        end
+
+    end
+
+end

data/lib/vagrant-multiprovider-snap/providers/hyperv/action/snapshot_take.rb

@@ -0,0 +1,28 @@
+module VagrantPlugins
+
+    module HyperV
+
+        module Action
+
+            class SnapshotTake
+
+                def initialize(app, env)
+                    @app = app
+                end
+
+                def call(env)
+
+                    env[:ui].info I18n.t("vagrant_snap.actions.vm.snapshot_take.taking")
+                    env[:machine].provider.driver.snapshot_take(env[:snap_name])
+
+                    @app.call(env)
+
+                end
+
+            end
+
+        end
+
+    end
+
+end

data/lib/vagrant-multiprovider-snap/providers/hyperv/driver/base.rb

@@ -0,0 +1,91 @@
+module VagrantPlugins
+
+    module HyperV
+
+        class Driver
+
+            def snapshot_take(name)
+                execute_snap("snapshot_vm.ps1", { VmId: vm_id, SnapName: (name || "vagrant-snap-#{Time.now.to_i}") } )
+            end
+
+            def snapshot_rollback(name)
+                execute_snap("rollback_vm.ps1", { VmId: vm_id,  SnapName: (name || snapshot_list.last) } )
+            end
+
+            def snapshot_list
+                snaps = execute_snap("list_snapshots.ps1", { VmID: vm_id } )
+		snaps.map { |s| s['Name'] }
+            end
+
+            def snapshot_delete(name)
+                execute_snap("snapshot_delete.ps1", {VmID: vm_id, SnapName: name})
+            end
+
+            def has_snapshot?(name=nil)
+		if name.nil?
+		    snapshot_list.length > 0
+		else
+                    snapshot_list.include?(name)
+		end
+            end
+
+            protected
+
+            # These methods copied and modified from existing hyperv driver
+            # TODO: think about how we might refactor upstream to support
+            # this properly.
+
+            def execute_snap(path, options)
+
+                r = execute_snap_powershell(path, options)
+                if r.exit_code != 0
+                  raise Errors::PowerShellError,
+                    script: path,
+                    stderr: r.stderr
+                end
+
+                # We only want unix-style line endings within Vagrant
+                r.stdout.gsub!("\r\n", "\n")
+                r.stderr.gsub!("\r\n", "\n")
+
+                error_match  = ERROR_REGEXP.match(r.stdout)
+                output_match = OUTPUT_REGEXP.match(r.stdout)
+
+                if error_match
+                  data = JSON.parse(error_match[1])
+
+                  # We have some error data.
+                  raise Errors::PowerShellError,
+                    script: path,
+                    stderr: data["error"]
+                end
+
+                # Nothing
+                return nil if !output_match
+                return JSON.parse(output_match[1])
+
+            end
+
+            def execute_snap_powershell(path, options, &block)
+                lib_path = Pathname.new(File.expand_path("../scripts", __FILE__))
+                path = lib_path.join(path).to_s.gsub("/", "\\")
+                options = options || {}
+                ps_options = []
+                options.each do |key, value|
+                  ps_options << "-#{key}"
+                  ps_options << "'#{value}'"
+                end
+
+                # Always have a stop error action for failures
+                ps_options << "-ErrorAction" << "Stop"
+
+                opts = { notify: [:stdout, :stderr, :stdin] }
+                Vagrant::Util::PowerShell.execute(path, *ps_options, **opts, &block)
+            end
+                
+
+        end
+
+    end
+
+end