vagrant-vmware-esxi 1.2.1 → 1.3.0

data/lib/vagrant-vmware-esxi/action/snapshot_info.rb

@@ -1,5 +1,5 @@
 require 'log4r'
-require 'net/ssh/simple'
+require 'net/ssh'
 
 module VagrantPlugins
   module ESXi
@@ -31,23 +31,25 @@ module VagrantPlugins
                                 message: 'Cannot snapshot_info in this state')
           else
 
-            Net::SSH::Simple.sync(
-              user:     config.esxi_username,
-              password: config.esxi_password,
-              port:     config.esxi_hostport,
-              keys:     config.esxi_private_keys,
-            ) do
+            Net::SSH.start( config.esxi_hostname, config.esxi_username,
+              password:                   $esxi_password,
+              port:                       config.esxi_hostport,
+              keys:                       config.esxi_private_keys,
+              timeout:                    10,
+              number_of_password_prompts: 0,
+              non_interactive:            true
+            ) do |ssh|
 
-              r = ssh config.esxi_hostname,
+              r = ssh.exec!(
                   "vim-cmd vmsvc/snapshot.get #{machine.id} 2>&1 | "\
                   "sed 's/Get Snapshot:/ /g' | "\
                   "grep -v "\
                   "-e 'Snapshot Id ' "\
                   "-e 'Snapshot Desciption ' "\
-                  "-e 'Snapshot State '"
+                  "-e 'Snapshot State '")
 
-              snapshotinfo = r.stdout
-              if r.exit_code != 0
+              snapshotinfo = r
+              if r.exitstatus != 0
                 raise Errors::ESXiError,
                       message: "Unable to list snapshots:\n"\
                                "  #{allsnapshots}\n#{r.stderr}"

data/lib/vagrant-vmware-esxi/action/snapshot_list.rb

@@ -1,5 +1,5 @@
 require 'log4r'
-require 'net/ssh/simple'
+require 'net/ssh'
 
 module VagrantPlugins
   module ESXi
@@ -31,19 +31,21 @@ module VagrantPlugins
                                 message: 'Cannot snapshot_list in this state')
           else
 
-            Net::SSH::Simple.sync(
-              user:     config.esxi_username,
-              password: config.esxi_password,
-              port:     config.esxi_hostport,
-              keys:     config.esxi_private_keys,
-            ) do
+            Net::SSH.start( config.esxi_hostname, config.esxi_username,
+              password:                   $esxi_password,
+              port:                       config.esxi_hostport,
+              keys:                       config.esxi_private_keys,
+              timeout:                    10,
+              number_of_password_prompts: 0,
+              non_interactive:            true
+            ) do |ssh|
 
-              r = ssh config.esxi_hostname,
+              r = ssh.exec!(
                   "vim-cmd vmsvc/snapshot.get #{machine.id} 2>&1 | "\
-                  "grep 'Snapshot Name'|sed 's/.*Snapshot Name        : //g'"
+                  "grep 'Snapshot Name'|sed 's/.*Snapshot Name        : //g'")
 
-              allsnapshots = r.stdout
-              if r.exit_code != 0
+              allsnapshots = r
+              if r.exitstatus != 0
                 raise Errors::ESXiError,
                       message: "Unable to list snapshots:\n"\
                                "  #{allsnapshots}\n#{r.stderr}"

data/lib/vagrant-vmware-esxi/action/snapshot_restore.rb

@@ -1,5 +1,5 @@
 require 'log4r'
-require 'net/ssh/simple'
+require 'net/ssh'
 
 module VagrantPlugins
   module ESXi
@@ -33,24 +33,26 @@ module VagrantPlugins
             env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
                                  message: 'Attempting to snapshot_restore')
 
-            Net::SSH::Simple.sync(
-              user:     config.esxi_username,
-              password: config.esxi_password,
-              port:     config.esxi_hostport,
-              keys:     config.esxi_private_keys,
-              timeout:  300
-            ) do
+            #
+            Net::SSH.start( config.esxi_hostname, config.esxi_username,
+              password:                   $esxi_password,
+              port:                       config.esxi_hostport,
+              keys:                       config.esxi_private_keys,
+              timeout:                    10,
+              number_of_password_prompts: 0,
+              non_interactive:            true
+            ) do |ssh|
 
