vagrant-vmware-esxi 2.0.7 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 343c96c9a16c7657eecc7386265446c25d30918d
-  data.tar.gz: 8eb77a209ec5b5707d655210e420abaa14482795
+  metadata.gz: a0fd559e963813bd56e7f2dedf83924abbe16706
+  data.tar.gz: 56447256f57346e7f1b3da2de4da83d0a529c237
 SHA512:
-  metadata.gz: b9f8620e0c93b40a8f8892c823c7818cdd533578547adc9f6eeaa24a3edac91432303eb73d233fd97ffa0c736334dab49bee381f55b79e5afc50c3bb307577c8
-  data.tar.gz: dacca0c01725ff30f9174604016ea739b797485d7b4989011cfca602b91282dde14b39fa8dfae0acab0b5f6b8a3c4631374f0415dac58a7c16980bb0d35d8ca0
+  metadata.gz: 00200e42bb32d12799a69d1f50a79c9345078c4d84875017ad7c8d1cef46e168296d1ba06aab9720fc5b0e66bc9086b739ac9e938d291bfedaa54a20c44eff2e
+  data.tar.gz: 043e6563f627a24a820f4963eff2e225ff082063db94f7bddbb8d25ec87e2d57449c9368140c16ecd2e4205e8d665931ab5122567126c9486d4bdf6e72a27d20

data/README.md

@@ -9,9 +9,14 @@ Refer to the WIKI for documentation, examples and other information...
 >https://github.com/josenk/vagrant-vmware-esxi/wiki
 
 
+What's new!
+-----------
+Added support to clone from a VM!   Refer to the WIKI for documentation, example and other information.
+>https://github.com/josenk/vagrant-vmware-esxi/wiki/How-to-clone_from_vm.
 
 Features and Compatibility
 --------------------------
+* Clone from VMs.  Clone a VM on the esxi host instead of transferring a box stored on your local pc.
 * Any of the vmware Box formats should be compatible.
   * vmware_desktop, vmware_fusion, vmware_workstation...
   * To be fully functional, you must have open-vm-tools or vmware tools installed.
@@ -78,7 +83,7 @@ Vagrant.configure('2') do |config|
   # Here are some of the MANY examples....
   config.vm.box = 'generic/centos7'
   #config.vm.box = 'generic/centos6'
-  #config.vm.box = 'generic/fedora26'
+  #config.vm.box = 'generic/fedora27'
   #config.vm.box = 'generic/freebsd11'
   #config.vm.box = 'generic/ubuntu1710'
   #config.vm.box = 'generic/debian9'
@@ -145,6 +150,13 @@ Vagrant.configure('2') do |config|
     #     Vagrant will NOT create a Resource pool it for you.
     #esxi.esxi_resource_pool = '/Vagrant'
 
+    #  Optional. Specify a VM to clone instead of uploading a box.
+    #    Vagrant can use any stopped VM as the source 'box'.   The VM must be
+    #    registered, stopped and must have the vagrant insecure ssh key installed.
+    #    If the VM is stored in a resource pool, it must be specified.
+    #    See wiki: https://github.com/josenk/vagrant-vmware-esxi/wiki/How-to-clone_from_vm.
+    #esxi.clone_from_vm = 'resource_pool/source_vm'
+
     #  OPTIONAL.  Guest VM name to use.
     #    The Default will be automatically generated.
     #esxi.guest_name = 'Custom-Guest-VM_Name'
@@ -256,8 +268,12 @@ Known issues with vmware_esxi
 
 Version History
 ---------------
+* 2.1.0 Add support for clone_from_vm.
+        Fix, use esxcli to get storage information.
+
 * 2.0.7 Fix, Doesn't wait for running when executing "vagrant reload"
         Fix, "vagrant halt" will now attempt a graceful shutdown before doing a hard power off.
+
 * 2.0.6 Fix Windows compatibility by not supporting ed25519 ssh keys.  When net-ssh 5.x is released AND vagrant allows it's use, I will support ed25519 again.
         Fix, encode '/' in esxi passwords.
         Fix, Get local IP address for NFS syncd folders.  Filter out localhost 127.0.0.0/8.

data/example_box/Vagrantfile

@@ -126,6 +126,14 @@ Vagrant.configure('2') do |config|
     #     Vagrant will NOT create a Resource pool it for you.
     #esxi.esxi_resource_pool = '/Vagrant'
 
