vagrant-vmware-esxi 1.2.1 → 1.3.0

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

@@ -1,5 +1,5 @@
 require 'log4r'
-require 'net/ssh/simple'
+require 'net/ssh'
 
 module VagrantPlugins
   module ESXi
@@ -33,19 +33,20 @@ module VagrantPlugins
             raise Errors::ESXiError,
                   message: 'Guest VM should have been powered off...'
           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,
-                      "vim-cmd vmsvc/destroy #{machine.id}"
-              if r.exit_code != 0
+              r = ssh.exec!("vim-cmd vmsvc/destroy #{machine.id}")
+              if r.exitstatus != 0
                 raise Errors::ESXiError,
                       message => "Unable to destroy the VM:\n"\
-                                 "  #{r.stdout}\n#{r.stderr}"
+                                 "  #{r}"
               end
               env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
                                    message: 'VM has been destroyed...')

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

@@ -0,0 +1,176 @@
+require 'log4r'
+require 'net/ssh'
+require 'io/console'
+
+module VagrantPlugins
+  module ESXi
+    module Action
+      # This action set the global variable esxi_password and attempt to
+      # login to the esxi server to verify connectivity.
+      class SetESXiPassword
+        def initialize(app, env)
+          @app    = app
+          @logger = Log4r::Logger.new('vagrant_vmware_esxi::action::set_esxi_password')
+        end
+
+        def call(env)
+          set_esxi_password(env)
+          @app.call(env)
+        end
+
+        def set_esxi_password(env)
+          @logger.info('vagrant-vmware-esxi, set_esxi_password: start...')
+
+          # Get config.
+          machine = env[:machine]
+          config = env[:machine].provider_config
+
+          #
+          #  Set global variable $esxi_password
+          #
+          if $esxi_password.nil?
+            if (config.debug =~ %r{password}i)
+              puts "$esxi_password is unset..."
+            end
+            if (config.esxi_password =~ %r{^prompt:}i)
+              #
+              #  Prompt for password
+              #
+              begin
+                print "#{config.esxi_hostname} password:"
+                $esxi_password = STDIN.noecho(&:gets).chomp
+                puts ""
+              rescue
+                raise Errors::ESXiError,
+                      message: "Prompt for password error???"
+              end
+            elsif (config.esxi_password =~ %r{^env:}i)
+              #
+              #  Get pw from environment variable
+              #
+              esxi_password_env = config.esxi_password.gsub(/env:/i, '').chomp
+              if esxi_password_env.length < 1
+                esxi_password_env = 'esxi_password'
+              end
+              begin
+                stdin_pw = ENV[esxi_password_env]
+                $esxi_password = stdin_pw.chomp
+              rescue
+                raise Errors::ESXiError,
+                      message: "Unable to read environment variable: #{esxi_password_env}"
+              end
+            elsif (config.esxi_password =~ %r{^file:}i)
+              #
+              #  Get password from file
+              #
+              esxi_password_file = config.esxi_password.gsub(/file:/i, '').chomp
+              if esxi_password_file.length < 1
+                esxi_password_file = '~/.esxi_password'
+              end
+              esxi_password_file = File.expand_path(esxi_password_file)
+              #  Get password from file
+              begin
+                if File.file?(esxi_password_file)
+                  file_pw=""
+                  fh = File.open(File.expand_path(esxi_password_file))
+                  file_pw = fh.readline
+                  fh.close
+                  $esxi_password = file_pw.chomp
+                else
+                  raise Errors::ESXiError, message: "Unable to open #{esxi_password_file}"
+                end
+              rescue
+                raise Errors::ESXiError, message: "Unable to open #{esxi_password_file}"
+              end
+            elsif (config.esxi_password =~ %r{^key:}i)
+              #
+              #  use ssh keys
+              #
+              $esxi_password = ""
+              esxi_password_key = config.esxi_password.gsub(/key:/i, '').chomp
+              if esxi_password_key.length < 1
+                config.esxi_private_keys = config.system_private_keys_path
+              else
+                config.esxi_private_keys = esxi_password_key
+              end
+            else
+              # Use plain text password from config
+              $esxi_password = config.esxi_password
+            end
+          end
+          if (config.debug =~ %r{password}i)
+            puts "pw (set_esxi_password): #{$esxi_password}"
+            puts "esxi_private_keys: #{config.esxi_private_keys}"
+          end
+
+
+          #
+          #  Encode special characters in PW
+          #
+          $encoded_esxi_password = $esxi_password.gsub('@', '%40').gsub(\
+            '<', '%3c').gsub('>', '%3e').gsub(\
+            '[', '%5b').gsub(']', '%5d').gsub(\
+            '(', '%28').gsub(')', '%29').gsub(\
+            '%', '%25').gsub('#', '%23').gsub(\
+            '&', '%26').gsub(':', '%3a').gsub(\
+            '/', '%2f').gsub('\\','%5c').gsub(\
+            '"', '%22').gsub('\'','%27').gsub(\
+            '*', '%2a').gsub('?', '%3f')
+
+          @logger.info('vagrant-vmware-esxi, connect_esxi: esxi_private_keys: '\
+                       "#{config.esxi_private_keys}")
+
+          #
+          #  Test ESXi host connectivity
+          #
+          begin
+            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|
+
+              esxi_version = ssh.exec!("vmware -v")
+              ssh.close
+
+              @logger = Log4r::Logger.new('vagrant_vmware_esxi::action::set_esxi_password')
+              if esxi_version =~ %r{^vmware esxi}i
+                @logger.info('vagrant-vmware-esxi, set_esxi_password: '\
+                             "ESXi version: #{esxi_version}")
+              else
+                @logger.info('vagrant-vmware-esxi, set_esxi_password: '\
+                             "ESXi version: #{esxi_version}")
+                raise Errors::ESXiError,
+                      message: "Unable to connect to ESXi host!"
+              end
+            end
+          rescue
+            if (config.esxi_password =~ %r{^prompt:}i)
+              access_error_message = "Prompt for password"
+            elsif (config.esxi_password =~ %r{^env:}i)
+              access_error_message = "env:#{esxi_password_env}"
+            elsif (config.esxi_password =~ %r{^file:}i)
+              access_error_message = "file:#{esxi_password_file}"
+            elsif (config.esxi_password =~ %r{^key:}i)
+              access_error_message = "key:#{config.esxi_private_keys}"
+            else
+              access_error_message = "password in Vagrantfile"
+            end
+
+            env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
+                                 message: "ESXi host access : #{access_error_message}")
+
+            @logger.info('vagrant-vmware-esxi, set_esxi_password: '\
+                        "ESXi host access : #{access_error_message}")
+
+            raise Errors::ESXiError,
+                  message: "Unable to connect to ESXi host!"
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,5 +1,5 @@
 require 'log4r'