-              r = ssh config.esxi_hostname,
+              r = ssh.exec!(
                   "vim-cmd vmsvc/snapshot.revert #{machine.id} "\
                   "`vim-cmd vmsvc/snapshot.get #{machine.id} | "\
                   "grep -A1 '.*Snapshot Name        : #{env[:snapshot_name]}$' | "\
-                  "grep 'Snapshot Id'|awk '{print $NF}'` suppressPowerOn"
+                  "grep 'Snapshot Id'|awk '{print $NF}'` suppressPowerOn")
 
-              if r.exit_code != 0
+              if r.exitstatus != 0
                 raise Errors::ESXiError,
                       message: "Unable to restore snapshots of the VM:\n"\
-                               "  #{r.stdout}\n#{r.stderr}"
+                               "  #{r}"
               end
 
               env[:ui].info I18n.t('vagrant_vmware_esxi.snapshot_restored')

data/lib/vagrant-vmware-esxi/action/snapshot_save.rb

@@ -1,5 +1,5 @@
 require 'log4r'
-require 'net/ssh/simple'
+require 'net/ssh'
 
 module VagrantPlugins
   module ESXi
@@ -33,21 +33,24 @@ module VagrantPlugins
             env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
                                  message: 'Attempting to snapshot_save')
 
-            Net::SSH::Simple.sync(
-              user:     config.esxi_username,
-              password: config.esxi_password,
-              port:     config.esxi_hostport,
-              keys:     config.esxi_private_keys,
-              timeout:  300
-            ) do
+            #
+            Net::SSH.start( config.esxi_hostname, config.esxi_username,
+              password:                   $esxi_password,
+              port:                       config.esxi_hostport,
+              keys:                       config.esxi_private_keys,
+              timeout:                    120,
+              number_of_password_prompts: 0,
+              non_interactive:            true
+            ) do |ssh|
 
-              r = ssh config.esxi_hostname,
-                  "vim-cmd vmsvc/snapshot.create #{machine.id} \"#{env[:snapshot_name]}\""
+              puts "machine id: #{machine.id}  snapshot name: #{env[:snapshot_name]}"
+              r = ssh.exec!(
+                  "vim-cmd vmsvc/snapshot.create #{machine.id} \"#{env[:snapshot_name]}\"")
 
-              if r.exit_code != 0
+              if r.exitstatus != 0
                 raise Errors::ESXiError,
                       message: "Unable to save snapshots of the VM:\n"\
-                               "  #{r.stdout}\n#{r.stderr}"
+                               "  #{r}"
               end
               env[:ui].info I18n.t('vagrant_vmware_esxi.support')
 

data/lib/vagrant-vmware-esxi/action/suspend.rb

@@ -1,5 +1,5 @@
 require 'log4r'
-require 'net/ssh/simple'
+require 'net/ssh'
 
 module VagrantPlugins
   module ESXi
@@ -36,19 +36,21 @@ module VagrantPlugins
             env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
                                  message: 'Attempting to suspend')
 
-            Net::SSH::Simple.sync(
-              user:     config.esxi_username,
-              password: config.esxi_password,
-              port:     config.esxi_hostport,
-              keys:     config.esxi_private_keys,
-              timeout:  300
-            ) do
-
-              r = ssh config.esxi_hostname, "vim-cmd vmsvc/power.suspend #{machine.id}"
-              if r.exit_code != 0
+            #
+            Net::SSH.start( config.esxi_hostname, config.esxi_username,
+              password:                   $esxi_password,
+              port:                       config.esxi_hostport,
+              keys:                       config.esxi_private_keys,
+              timeout:                    120,
+              number_of_password_prompts: 0,
+              non_interactive:            true
+            ) do |ssh|
+
+              r = ssh.exec!("vim-cmd vmsvc/power.suspend #{machine.id}")
+              if r.exitstatus != 0
                 raise Errors::ESXiError,
                       message: "Unable to suspend the VM:\n"\
-                               "  #{r.stdout}\n#{r.stderr}"
+                               "  #{r}"
               end
               env[:ui].info I18n.t('vagrant_vmware_esxi.support')
               env[:ui].info I18n.t('vagrant_vmware_esxi.states.suspended.short')

data/lib/vagrant-vmware-esxi/action/wait_for_state.rb

@@ -1,6 +1,5 @@
 require 'log4r'
 require 'timeout'
-require 'net/ssh/simple'
 
 module VagrantPlugins
   module ESXi

data/lib/vagrant-vmware-esxi/cap/snapshot_list.rb