+    #  Optional. Specify a VM to clone instead of uploading a box.
+    #    Vagrant can use any stopped VM as the source 'box'.   The VM must be
+    #    registered, stopped and must have the vagrant insecure ssh key installed.
+    #    If the VM is stored in a resource pool, it must be specified.  If this
+    #    option is specified, config.vm.box should be set to a dummy box.
+    #    See wiki: https://github.com/josenk/vagrant-vmware-esxi/wiki/How-to-clone_from_vm.
+    #esxi.clone_from_vm = 'resource_pool/source_vm'
+
     #  OPTIONAL.  Guest VM name to use.
     #    The Default will be automatically generated.  It will be based on
     #    the guest_name_prefix (see below), your hostname & username and path.

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

@@ -27,9 +27,7 @@ module VagrantPlugins
             if env1[:machine_state].to_s == 'running'
               b1.use Shutdown
               b1.use Call, WaitForState, :powered_off, 30 do |env1, b2|
-                unless env1[:result] == 'True'
-                  b2.use Halt
-                end
+                b2.use Halt unless env1[:result] == 'True'
               end
             else
               b1.use Halt
@@ -113,9 +111,7 @@ module VagrantPlugins
         Vagrant::Action::Builder.new.tap do |b|
           b.use SetESXiPassword
           b.use Call, ReadState do |env1, b1|
-            unless env1[:machine_state] == 'powered_off'
-              b1.use Halt
-            end
+            b1.use Halt unless env1[:machine_state] == 'powered_off'
             b1.use ReadState
             b1.use Destroy
           end
@@ -164,6 +160,7 @@ module VagrantPlugins
               b1.use Provision
               b1.use SyncedFolderCleanup
               b1.use SyncedFolders
+              #b1.use SetHostname   # Still too buggy.  Tested with vagrant 2.0.4dev
             end
           end
         end

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

@@ -31,6 +31,16 @@ module VagrantPlugins
             return
           end
 
+          #
+          # Verify ovftool is installed.
+          #
+          unless system 'ovftool --version'
+            raise Errors::OVFToolError,
+                  message: 'ovftool not found or not in your path.'\
+                           "  Please download and "\
+                           '  install from http://www.vmware.com.'
+          end
+
           # Set desired_guest_name
           if !env[:machine].config.vm.hostname.nil?
             # A hostname has been set, so use it.
@@ -52,15 +62,38 @@ module VagrantPlugins
           desired_guest_name = desired_guest_name[0..252].gsub(/_/,'-').gsub(/[^0-9A-Za-z\-\.]/i, '').strip
           @logger.info("vagrant-vmware-esxi, createvm: config.guest_name: #{config.guest_name}")
 
-          #
           #  Source vmx / vmdk files
           src_dir = env[:machine].box.directory
           @logger.info("vagrant-vmware-esxi, createvm: src_dir: #{src_dir}")
 
-          vmx_file = Dir.glob("#{src_dir}/*.vmx").first
-          vmdk_files = Dir.glob("#{src_dir}/*.vmdk")
-          @logger.info("vagrant-vmware-esxi, createvm: vmx_file: #{vmx_file}")
-          @logger.info("vagrant-vmware-esxi, createvm: vmdk_files: #{vmdk_files}")
+          if config.clone_from_vm.nil?
+            vmx_file = Dir.glob("#{src_dir}/*.vmx").first
+            @logger.info("vagrant-vmware-esxi, createvm: vmx_file: #{vmx_file}")
+            source_vmx_contents = File.read(vmx_file)
+          else
+            begin
+              tmpdir = Dir.mktmpdir
+            rescue
+              raise Errors::GeneralError,
+                    message: "Unable to create tmp dir #{tmpdir}"
+            end
+            #
+            #  Source from Clone Source
+            clone_from_vm_path = "vi://#{config.esxi_username}:#{$encoded_esxi_password}@#{config.esxi_hostname}/#{config.clone_from_vm}"
+            ovf_cmd = "ovftool --noSSLVerify --overwrite --powerOffTarget --noDisks --targetType=vmx "\
+                  "#{clone_from_vm_path} #{tmpdir}"
+            unless system "#{ovf_cmd}"
+              raise Errors::OVFToolError,
+                    message: "Unable to access #{config.clone_from_vm}"
+            end
+            vmx_file = Dir.glob("#{tmpdir}/#{config.clone_from_vm.split('/')[-1]}/*.vmx").first
+            unless source_vmx_contents = File.read(vmx_file)
+              raise Errors::GeneralError,
+                    message: "Unable to read #{vmx_file}"
+            end
+
+            puts "source_vmx_contents: #{source_vmx_contents}" if config.debug =~ %r{vmx}i
+          end
 
           #
           #  Open the network connection