-require 'net/ssh/simple'
+require 'net/ssh'
 
 module VagrantPlugins
   module ESXi
@@ -28,19 +28,21 @@ module VagrantPlugins
           elsif env[:machine_state].to_s == 'not_created'
             env[:ui].info I18n.t('vagrant_vmware_esxi.already_destroyed')
           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,
-                      "vim-cmd vmsvc/power.off #{machine.id}"
-              if r.exit_code != 0
+              r = ssh.exec!("vim-cmd vmsvc/power.off #{machine.id}")
+
+              if r.exitstatus != 0
                 raise Errors::ESXiError,
                       message: "Unable to power off the VM:\n"
-                               "  #{r.stdout}\n#{r.stderr}"
+                               "  #{r}"
               end
               env[:ui].info I18n.t('vagrant_vmware_esxi.states.powered_off.short')
             end

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

@@ -1,11 +1,10 @@
 require 'log4r'
-require 'net/ssh/simple'
 require 'fileutils'
 
 module VagrantPlugins
   module ESXi
     module Action
-      # This action will save (create) a new snapshot
+      # This action will package a VM.
       class Package
         def initialize(app, env)
           @app    = app
@@ -95,7 +94,7 @@ module VagrantPlugins
 
             ovf_cmd = "ovftool --noSSLVerify -tt=VMX --name=\"#{boxname}\" "\
                       "#{overwrite_opts} vi://#{config.esxi_username}:"\
-                      "#{config.esxi_password}@#{config.esxi_hostname}"\
+                      "#{$encoded_esxi_password}@#{config.esxi_hostname}"\
                       "?moref=vim.VirtualMachine:#{machine.id} #{tmpdir}"
 
             unless system "#{ovf_cmd}"

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

@@ -1,5 +1,5 @@
 require 'log4r'
-require 'net/ssh/simple'
+require 'net/ssh'
 
 module VagrantPlugins
   module ESXi
