vagrant-vcenter 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c18c66e41d889b3cce4ec5c4b9231dd011536073
-  data.tar.gz: 3a6ac9901f9aef28ee9184557c73354da34d77e0
+  metadata.gz: 297064f386d506f98c1ee81b435f71e21afcce8c
+  data.tar.gz: ba4e9971b70a7d6394fbdde4091e30b00dd27501
 SHA512:
-  metadata.gz: 6285240ba718d0588f6c50089feb1c601ae4d93c52263adfa4d3eb7f08d8354443de67650c1ccf3998cceeb0bb66d9716df7e0f074c3446b262bff8d7a441029
-  data.tar.gz: dceb922f02df844874eb30396c925fa1b06b1e100f64025dd124ef4a040e8dd2e72b3c30b575c2c29ee99bb647c6afe3dad95f73da36a27770f2225140640788
+  metadata.gz: e5fafe134b920ce9c684671e3f107b7f4ee2599f43510f94275536f27b9c3435daf04e756ef152e5c8aedd461104def93841d7c800a4e3767723bb429d69608f
+  data.tar.gz: 271cebf64fbe9b780422dc2ed4a1d6c1d086e5824f2f453f8d82f1e70c24edba6dbb9da285c01878ef36291761399e749de6e20fed5d2450c314c80b060df497

data/.ruby-version

@@ -0,0 +1 @@
+2.2.3

data/README.md