@@ -79,8 +112,8 @@ module VagrantPlugins
             #
             #  Figure out DataStore
             r = ssh.exec!(
-                    'df 2>/dev/null| grep "^[VMFS|NFS].*/vmfs/volumes/" | '\
-                    'sort -nk4 | sed "s|.*/vmfs/volumes/||g"')
+                    'esxcli storage filesystem list | grep "/vmfs/volumes/.*[VMFS|NFS]" | '\
+                    "sort -nk7 | awk '{print $2}'")
 
             availvolumes = r.split(/\n/)
             if config.debug =~ %r{true}i
@@ -196,60 +229,93 @@ module VagrantPlugins
           @logger.info('vagrant-vmware-esxi, createvm: '\
                        "esxi_virtual_network: #{@guestvm_network}")
 
-          #   finalize some paramaters
-          #if (config.guest_memsize.is_a? String) || (config.guest_memsize.is_a? Integer)
-          #  desired_guest_memsize = config.guest_memsize.to_s.to_i
-          #end
-          #if (config.guest_numvcpus.is_a? String) || (config.guest_numvcpus.is_a? Integer)
-          #  desired_guest_numvcpus = config.guest_numvcpus.to_s.to_i
-          #end
+          #  Set some defaults
           desired_guest_memsize = config.guest_memsize.to_s.to_i unless config.guest_memsize.nil?
+          desired_guest_memsize = 1024 if desired_guest_memsize.nil?
+
           desired_guest_numvcpus = config.guest_numvcpus.to_s.to_i unless config.guest_numvcpus.nil?
+          desired_guest_numvcpus = 1 if desired_guest_numvcpus.nil?
+
+          unless config.guest_guestos.nil?
+            if config.supported_guest_guestos.include? config.guest_guestos.downcase
+              desired_guestos = config.guest_guestos.downcase.strip
+            else
+              config.guest_guestos = nil
+              env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
+                                   message: 'WARNING         : '\
+                                            "GuestOS: #{config.guest_guestos} not "\
+                                            "supported, using box/ovftool defaults")
+            end
+          end
+
+          unless config.guest_virtualhw_version.nil?
+            if config.supported_guest_virtualhw_versions.include? config.guest_virtualhw_version.to_i
+              desired_virtualhw_version = config.guest_virtualhw_version.to_i.to_s
+            else
+              env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
+                                    message: 'WARNING         : '\
+                                             "Invalid guest_virtualhw_version: #{config.guest_virtualhw_version},"\
+                                             "using ovftool defaults")
+              config.guest_virtualhw_version = nil
+            end
+          end
+
+          unless config.guest_nic_type.nil?
+            if config.supported_guest_nic_types.include? config.guest_nic_type.downcase
+              desired_nic_type = config.guest_nic_type.downcase
+            else
+              env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
+                                   message: 'WARNING         : '\
+                                            "NIC type: #{config.guest_nic_type} not "\
+                                            "found, using ovftool defaults.")
+              config.guest_nic_type = nil
+            end
+          end
 
           #
           #   Fix/clean up vmx file.
           #
           new_vmx_contents = ''
-          File.readlines(vmx_file).each do |line|
+          source_vmx_contents.each_line do |line|
 
             case line
             when /^displayname =/i
               new_vmx_contents << "displayname = \"#{desired_guest_name}\"\n"
+
             when /^memsize =/i
