v2.4.5 Do not wait for when resuming a VM that is not able to be resumed.

Author: josenk

ESXi_guestos_types.md

@@ -3,7 +3,8 @@ VMware ESXi 6.5 guestOS types
 
 Based on my research and some trial & error, I made this list of guestOS types that are compatible with ESXi 6.5.  I started with some api documenation from vmware that listed guestOS types.
 
->http://pubs.vmware.com/vsphere-6-5/index.jsp#com.vmware.wssdk.apiref.doc/vim.vm.GuestOsDescriptor.GuestOsIdentifier.html
+>http://pubs.vmware.com/vsphere-65/topic/com.vmware.wssdk.apiref.doc/vim.vm.GuestOsDescriptor.GuestOsIdentifier.html
+>https://code.vmware.com/apis/358/vsphere#/doc/vim.vm.GuestOsDescriptor.GuestOsIdentifier.html
 
 But they didn't quite work when put directly in the vmx file...   I noticed none of my existing vmx files had the word "Guest" in guestOS line.  I also noticed in the list that the 64 bit entries were inconsistent.  (Some have _64, others are -64, and others are just 64.)   I removed the word Guest and set all the 64 bit OS's to be standard "-64".  The results seems to work for various OS's I installed, but I certainly didn't try all of these.    So here is my list...  Please report any errors.
 

Gemfile

@@ -1,9 +1,24 @@
-source 'https://rubygems.org'
+#source 'https://rubygems.org'
+#
+#group :development do
+#  #gem 'vagrant', git: 'https://github.com/hashicorp/vagrant.git', :branch => 'v2.2.3'
+#  gem 'vagrant', git: 'https://github.com/hashicorp/vagrant.git'
+#end
+#
+#group :plugins do
+#  #gemspec
+#  gem "vagrant-vmware-esxi", path: "."
+#end
+
+source "https://rubygems.org"
 
 group :development do
-  gem 'vagrant', git: 'https://github.com/hashicorp/vagrant.git'
+  # Need to tag to 2.2.4, there is still a bug.
+  # https://github.com/hashicorp/vagrant/pull/10945
+  gem "vagrant", git: "https://github.com/hashicorp/vagrant.git", :tag => 'v2.2.4'
 end
 
 group :plugins do
-  gemspec
+  gem "vagrant-vmware-esxi", path: "."
 end
+

Gemfile.path

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gem 'vagrant', path: '../vagrant'  # checked out 'cca36d9'

README.md

@@ -284,6 +284,7 @@ Known issues with vmware_esxi
 
 Version History
 ---------------
+* 2.4.5 Do not wait for `running` when resuming a VM that is not able to be resumed.
 * 2.4.4 Show stderr if unable to connect to ESXi host. Update GuestOS types.
 * 2.4.3 Update GuestOS types.
 * 2.4.3 Fix, Allow disk stores with "(" or ")" in their name.  Add support for up to 10 virtual NICs

example_box/Vagrantfile-multimachine

@@ -1,33 +1,32 @@
 #
 #  Multi machine, essential options Vagrant file example. (documentation removed)
 #
+nodes = {
+   "vm-multi1" => ["hashicorp/precise64", 1, 1024, 21 ],
+   "vm-multi2" => ["generic/centos7",     2, 2048, 22 ],
+}
 
-nodes = [
-  { hostname: 'VM-multi1', box: 'hashicorp/precise64' },
-  { hostname: 'VM-multi2', box: 'hashicorp/precise64' }
-]
+Vagrant.configure(2) do |config|
+  nodes.each do | (name, cfg) |
+    box, numvcpus, memory, storage = cfg
 
-Vagrant.configure('2') do |config|
-  nodes.each do |node|
-    config.vm.define node[:hostname] do |node_config|
-      node_config.vm.hostname = node[:hostname]
-      node_config.vm.box = node[:box]
-      node_config.vm.synced_folder('.', '/Vagrantfiles', type: 'rsync')
-    end
-  end
+    config.vm.define name do |machine|
+      machine.vm.box   = box
+      machine.vm.hostname = name
+      machine.vm.synced_folder('.', '/Vagrantfiles', type: 'rsync')
 