@@ -1,4 +1,3 @@
-
 module VagrantPlugins
   module ESXi
     module Cap

data/lib/vagrant-vmware-esxi/provider.rb

@@ -21,7 +21,6 @@ module VagrantPlugins
       end
 
       def state
-        #@machine.action('connect_esxi')
         env = @machine.action('read_state')
         state_id = env[:machine_state]
 
@@ -31,6 +30,11 @@ module VagrantPlugins
         short = I18n.t("vagrant_vmware_esxi.states.#{state_id}.short")
         long  = I18n.t("vagrant_vmware_esxi.states.#{state_id}.long")
 
+        # If we're not created, then specify the special ID flag
+        if state_id == :not_created
+          state_id = Vagrant::MachineState::NOT_CREATED_ID
+        end
+
         # Return the MachineState object
         Vagrant::MachineState.new(state_id, short, long)
       end

data/lib/vagrant-vmware-esxi/version.rb

@@ -1,6 +1,6 @@
 #  VERSION
 module VagrantPlugins
   module ESXi
-    VERSION = '1.2.1'
+    VERSION = '1.3.0'
   end
 end

data/vagrant-vmware-esxi.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'log4r', '~> 1.1'
   s.add_runtime_dependency "iniparse", '> 1.0'
   s.add_runtime_dependency "nokogiri", '> 1.5'
-  s.add_runtime_dependency "net-ssh-simple", '> 1.5'
+  s.add_runtime_dependency "net-ssh", '> 3.0'
 
   s.add_development_dependency "bundler"
   s.add_development_dependency "rspec-core"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vmware-esxi
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Jonathan Senkerik
@@ -67,19 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: net-ssh-simple
+  name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -124,9 +124,9 @@ files:
 - lib/vagrant-vmware-esxi.rb
 - lib/vagrant-vmware-esxi/action.rb
 - lib/vagrant-vmware-esxi/action/boot.rb
-- lib/vagrant-vmware-esxi/action/connect_esxi.rb
 - lib/vagrant-vmware-esxi/action/createvm.rb
 - lib/vagrant-vmware-esxi/action/destroy.rb
+- lib/vagrant-vmware-esxi/action/esxi_password.rb
 - lib/vagrant-vmware-esxi/action/halt.rb
 - lib/vagrant-vmware-esxi/action/package.rb
 - lib/vagrant-vmware-esxi/action/read_ssh_info.rb

data/lib/vagrant-vmware-esxi/action/connect_esxi.rb

@@ -1,58 +0,0 @@
-require 'log4r'
-require 'net/ssh/simple'
-
-module VagrantPlugins
-  module ESXi
-    module Action
-      # This action connects to the ESXi, verifies credentials and
-      # validates if it's a ESXi host
-      class ConnectESXi
-        def initialize(app, _env)
-          @app    = app
-          @logger = Log4r::Logger.new('vagrant_vmware_esxi::action::connect_esxi')
-        end
-
-        def call(env)
-          connect_esxi(env)
-          @app.call(env)
-        end
-
-        def connect_esxi(env)
-          @logger.info('vagrant-vmware-esxi, connect_esxi: start...')
-
-          # Get config.
-          config = env[:machine].provider_config
-
-          if config.esxi_private_keys.is_a? Array
-            config.esxi_private_keys = [
-              '~/.ssh/id_rsa',
-              '~/.ssh/id_dsa',
-              '~/.ssh/id_ecdsa',
-              '~/.ssh/id_ed25519'
-            ]
-          end
-          @logger.info('vagrant-vmware-esxi, connect_esxi: esxi_private_keys: '\
-                       "#{config.esxi_private_keys}")
-
-          Net::SSH::Simple.sync(
-            user:     config.esxi_username,
-            password: config.esxi_password,
-            port:     config.esxi_hostport,
-            keys:     config.esxi_private_keys
-          ) do
-
-            r = ssh config.esxi_hostname,
-                    'esxcli system version get | grep Version:'
-            if (!r.stdout.include? 'Version:') || (r.exit_code != 0)
-              raise Errors::ESXiConfigError,
-                    message: "Unable to access ESXi host.\n"\
-                             'Verify esxi_hostname, esxi_hostport, '\
-                             'esxi_username, esxi_password in your Vagrantfile.'
-            end
-          end
-          @logger.info('vagrant-vmware-esxi, connect_esxi: connect success...')
-        end
-      end
-    end
-  end
-end