@@ -1,7 +1,9 @@
 [Vagrant](http://www.vagrantup.com) provider for VMware vCenter®
 =============
 
-[Version 0.3.2](../../releases/tag/v0.3.2) has been released!
+[![Join the chat at https://gitter.im/frapposelli/vagrant-vcenter](https://badges.gitter.im/frapposelli/vagrant-vcenter.svg)](https://gitter.im/frapposelli/vagrant-vcenter?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
+[Version 0.3.3](../../releases/tag/v0.3.3) has been released!
 -------------
 
 Please note that this software is still Alpha/Beta quality and is not recommended for production usage.
@@ -10,6 +12,18 @@ We have a wide array of boxes available at [Vagrant Cloud](https://vagrantcloud.
 
 This plugin supports the universal [```vmware_ovf``` box format](https://github.com/gosddc/packer-post-processor-vagrant-vmware-ovf/wiki/vmware_ovf-Box-Format), that is 100% portable between [vagrant-vcloud](https://github.com/frapposelli/vagrant-vcloud), [vagrant-vcenter](https://github.com/gosddc/vagrant-vcenter) and [vagrant-vcloudair](https://github.com/gosddc/vagrant-vcloudair), no more double boxes!.
 
+Changes in [version 0.3.3](../../releases/tag/v0.3.3) include:
+
+Changes
+
+- Configuration setting ```computer_name``` renamed to ```compute_name``` as this can be either a vSphere host or a Cluster name.
+
+Fixes
+
+-  Better error management
+-  Fixed some commands in unwanted situations (SSH when machine suspended/off)
+-  Refactored code to avoid code duplication
+
 Install
 -------------
 
@@ -64,7 +78,7 @@ Vagrant.configure('2') do |config|
       vcenter.password = 'myPassword'
       vcenter.folder_name = 'myFolderName'
       vcenter.datacenter_name = 'MyDatacenterName'
-      vcenter.computer_name = 'MyHostOrCluster'
+      vcenter.compute_name = 'MyHostOrCluster'
       vcenter.datastore_name = 'MyDatastore'
       vcenter.network_name = 'myNetworkName'
       vcenter.linked_clones = true
@@ -82,7 +96,7 @@ Vagrant.configure('2') do |config|
                              gateway: '10.250.254.254',
                              dns_server_list: ['8.8.4.4', '8.8.8.8'],
                              dns_suffix_list: ['ad.lab.gosddc.com']
-      
+
       # Let's override some provider settings for specific VMs
       node_config.vm.provider :vcenter do |override|
         # Override number of cpu and memory based on what's in the nodes array
@@ -116,4 +130,4 @@ What is still missing:
 - Some spaghetti code here and there.
 - Bugs, bugs and BUGS!.
 
-If you're a developer and want to lend us a hand, head over to our ```develop``` branch and send us PRs!
+If you're a developer and want to lend us a hand, send us PRs!

data/Rakefile

@@ -1,17 +1,7 @@
 require 'rubygems'
 require 'bundler/setup'
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
-# Immediately sync all stdout so that tools like buildbot can
-# immediately load in the output.
-$stdout.sync = true
-$stderr.sync = true
-
-# Change to the y of this file.
-Dir.chdir(File.expand_path('../', __FILE__))
-
-Bundler::GemHelper.install_tasks
-
 RSpec::Core::RakeTask.new
-
-task :default => 'spec'
+task :default => 'spec'

data/lib/vagrant-vcenter/action.rb

@@ -23,6 +23,7 @@ module VagrantPlugins
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
           b.use ConnectvCenter
+          b.use InventoryCheck
           b.use Call, IsCreated do |env, b2|
             unless env[:result]
               b2.use MessageNotCreated
@@ -30,7 +31,6 @@ module VagrantPlugins
             end
             b2.use action_halt
             b2.use action_start
-            b2.use DisconnectvCenter
           end
         end
       end
@@ -41,6 +41,7 @@ module VagrantPlugins
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
           b.use ConnectvCenter
+          b.use InventoryCheck
           b.use Call, IsRunning do |env, b2|
             # If the VM is running, then our work here is done, exit
             if env[:result]
@@ -61,9 +62,16 @@ module VagrantPlugins
       def self.action_halt
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConnectvCenter
+          b.use InventoryCheck
+
+          # If the VM suspend, Resume first
           b.use Call, IsPaused do |env, b2|
             b2.use Resume if env[:result]
-            b2.use PowerOff
+
+            # Only halt when VM is running.
+            b2.use Call, IsRunning do |env2, b3|
+              b3.use PowerOff if env2[:result]
+            end
           end
         end
       end
@@ -71,6 +79,7 @@ module VagrantPlugins
       def self.action_suspend
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConnectvCenter
+          b.use InventoryCheck
           b.use Call, IsRunning do |env, b2|
             # If the VM is stopped, can't suspend
             if !env[:result]
@@ -85,6 +94,7 @@ module VagrantPlugins
       def self.action_resume
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConnectvCenter
+          b.use InventoryCheck
           b.use Resume
         end
       end
@@ -95,6 +105,7 @@ module VagrantPlugins
             if env[:result]
               b2.use ConfigValidate
               b2.use ConnectvCenter
+              b2.use InventoryCheck
               b2.use Call, IsCreated do |env2, b3|
                 unless env2[:result]
                   b3.use MessageNotCreated
@@ -110,6 +121,7 @@ module VagrantPlugins
               b2.use MessageWillNotDestroy
             end
           end
+          # b.use DisconnectvCenter
         end
       end
 
@@ -117,6 +129,7 @@ module VagrantPlugins
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
           b.use ConnectvCenter
+          b.use InventoryCheck
           b.use Call, IsCreated do |env, b2|
             unless env[:result]
               b2.use MessageNotCreated
@@ -136,6 +149,7 @@ module VagrantPlugins
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
           b.use ConnectvCenter
+          b.use InventoryCheck
           b.use ReadSSHInfo
         end
       end
@@ -147,6 +161,7 @@ module VagrantPlugins
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
           b.use ConnectvCenter
+          b.use InventoryCheck
           b.use ReadState
         end
       end
@@ -155,6 +170,7 @@ module VagrantPlugins
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
           b.use ConnectvCenter
+          b.use InventoryCheck
           b.use Call, IsCreated do |env, b2|
             unless env[:result]
               b2.use MessageNotCreated
@@ -169,6 +185,7 @@ module VagrantPlugins
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
           b.use ConnectvCenter
+          b.use InventoryCheck
           b.use Call, IsCreated do |env, b2|
             unless env[:result]
               b2.use MessageNotCreated
@@ -182,10 +199,10 @@ module VagrantPlugins
       def self.action_up
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
-          b.use ConnectvCenter
           b.use Call, IsCreated do |env, b2|
             b2.use HandleBox unless env[:result]
           end
+          b.use ConnectvCenter
           b.use InventoryCheck
           b.use Call, IsCreated do |env, b2|
             b2.use BuildVM unless env[:result]

data/lib/vagrant-vcenter/action/announce_ssh_exec.rb

@@ -8,9 +8,16 @@ module VagrantPlugins
         end
 
         def call(env)
+          if env[:machine].state.id != :running
+            fail Errors::MachineNotRunning,
+                 :machine_name => env[:machine].name
+          end
+
           ssh_info = env[:machine].ssh_info
-          env[:ui].success('External IP for ' +
-                           "#{env[:machine].name}: #{ssh_info[:host]}")
+          env[:ui].success(
+            "External IP for #{env[:machine].name}: #{ssh_info[:host]}"
+          )
+
           super
         end
       end

data/lib/vagrant-vcenter/action/build_vm.rb

@@ -1,6 +1,3 @@
-require 'securerandom'
-require 'etc'
-
 module VagrantPlugins
   module VCenter
     module Action
@@ -15,45 +12,36 @@ module VagrantPlugins
           # FIXME: we need to find a way to clean things up when a SIGINT get
           # called... see env[:interrupted] in the vagrant code
 
-          config = env[:machine].provider_config
+          cfg = env[:machine].provider_config
           vm_name = env[:machine].name
 
-          # FIXME: Raise a correct exception
-          dc = config.vcenter_cnx.serviceInstance.find_datacenter(
-            config.datacenter_name) or abort 'datacenter not found'
-
-          if env[:machine].box.name.to_s.include? '/'
-            box_file = env[:machine].box.name.rpartition('/').last.to_s
-            box_name = env[:machine].box.name.to_s.gsub(/\//, '-')
+          if env[:machine].box.name.include? '/'
+            # box_file = env[:machine].box.name.rpartition('/').last
+            box_name = env[:machine].box.name.gsub(/\//, '-')
           else
-            box_file = env[:machine].box.name.to_s
+            box_file = env[:machine].box.name
             box_name = box_file
           end
 
-          if config.template_folder_name.nil?
+          if cfg.template_folder_name.nil?
             box_to_search = box_name
           else
-            box_to_search = config.template_folder_name + '/' +
-                            box_name
+            box_to_search = cfg.template_folder_name + '/' + box_name
           end
 
-          # FIXME: Raise a correct exception
-          computer = dc.find_compute_resource(
-                        config.computer_name) or fail 'Host not found'
-
-          if config.resourcepool_name
-            rp = computer.resourcePool.resourcePool.find {
-              |f| f.name == config.resourcepool_name
+          if cfg.resourcepool_name
+            cfg.compute_rp = compute.resourcePool.resourcePool.find {
+              |f| f.name == cfg.resourcepool_name
             }
           else
-            rp = computer.resourcePool
+            cfg.compute_rp = cfg.compute.resourcePool
           end
 
-          # FIXME: Raise a correct exception
-          template = dc.find_vm(
-                        box_to_search) or abort 'VM not found'
+          template = cfg.datacenter.find_vm(box_to_search) or
+                     fail Errors::VMNotFound,
+                          :vm_name => box_to_search
 
-          if config.linked_clones
+          if cfg.linked_clones
             @logger.debug('DOING LINKED CLONE!')
             # The API for linked clones is quite strange. We can't create a
             # linked straight from any VM. The disks of the VM for which we can
@@ -64,18 +52,20 @@ module VagrantPlugins
             # Thus, this code first create a delta disk on top of the base disk
             # for the to-be-cloned VM, if delta disks aren't used already.
             disks = template.config.hardware.device.grep(
-                    RbVmomi::VIM::VirtualDisk)
+              RbVmomi::VIM::VirtualDisk
+            )
+
             disks.select { |x| x.backing.parent.nil? }.each do |disk|
               spec = {
                 :deviceChange => [
                   {
-                    :operation => :remove,
-                    :device => disk
+                    :operation  => :remove,
+                    :device     => disk
                   },
                   {
-                    :operation => :add,
-                    :fileOperation => :create,
-                    :device => disk.dup.tap do |x|
+                    :operation      => :add,
+                    :fileOperation  => :create,
+                    :device         => disk.dup.tap do |x|
                       x.backing = x.backing.dup
                       x.backing.fileName = "[#{disk.backing.datastore.name}]"
                       x.backing.parent = disk.backing
@@ -87,49 +77,57 @@ module VagrantPlugins
             end
 
             relocate_spec = RbVmomi::VIM.VirtualMachineRelocateSpec(
-                            :diskMoveType => :moveChildMostDiskBacking,
-                            :pool => rp)
+              :diskMoveType => :moveChildMostDiskBacking,
+              :pool         => cfg.compute_rp
+            )
           else
             relocate_spec = RbVmomi::VIM.VirtualMachineRelocateSpec(
-                            :pool => rp)
+              :pool => cfg.compute_rp
+            )
           end
 
           @logger.debug("Relocate Spec: #{relocate_spec.pretty_inspect}")
 
           spec = RbVmomi::VIM.VirtualMachineCloneSpec(
-                 :location => relocate_spec,
-                 :powerOn => false,
-                 :template => false)
-          
-          if config.vm_network_name or config.num_cpu or config.memory
+            :location   => relocate_spec,
+            :powerOn    => false,
+            :template   => false
+          )
+
+          if cfg.vm_network_name || cfg.num_cpu || cfg.memory
             config_spec = RbVmomi::VIM.VirtualMachineConfigSpec
-            config_spec.numCPUs = config.num_cpu if config.num_cpu
-            config_spec.memoryMB = config.memory if config.memory
-          
-            if config.vm_network_name
-              # First we must find the specified network
-              network = dc.network.find { |f| f.name == config.vm_network_name } or
-                  abort "Could not find network with name #{config.vm_network_name} to join vm to" 
+            config_spec.numCPUs = cfg.num_cpu if cfg.num_cpu
+            config_spec.memoryMB = cfg.memory if cfg.memory
+
+            if cfg.vm_network_name
               card = template.config.hardware.device.grep(
-                         RbVmomi::VIM::VirtualEthernetCard).first or 
-                         abort "could not find network card to customize"
-              if config.vm_network_type == "DistributedVirtualSwitchPort"
-                switch_port = RbVmomi::VIM.DistributedVirtualSwitchPortConnection(
-                              :switchUuid => network.config.distributedVirtualSwitch.uuid,
-                              :portgroupKey => network.key)
+                RbVmomi::VIM::VirtualEthernetCard
+              ).first or abort 'could not find network card to customize'
+
+              if cfg.vm_network_type == 'DistributedVirtualSwitchPort'
+                switch_port =
+                RbVmomi::VIM.DistributedVirtualSwitchPortConnection(
+                  :switchUuid   => cfg.network.config.distributedVirtualSwitch.uuid,
+                  :portgroupKey => cfg.network.key
+                )
                 card.backing = RbVmomi::VIM.VirtualEthernetCardDistributedVirtualPortBackingInfo(
-                               :port => switch_port)
-              end 
-              dev_spec = RbVmomi::VIM.VirtualDeviceConfigSpec(:device => card, :operation => "edit")
+                  :port => switch_port
+                )
+              end
+
+              dev_spec = RbVmomi::VIM.VirtualDeviceConfigSpec(
+                :device     => card,
+                :operation  => 'edit'
+              )
               config_spec.deviceChange = [dev_spec]
             end
 
             spec.config = config_spec
           end
 
-          if config.enable_vm_customization
+          if cfg.enable_vm_customization
             public_networks = env[:machine].config.vm.networks.select {
-                                |n| n[0].eql? :public_network
+              |n| n[0].eql? :public_network
             }
 
             network_spec = public_networks.first[1] unless public_networks.empty?
@@ -137,70 +135,74 @@ module VagrantPlugins
             @logger.debug("This is our network #{public_networks.inspect}")
 
             if network_spec
-
               # Check for sanity and validation of network parameters.
-
-              # Specify ip but no netmask
-              if network_spec[:ip] && !network_spec[:netmask]
-                fail Errors::WrongNetworkSpec
-              end
-
-              # specify netmask but no ip
-              if !network_spec[:ip] && network_spec[:netmask]
+              if (network_spec[:ip] && !network_spec[:netmask]) ||
+                 (!network_spec[:ip] && network_spec[:netmask])
                 fail Errors::WrongNetworkSpec
               end
 
               global_ip_settings = RbVmomi::VIM.CustomizationGlobalIPSettings(
-                    :dnsServerList => network_spec[:dns_server_list],
-                    :dnsSuffixList => network_spec[:dns_suffix_list])
+                :dnsServerList => network_spec[:dns_server_list],
+                :dnsSuffixList => network_spec[:dns_suffix_list]
+              )
 
               # if no ip and no netmask, let's default to dhcp
               if !network_spec[:ip] && !network_spec[:netmask]
                 adapter = RbVmomi::VIM.CustomizationIPSettings(
-                          :ip => RbVmomi::VIM.CustomizationDhcpIpGenerator())
+                  :ip => RbVmomi::VIM.CustomizationDhcpIpGenerator()
+                )
               else
                 adapter = RbVmomi::VIM.CustomizationIPSettings(
-                          :gateway => [network_spec[:gateway]],
-                          :ip => RbVmomi::VIM.CustomizationFixedIp(
-                                :ipAddress => network_spec[:ip]),
-                          :subnetMask => network_spec[:netmask])
+                  :gateway    => [network_spec[:gateway]],
+                  :ip         => RbVmomi::VIM.CustomizationFixedIp(
+                      :ipAddress => network_spec[:ip]
+                  ),
+                  :subnetMask => network_spec[:netmask]
+                )
               end
 
-              nic_map = [RbVmomi::VIM.CustomizationAdapterMapping(
-                         :adapter => adapter)]
+              nic_map = [
+                RbVmomi::VIM.CustomizationAdapterMapping(:adapter => adapter)
+              ]
             end
 
-            if config.prep_type.downcase == 'linux'
+            if cfg.prep_type.downcase == 'linux'
               prep = RbVmomi::VIM.CustomizationLinuxPrep(
-                     :domain => env[:machine].name.to_s.sub(/^[^.]+\./, ''),
-                     :hostName => RbVmomi::VIM.CustomizationFixedName(
-                                  :name => env[:machine].name.to_s.split('.')[0]))
-            elsif config.prep_type.downcase == 'windows'
+                :domain   => env[:machine].name.to_s.sub(/^[^.]+\./, ''),
+                :hostName => RbVmomi::VIM.CustomizationFixedName(
+                  :name => env[:machine].name.to_s.split('.')[0]
+                )
+              )
+            elsif cfg.prep_type.downcase == 'windows'
               prep = RbVmomi::VIM.CustomizationSysprep(
-                      :guiUnattended => RbVmomi::VIM.CustomizationGuiUnattended(
-                        :autoLogon => false,
-                        :autoLogonCount => 0,
-                        :timeZone => 004
-                      ),
-                      :identification => RbVmomi::VIM.CustomizationIdentification(),
-                      :userData => RbVmomi::VIM.CustomizationUserData(
-                        :computerName => RbVmomi::VIM.CustomizationFixedName(
-                          :name => env[:machine].name.to_s.split('.')[0]),
-                        :fullName => 'Vagrant',
-                        :orgName => 'Vagrant',
-                        :productId => 'XXXXX-XXXXX-XXXXX-XXXXX-XXXXX'
-                  )
+                :guiUnattended => RbVmomi::VIM.CustomizationGuiUnattended(
+                  :autoLogon      => false,
+                  :autoLogonCount => 0,
+                  :timeZone       => 004
+                ),
+                :identification => RbVmomi::VIM.CustomizationIdentification(),
+                :userData => RbVmomi::VIM.CustomizationUserData(
+                  :computerName => RbVmomi::VIM.CustomizationFixedName(
+                    :name => env[:machine].name.to_s.split('.')[0]
+                  ),
+                  :fullName     => 'Vagrant',
+                  :orgName      => 'Vagrant',
+                  :productId    => 'XXXXX-XXXXX-XXXXX-XXXXX-XXXXX'
+                )
               )
-            else 
-              fail "specification type #{config.prep_type} not supported"
+            else
+              fail Errors::GuestCustomNotSupported,
+                   :type => cfg.prep_type
             end
 
             if prep && network_spec
-              # If prep and network specification are present, let's do a full config
+              # If prep and network specification are present,
+              # -> Do a full config
               cust_spec = RbVmomi::VIM.CustomizationSpec(
-                          :globalIPSettings => global_ip_settings,
-                          :identity => prep,
-                          :nicSettingMap => nic_map)
+                :globalIPSettings => global_ip_settings,
+                :identity         => prep,
+                :nicSettingMap    => nic_map
+              )
 
               spec.customization = cust_spec
 