-              if desired_guest_memsize.nil?
-                new_vmx_contents << line
+              if config.guest_memsize.nil?
                 desired_guest_memsize = line.gsub(/^memsize = /i, '').gsub(/\"/, '').to_i
-              else
-                new_vmx_contents << "memsize = \"#{desired_guest_memsize}\"\n"
               end
+              new_vmx_contents << "memsize = \"#{desired_guest_memsize}\"\n"
+
             when /^numvcpus =/i
-              if desired_guest_numvcpus.nil?
-                new_vmx_contents << line
+              if config.guest_numvcpus.nil?
                 desired_guest_numvcpus = line.gsub(/^numvcpus = /i, '').gsub(/\"/, '').to_i
-              else
-                new_vmx_contents << "numvcpus = \"#{desired_guest_numvcpus}\"\n"
               end
-            when /^ethernet[0-9]/i
-              # Do nothing, delete these lines, we'll fix it later.
-            when /^guestOS = /i
+              new_vmx_contents << "numvcpus = \"#{desired_guest_numvcpus}\"\n"
 
-              in_vmx_guest_guestos = line.gsub(/^guestOS = /i, '').gsub(/\"/, '').strip
+            when /^guestOS = /i
               if config.guest_guestos.nil?
-                config.guest_guestos = in_vmx_guest_guestos
+                desired_guestos = line.gsub(/^guestOS = /i, '').gsub(/\"/, '').strip
                 new_vmx_contents << line
               else
-                if config.supported_guest_guestos.include? config.guest_guestos.downcase
-                  config.guest_guestos = config.guest_guestos.downcase.strip
-                  new_vmx_contents << "guestOS = \"#{config.guest_guestos}\"\n"
-                else
-                  env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
-                                       message: 'WARNING         : '\
-                                                "GuestOS: #{config.guest_guestos} not "\
-                                                "supported, using box/ovftool defaults")
-                  config.guest_guestos = in_vmx_guest_guestos
-                  new_vmx_contents << line
-                end
+                new_vmx_contents << "guestOS = \"#{desired_guestos}\"\n"
               end
+
+            when /^virtualHW.version = /i
+              if desired_virtualhw_version.nil?
+                desired_virtualhw_version = line.gsub(/^virtualHW.version = /i, '').gsub(/\"/, '').strip
+                new_vmx_contents << line
+              else
+                new_vmx_contents << "virtualHW.version = \"#{desired_virtualhw_version}\"\n"
+              end
+
+            when /^ethernet[0-9]/i
+              # Just save the nic type
+              if (line =~ /ethernet0.virtualDev = /i) and desired_nic_type.nil?
+                desired_nic_type = line.gsub(/ethernet0.virtualDev = /i, '').gsub('"', '').strip
+              end
+
             else
               new_vmx_contents << line
             end
@@ -258,29 +324,7 @@ module VagrantPlugins
 
           #  finalize vmx.
           unless new_vmx_contents =~ %r{^numvcpus =}i
-            if desired_guest_numvcpus.nil?
-              new_vmx_contents << "numvcpus = \"1\"\n"
-            else
-              new_vmx_contents << "numvcpus = \"#{desired_guest_numvcpus}\"\n"
-            end
-          end
-
-          #  Append virt network options
-          netOpts = ""
-          networkID = 0
-          for element in @guestvm_network do
-            if config.debug =~ %r{true}i
-              env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
-                                   message: "Network[#{networkID}]      : #{element}")
-            end
-            new_vmx_contents << "ethernet#{networkID}.networkName = \"net#{networkID}\"\n"
-            new_vmx_contents << "ethernet#{networkID}.present = \"TRUE\"\n"
-            new_vmx_contents << "ethernet#{networkID}.addressType = \"generated\"\n"
-            netOpts << " --net:\"net#{networkID}=#{element}\""
-            networkID += 1
-            if networkID >= 4
-              break
-            end
+            new_vmx_contents << "numvcpus = \"#{desired_guest_numvcpus}\"\n"
           end
 
           #  Write new vmx file on local filesystem
@@ -334,21 +378,6 @@ module VagrantPlugins
             config.guest_mac_address = new_guest_mac_address
           end
 
-          #  Validate nic types
-          if config.guest_nic_type.nil?
-            guest_nic_type = nil
-          else
-            if config.supported_guest_nic_types.include?(config.guest_nic_type.downcase)
-              guest_nic_type = config.guest_nic_type.downcase
-            else
-              env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
-                                   message: 'WARNING         : '\
-                                            "NIC type: #{config.guest_nic_type} not "\
-                                            "found, using ovftool defaults.")
-              guest_nic_type = nil
-            end
-          end
-
           #  Validate disk types (thin, thick, etc...)
           if config.guest_disk_type.nil?
             guest_disk_type = "thin"
@@ -382,19 +411,6 @@ module VagrantPlugins
             config.guest_storage = new_guest_storage
           end
 
-          #  Validate virtual HW levels
-          unless config.guest_virtualhw_version.nil?
-            if config.supported_guest_virtualhw_versions.include? config.guest_virtualhw_version.to_i
-              guest_virtualhw_version = config.guest_virtualhw_version.to_i.to_s
-            else
-              env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
-                                    message: 'WARNING         : '\
-                                             "Invalid guest_virtualhw_version: #{config.guest_virtualhw_version},"\
-                                             " using ovftool defaults")
-              guest_virtualhw_version = nil
-            end
-          end
-
           # Validate local_lax setting (use relaxed (--lax) ovftool option)
           unless config.local_lax.nil?
             if config.local_lax == 'True'
@@ -404,7 +420,6 @@ module VagrantPlugins
             end
           end
 
-
           #
           #  Print summary
           #
@@ -423,10 +438,15 @@ module VagrantPlugins
                                message: " --- Guest Summary ---")
           env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
                                message: "VM Name         : #{desired_guest_name}")