@@ -23,19 +23,21 @@ module VagrantPlugins
           machine = env[:machine]
           config = env[:machine].provider_config
 
-          return :not_created if machine.id.nil?
+          return nil if machine.id.nil?
 
           @logger.info("vagrant-vmware-esxi, read_ssh_info: machine id: #{machine.id}")
           @logger.info('vagrant-vmware-esxi, read_ssh_info: current state:'\
                        " #{env[:machine_state]}")
 
           #  Figure out vm_ipaddress
-          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|
 
             @logger = Log4r::Logger.new('vagrant_vmware_esxi::action::'\
                                         'read_ssh_info-net_ssh')
@@ -44,13 +46,13 @@ module VagrantPlugins
             ssh_execute_cmd = "vim-cmd vmsvc/get.guest #{machine.id} |"
             ssh_execute_cmd << 'grep -i "^   ipAddress"|'
             ssh_execute_cmd << 'grep -oE "((1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])"'
-            r = ssh config.esxi_hostname, ssh_execute_cmd
+            r = ssh.exec!(ssh_execute_cmd)
 
-            ipaddress = r.stdout.strip
+            ipaddress = r.strip
             @logger.info('vagrant-vmware-esxi, read_ssh_info: ipaddress: '\
                          "#{ipaddress}")
 
-            return nil if (ipaddress == '') || (r.exit_code != 0)
+            return nil if (ipaddress == '') || (r.exitstatus != 0)
 
             return {
               host: ipaddress,

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

@@ -1,5 +1,5 @@
 require 'log4r'
-require 'net/ssh/simple'
+require 'net/ssh'
 require 'socket'
 
 module VagrantPlugins
@@ -36,26 +36,28 @@ module VagrantPlugins
           machine = env[:machine]
           config = env[:machine].provider_config
 
-
           return :not_created if machine.id.to_i < 1
 
           @logger.info("vagrant-vmware-esxi, read_state: machine id: #{machine.id}")
           @logger.info("vagrant-vmware-esxi, read_state: current state: #{env[:machine_state]}")
 
-          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/getallvms|grep -q \"^#{machine.id} \" && "\
-                    "vim-cmd vmsvc/power.getstate #{machine.id} || return 254"
-            power_status = r.stdout
+                    "vim-cmd vmsvc/power.getstate #{machine.id} || return 254")
+            power_status = r
+
+            return :not_created if r.exitstatus == 254
 
-            return :not_created if r.exit_code == 254
-            if power_status == "" or r.exit_code != 0
+            if power_status == "" or r.exitstatus != 0
               raise Errors::ESXiError,
                     message: 'Unable to get VM Power State!'
             end

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

@@ -1,5 +1,5 @@
 require 'log4r'
-require 'net/ssh/simple'
+require 'net/ssh'
 
 module VagrantPlugins
   module ESXi
@@ -37,18 +37,22 @@ module VagrantPlugins
             env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
                                  message: 'Attempting to resume')
 
-            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:                    60,
+              number_of_password_prompts: 0,
+              non_interactive:            true
+            ) do |ssh|
 
-              r = ssh config.esxi_hostname, "vim-cmd vmsvc/power.on #{machine.id}"
-              if r.exit_code != 0
+              r = ssh.exec!("vim-cmd vmsvc/power.on #{machine.id}")
+
+              if r.exitstatus != 0
                 raise Errors::ESXiError,
                       message: "Unable to resume the VM:\n"\
-                               "  #{r.stdout}\n#{r.stderr}"
+                               "  #{r}"
               end
               env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
                                    message: 'VM has been resumed...')

data/lib/vagrant-vmware-esxi/action/snapshot_delete.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_delete')
 
-            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.remove #{machine.id} "\
                   "`vim-cmd vmsvc/snapshot.get #{machine.id} | "\
                   "grep -A1 '.*Snapshot Name        : #{env[:snapshot_name]}$' | "\
-                  "grep 'Snapshot Id'|awk '{print $NF}'`"
+                  "grep 'Snapshot Id'|awk '{print $NF}'`")
 
-              if r.exit_code != 0
+              if r.exitstatus != 0
                 raise Errors::ESXiError,
                       message: "Unable to remove snapshots of the VM:\n"\
-                               "  #{r.stdout}\n#{r.stderr}"
+                               "  #{r}"
               end
 
               env[:ui].info I18n.t('vagrant_vmware_esxi.snapshot_deleted')