@@ -208,18 +210,22 @@ module VagrantPlugins
               # If no network specifications, default to dhcp
               global_ip_settings = RbVmomi::VIM.CustomizationGlobalIPSettings(
                 :dnsServerList => [],
-                :dnsSuffixList => [])
+                :dnsSuffixList => []
+              )
 
               adapter = RbVmomi::VIM.CustomizationIPSettings(
-                :ip => RbVmomi::VIM.CustomizationDhcpIpGenerator())
+                :ip => RbVmomi::VIM.CustomizationDhcpIpGenerator()
+              )
 
-              nic_map = [RbVmomi::VIM.CustomizationAdapterMapping(
-                 :adapter => adapter)]
+              nic_map = [
+                RbVmomi::VIM.CustomizationAdapterMapping(:adapter => adapter)
+              ]
 
               cust_spec = RbVmomi::VIM.CustomizationSpec(
-                          :globalIPSettings => global_ip_settings,
-                          :identity => prep,
-                          :nicSettingMap => nic_map)
+                :globalIPSettings => global_ip_settings,
+                :identity         => prep,
+                :nicSettingMap    => nic_map
+              )
 
               spec.customization = cust_spec
             end
@@ -227,10 +233,12 @@ module VagrantPlugins
             @logger.debug("Spec: #{spec.pretty_inspect}")
           end
 