-          env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
-                               message: "Box             : #{env[:machine].box.name}")
-          env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
-                               message: "Box Ver         : #{env[:machine].box.version}")
+          if config.clone_from_vm.nil?
+            env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
+                                 message: "Box             : #{env[:machine].box.name}")
+            env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
+                                 message: "Box Ver         : #{env[:machine].box.version}")
+          else
+            env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
+                                 message: "Clone from VM   : #{config.clone_from_vm}")
+          end
           env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
                                message: "Memsize (MB)    : #{desired_guest_memsize}")
           env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
@@ -435,9 +455,9 @@ module VagrantPlugins
             env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
                                  message: "Mac Address     : #{config.guest_mac_address[0..3]}")
           end
-          unless guest_nic_type.nil?
+          unless config.guest_nic_type.nil?
             env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
-                                 message: "Nic Type        : #{guest_nic_type}")
+                                 message: "Nic Type        : #{desired_nic_type}")
           end
           unless config.guest_disk_type.nil?
             env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
@@ -448,10 +468,10 @@ module VagrantPlugins
                                  message: "Storage (GB)    : #{config.guest_storage[0..13]}")
           end
           env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
-                               message: "Guest OS type   : #{config.guest_guestos}")
-          unless guest_virtualhw_version.nil?
+                               message: "Guest OS type   : #{desired_guestos}")
+          unless config.virtualhw_version.nil?
             env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
-                                 message: "Virtual HW ver  : #{guest_virtualhw_version}")
+                                 message: "Virtual HW ver  : #{desired_virtualhw_version}")
           end
           if config.local_lax == 'True'
             env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
@@ -464,20 +484,15 @@ module VagrantPlugins
           env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
                                message: "  --- Guest Build ---")
 
-          #
-          # Using ovftool, import vmx in box folder, export to ESXi server
-          #
-          unless system 'ovftool --version'
-            raise Errors::OVFToolError,
-                  message: 'ovftool not found or not in your path.'\
-                           "  Please download and "\
-                           '  install from http://www.vmware.com.'
+          if config.clone_from_vm.nil?
+            src_path = new_vmx_file
+          else
+            src_path = clone_from_vm_path
           end
-
           ovf_cmd = "ovftool --noSSLVerify #{overwrite_opts} "\
-                "#{netOpts} -dm=#{guest_disk_type} #{local_laxoption} "\
+                "-dm=#{guest_disk_type} #{local_laxoption} "\
                 "-ds=\"#{@guestvm_dsname}\" --name=\"#{desired_guest_name}\" "\
-                "\"#{new_vmx_file}\" vi://#{config.esxi_username}:"\
+                "\"#{src_path}\" vi://#{config.esxi_username}:"\
                 "#{$encoded_esxi_password}@#{config.esxi_hostname}"\
                 "#{esxi_resource_pool}"
 
@@ -505,10 +520,11 @@ module VagrantPlugins
                                  message: "Keeping file    : #{new_vmx_file}")
           else
             File.delete(new_vmx_file)
+            FileUtils.remove_entry tmpdir unless tmpdir.nil?
           end
 
           #