-  config.vm.provider :vmware_esxi do |esxi|
-    #
-    #   Provider settings
-    #
-    esxi.esxi_hostname = 'esxi'
-    esxi.esxi_username = 'root'
-    esxi.esxi_password = 'file:'
-    #esxi.esxi_hostport = 22
-    #esxi.esxi_virtual_network = 'vmnet_example'
-    #esxi.esxi_disk_store = 'DS_001'
-    #esxi.esxi_resource_pool = '/Vagrant'
-    #esxi.guest_memsize = '2048'
-    #esxi.guest_numvcpus = '2'
+      machine.vm.provider :vmware_esxi do |esxi|
+        esxi.esxi_hostname         = 'esxi'
+        esxi.esxi_username         = 'root'
+        esxi.esxi_password         = 'file:'
+        esxi.esxi_virtual_network  = "VM Network"
+        esxi.guest_numvcpus        = numvcpus
+        esxi.guest_memsize         = memory
+        esxi.guest_storage         = storage
+        #esxi.clone_from_vm        = box
+        esxi.local_allow_overwrite = 'True'
+
+      end
+    end
   end
 end

lib/vagrant-vmware-esxi/action.rb

@@ -47,10 +47,11 @@ def self.action_suspend
       def self.action_resume
         Vagrant::Action::Builder.new.tap do |b|
           b.use SetESXiPassword
-          b.use ReadState
-          b.use Resume
           b.use Call, ReadState do |env1, b1|
-            if env1[:machine].state.id != :not_created
+            if env1[:machine_state].to_s == 'not_created'
+              b1.use Resume
+            else
+              b1.use Resume
               b1.use WaitForState, :running, 240
             end
           end

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

@@ -57,8 +57,8 @@ def read_ssh_info(env)
               #    Try to get first interface.  This is the prefered method
               #    when you have multiple network interfaces
               ssh_execute_cmd = "vim-cmd vmsvc/get.guest #{machine.id} 2>/dev/null |"
-              ssh_execute_cmd << 'grep -A 5 "deviceConfigId = 4000" |tail -1|'
-              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])"'
+              ssh_execute_cmd << 'sed \'1!G;h;$!d\' |awk \'/deviceConfigId = 4000/,/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])" |tail -1'
               r = ssh.exec!(ssh_execute_cmd)
               ipaddress = r.strip
 

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

@@ -30,7 +30,7 @@ def resume(env)
              (env[:machine_state].to_s == 'running')
             env[:ui].info I18n.t('vagrant_vmware_esxi.already_powered_on')
           elsif env[:machine_state].to_s == 'not_created'
-           env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
+            env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
                                 message: 'Cannot resume in this state')
           elsif (env[:machine_state].to_s == 'powered_off') ||
                 (env[:machine_state].to_s == 'suspended')

lib/vagrant-vmware-esxi/version.rb

@@ -1,7 +1,7 @@
 #  VERSION
 module VagrantPlugins
   module ESXi
-    VERSION = '2.4.4'
+    VERSION = '2.4.5'
     $vagrant_vmware_esxi_version = VERSION
   end
 end

vagrant-vmware-esxi.gemspec

@@ -15,11 +15,15 @@ Gem::Specification.new do |s|
   s.files           = `git ls-files`.split($\)
   s.executables     = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
   s.test_files      = s.files.grep(%r{^(test|spec|features)/})
+  s.require_path    = 'lib'
 
   s.add_runtime_dependency 'i18n', '~> 1.0'
   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 'nokogiri', '~> 1.6'
+
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec'
 
   # Needed only to support ed25519 ssh keys with net-ssh 4.x.  Won't need this for net-ssh 5.x.
   #s.add_runtime_dependency 'rbnacl', '>= 4.0', '< 5.0'