-          @logger.debug("disable_auto_vm_name: #{config.disable_auto_vm_name}")
+          @logger.debug("disable_auto_vm_name: #{cfg.disable_auto_vm_name}")
 
-          if config.disable_auto_vm_name || config.disable_auto_vm_name == 'true'
-            vm_target = vm_name.to_s
+          # Not recommended in a vSphere environment where VM names might
+          # conflict a lot if used in the same vm folder namespace
+          if cfg.disable_auto_vm_name == true
+            vm_target = vm_name
           else
             vm_target = "Vagrant-#{Etc.getlogin}-" +
                         "#{vm_name}-#{Socket.gethostname.downcase}-" +
@@ -242,21 +250,24 @@ module VagrantPlugins
           # FIXME: vm.parent brings us to the template folder, fix this with
           # folder_path.
 
-          root_vm_folder = dc.vmFolder
-          vm_folder = root_vm_folder
-          unless config.folder_name.nil?
+          vm_folder = cfg.vmfolder
+          unless cfg.folder_name.nil?
             begin
               # Better ask for forgiveness than permission ;-)
-              @logger.debug("Creating folder #{config.folder_name}.")
-              vm_folder = root_vm_folder.traverse(config.folder_name,
-                                                  RbVmomi::VIM::Folder,
-                                                  create = true)
+              @logger.debug("Creating folder #{cfg.folder_name}.")
+              vm_folder = cfg.vmfolder.traverse(
+                cfg.folder_name,
+                RbVmomi::VIM::Folder,
+                create = true
+              )
             # FIXME: we should trap the correct exception
             rescue RbVmomi::Fault
               # if somebody else created the folder already...