-          #  Re-open the network connection to get VMID and do final adjustments
+          #  Re-open the network connection to get VMID and do adjustments
           #  to vmx file.
           #
           Net::SSH.start(config.esxi_hostname, config.esxi_username,
@@ -621,64 +637,31 @@ module VagrantPlugins
 
             #  read each line in vmx to customize
             new_vmx_contents = ''
-            vmx_need_change_flag = false
             esxi_orig_vmx_file.each_line do |line|
 
               case line
 
-              # configure virtualHW ver
+              when /^memsize = /i
+                new_vmx_contents << "memsize = \"#{desired_guest_memsize}\"\n"
+
+              when /^numvcpus = /i
+                new_vmx_contents << "numvcpus = \"#{desired_guest_numvcpus}\"\n"
+
               when /^virtualHW.version = /i
-                if guest_virtualhw_version.nil?
-                  new_vmx_contents << line
-                else
-                  new_vmx_contents << "virtualHW.version = \"#{guest_virtualhw_version}\"\n"
-                  vmx_need_change_flag = true
-                end
+                new_vmx_contents << "virtualHW.version = \"#{desired_virtualhw_version}\"\n"
 
               when /^guestOS = /i
-                if config.guest_guestos.nil?
-                  new_vmx_contents << line
-                else
-                  new_vmx_contents << "guestOS = \"#{config.guest_guestos}\"\n"
-                  vmx_need_change_flag = true
-                end
+                new_vmx_contents << "guestOS = \"#{desired_guestos}\"\n"
 
-              # configure mac and nic type.
               when /^ethernet[0-9]/i
-                nicindex = line[8].to_i
-                if line.match(/^ethernet[0-9].networkName = /i)
-                  new_vmx_contents << line
-                elsif line.match(/^ethernet0.virtualDev = /i)
-                  #  Update guest_nic_type if it's set, otherwise, save eth0 guest_nic_type
-                  #  for the remaining nics.  (ovftool doesn't set it...)
-                  if guest_nic_type.nil?
-                    guest_nic_type = line.gsub(/ethernet0.virtualDev = /i, '').gsub('"', '').strip
-                    new_vmx_contents << line
-                  else
-                    new_vmx_contents << line.gsub(/ = .*$/, " = \"#{guest_nic_type}\"\n")
-                    vmx_need_change_flag = true
-                  end
-                elsif (line.match(/^ethernet[0-9].addressType = /i) &&
-                    !config.guest_mac_address[nicindex].nil?)
-                  # Update MAC address if it's set
-                  guest_mac_address = config.guest_mac_address[nicindex]
-                  if guest_mac_address =~ /^([0-9a-fA-F]{2}[:-]){5}[0-9a-fA-F]{2}$/i
-                    new_vmx_contents << line.gsub(/ = .*$/, " = \"static\"")
-                    new_vmx_contents << line.gsub(/Type = .*$/, " = \"#{guest_mac_address}\"")
-                    vmx_need_change_flag = true
-                  elsif guest_mac_address == ''
-                    new_vmx_contents << line
-                  else
-                    new_vmx_contents << line
-                  end
-                end
+                #  Delete these entries.  We'll append them later.
+
               else
                 line_changed = false
                 if config.guest_custom_vmx_settings.is_a? Array
                   env[:machine].provider_config.guest_custom_vmx_settings.each do |k, v|
                     if line =~ /#{k} = /
                       new_vmx_contents << "#{k} = \"#{v}\"\n"
-                      vmx_need_change_flag = true
                       line_changed = true
                       env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
                                            message: "Custom vmx      : Modify #{k} = \"#{v}\"")
@@ -691,25 +674,29 @@ module VagrantPlugins
               end
             end
 
-            #  For all nics, configure guest_nic_type and enable nics
-            if guest_nic_type.nil?
-              guest_nic_type = "e1000"
-            end
+            #  For all nics, configure desired_nic_type and enable nics
+            desired_nic_type = 'e1000' if desired_nic_type.nil?
+
             if config.esxi_virtual_network.is_a? Array
               number_of_adapters = config.esxi_virtual_network.count
             else
               number_of_adapters = 1
             end
 