-              @logger.debug("Folder #{config.folder_name} already exists.")
-              vm_folder = root_vm_folder.traverse(config.folder_name,
-                                                  RbVmomi::VIM::Folder)
+              @logger.debug("Folder #{cfg.folder_name} already exists.")
+              vm_folder = cfg.vmfolder.traverse(
+                cfg.folder_name,
+                RbVmomi::VIM::Folder
+              )
             end
           end
           @logger.debug("folder for VM: #{vm_folder}")
@@ -264,21 +275,23 @@ module VagrantPlugins
           env[:ui].info('Creating VM...')
 
           template.CloneVM_Task(
-                                :folder => vm_folder,
-                                :name => vm_target,
-                                :spec => spec).wait_for_completion
+            :folder => vm_folder,
+            :name   => vm_target,
+            :spec   => spec
+          ).wait_for_completion
 
-          if config.folder_name.nil?
-            vm_to_search = vm_target
+          if cfg.folder_name.nil?
+            vm_to_search = vm_target.to_s
           else
-            vm_to_search = config.folder_name + '/' + vm_target
+            vm_to_search = cfg.folder_name + '/' + vm_target.to_s
           end
 
           @logger.debug("VM to search: #{vm_to_search}")
 
-          # FIXME: Raise a correct exception
-          env[:machine].id = dc.find_vm(
-                            vm_to_search).config.uuid or abort 'VM not found'
+          env[:machine].id = cfg.datacenter.find_vm(
+            vm_to_search
+          ).config.uuid or fail Errors::VMNotFound,
+                                :vm_name => vm_to_search
 
           @app.call env
         end