-            1.upto(number_of_adapters) do |index|
-              nic_index = index - 1
-              unless new_vmx_contents =~ /ethernet#{nic_index}.virtualDev = \"#{guest_nic_type}\"/i
-                new_vmx_contents << "ethernet#{nic_index}.virtualDev = \"#{guest_nic_type}\"\n"
-                vmx_need_change_flag = true
-              end
-              unless new_vmx_contents =~ /ethernet#{nic_index}.present = \"TRUE\"/i
-                new_vmx_contents << "ethernet#{nic_index}.present = \"TRUE\"\n"
-                vmx_need_change_flag = true
+            0.upto(number_of_adapters - 1) do |nic_index|
+              new_vmx_contents << "ethernet#{nic_index}.networkName = \"#{@guestvm_network[nic_index]}\"\n"
+              new_vmx_contents << "ethernet#{nic_index}.virtualDev = \"#{desired_nic_type}\"\n"
+              new_vmx_contents << "ethernet#{nic_index}.present = \"TRUE\"\n"
+              if config.guest_mac_address[nic_index].nil?
+                new_vmx_contents << "ethernet#{nic_index}.addressType = \"generated\"\n"
+              else
+                guest_mac_address = config.guest_mac_address[nic_index]
+                if guest_mac_address =~ /^([0-9a-fA-F]{2}[:-]){5}[0-9a-fA-F]{2}$/i
+                  new_vmx_contents << "ethernet#{nic_index}.addressType = \"static\"\n"
+                  new_vmx_contents << "ethernet#{nic_index}.address = \"#{guest_mac_address}\"\n"
+                else
+                  new_vmx_contents << "ethernet#{nic_index}.addressType = \"generated\"\n"
+                end
               end
             end
 
@@ -718,39 +705,28 @@ module VagrantPlugins
               env[:machine].provider_config.guest_custom_vmx_settings.each do |k, v|
                 unless new_vmx_contents =~ /#{k} = /
                   new_vmx_contents << "#{k} = \"#{v}\"\n"
-                  vmx_need_change_flag = true
                   env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
                                        message: "Custom vmx      : Append #{k} = \"#{v}\"")
                 end
               end
             end
 
-            #  If there was changes, update esxi
-            if vmx_need_change_flag == true
-              if config.debug =~ %r{vmx}i
-                puts "new vmx: #{new_vmx_contents}"
-                puts "\n\n"
-              end
-              r = ''
-              ssh.open_channel do |channel|
-                channel.exec("cat >#{dst_vmx_file}") do |ch, success|
-                  raise Errors::ESXiError,
-                        message: "Unable to update vmx file.\n"\
-                                 "  #{r}" unless success
-
-                  channel.send_data(new_vmx_contents)
-                  channel.eof!
-                end
-              end
-              ssh.loop
-            else
-              if config.debug =~ %r{vmx}i
-                env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
-                                     message: 'ESXi vmx file    : Unmodified')
+            #  update vmx on esxi
+            if config.debug =~ %r{vmx}i
+              puts "new vmx: #{new_vmx_contents}"
+              puts "\n\n"
+            end
+            r = ''
+            ssh.open_channel do |channel|
+              channel.exec("cat >#{dst_vmx_file}") do |ch, success|
+                raise Errors::ESXiError,
+                      message: "Unable to update vmx file.\n"\
+                               "  #{r}" unless success
+                channel.send_data(new_vmx_contents)
+                channel.eof!
               end
             end
-
-
+            ssh.loop
 
             # Done
           end

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

@@ -39,7 +39,6 @@ module VagrantPlugins
                        " #{env[:machine_state]}")
 
           if config.saved_ipaddress.nil? or config.local_use_ip_cache == 'False'
-            puts "Determine guest IP address." if config.debug =~ %r{ip}i
 
             #  Figure out vm_ipaddress
             Net::SSH.start(config.esxi_hostname, config.esxi_username,

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

@@ -111,6 +111,7 @@ module VagrantPlugins
             #
             #  Save network configuration for provisioner to do changes.
             #
+            sleep(1)
             env[:machine].guest.capability(
                 :configure_networks, networks_to_configure)
           end

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

@@ -36,6 +36,7 @@ module VagrantPlugins
               env[:result] = 'False' # couldn't reach state in time
             end
           end
+          env[:machine].provider_config.saved_ipaddress = nil
           @app.call(env)
         end
       end

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

@@ -11,6 +11,7 @@ module VagrantPlugins
       attr_accessor :esxi_disk_store
       attr_accessor :esxi_virtual_network
       attr_accessor :esxi_resource_pool
+      attr_accessor :clone_from_vm
       attr_accessor :guest_username
       attr_accessor :guest_name
       attr_accessor :guest_name_prefix
@@ -66,6 +67,7 @@ module VagrantPlugins
         @esxi_disk_store = nil
         @esxi_virtual_network = nil
         @esxi_resource_pool = nil
+        @clone_from_vm = nil
         @guest_username = 'vagrant'
         @guest_name = nil
         @guest_name_prefix = 'V-'
@@ -152,13 +154,13 @@ module VagrantPlugins
           'debian9-64',
           'debian9',
           'dos',
-          'eComStation2',
-          'eComStation',
+          'ecomstation2',
+          'ecomstation',
           'fedora-64',
           'fedora',
           'freebsd-64',
           'freebsd',
-          'genericLinux',
+          'genericlinux',
           'mandrake',
           'mandriva-64',
           'mandriva',
@@ -167,27 +169,27 @@ module VagrantPlugins
           'netware6',
           'nld9',
           'oes',
-          'openServer5',
-          'openServer6',
+          'openserver5',
+          'openserver6',
           'opensuse-64',
           'opensuse',
-          'oracleLinux6-64',
-          'oracleLinux-64',
-          'oracleLinux6',
-          'oracleLinux7-64',
-          'oracleLinux7',
-          'oracleLinux',
+          'oraclelinux6-64',
+          'oraclelinux-64',
+          'oraclelinux6',
+          'oraclelinux7-64',
+          'oraclelinux7',
+          'oraclelinux',
           'os2',
-          'other24xLinux-64',
-          'other24xLinux',
-          'other26xLinux-64',
-          'other26xLinux',
-          'other3xLinux-64',
-          'other3xLinux',
+          'other24xlinux-64',
+          'other24xlinux',
+          'other26xlinux-64',
+          'other26xlinux',
+          'other3xlinux-64',
+          'other3xlinux',
           'other',
-          'otherGuest-64',
-          'otherLinux-64',
-          'otherLinux',
+          'otherguest-64',
+          'otherlinux-64',
+          'otherlinux',
           'redhat',
           'rhel2',
           'rhel3-64',
@@ -218,49 +220,49 @@ module VagrantPlugins
           'solaris9',
           'suse-64',
           'suse',
-          'turboLinux-64',
-          'turboLinux',
+          'turbolinux-64',
+          'turbolinux',
           'ubuntu-64',
           'ubuntu',
-          'unixWare7',
+          'unixware7',
           'vmkernel5',
           'vmkernel65',
           'vmkernel6',
           'vmkernel',
-          'vmwarePhoton-64',
-          'win2000AdvServ',
-          'win2000Pro',
-          'win2000Serv',
+          'vmwarephoton-64',
+          'win2000advserv',
+          'win2000pro',
+          'win2000serv',
           'win31',
           'win95',
           'win98',
           'windows7-64',
           'windows7',
-          'windows7Server-64',
+          'windows7server-64',
           'windows8-64',
           'windows8',
-          'windows8Server-64',
+          'windows8server-64',
           'windows9-64',
           'windows9',
-          'windows9Server-64',
-          'windowsHyperV',
-          'winLonghorn-64',
-          'winLonghorn',
-          'winMe',
-          'winNetBusiness',
-          'winNetDatacenter-64',
-          'winNetDatacenter',
-          'winNetEnterprise-64',
-          'winNetEnterprise',
-          'winNetStandard-64',
-          'winNetStandard',
-          'winNetWeb',
-          'winNT',
-          'winVista-64',
-          'winVista',
-          'winXPHome',
-          'winXPPro-64',
-          'winXPPro'
+          'windows9server-64',
+          'windowshyperv',
+          'winlonghorn-64',
+          'winlonghorn',
+          'winme',
+          'winnetbusiness',
+          'winnetdatacenter-64',
+          'winnetdatacenter',
+          'winnetenterprise-64',
+          'winnetenterprise',
+          'winnetstandard-64',
+          'winnetstandard',
+          'winnetweb',
+          'winnt',
+          'winvista-64',
+          'winvista',
+          'winxphome',
+          'winxppro-64',
+          'winxppro'
         ]
 
         # Legacy (1.x)

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

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

data/vagrant-vmware-esxi.gemspec

@@ -3,7 +3,7 @@ require File.expand_path('../lib/vagrant-vmware-esxi/version', __FILE__)
 Gem::Specification.new do |s|
   s.name            = 'vagrant-vmware-esxi'
   s.version         = VagrantPlugins::ESXi::VERSION
-  s.date            = '2018-03-21'
+  s.date            = '2018-04-01'
   s.summary         = 'Vagrant ESXi provider plugin'
   s.description     = 'A Vagrant plugin that adds a VMware ESXi provider support'
   s.authors         = ['Jonathan Senkerik']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vmware-esxi
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.1.0
 platform: ruby
 authors:
 - Jonathan Senkerik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-21 00:00:00.000000000 Z
+date: 2018-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n