chef-provisioning-vsphere 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 990036a8b6dcc42e111ed4acb92aa90c5fe59f1d
-  data.tar.gz: 2767a8e7fd769b90954e57b06eecccfa0fd29736
+  metadata.gz: 9beead24ca50feddc1b634a8d2f8a5c43936c7c2
+  data.tar.gz: 41c0ef964853c87cee814f127cc446b4ac383bd6
 SHA512:
-  metadata.gz: 0784aeb6843b433d16f5aa93aee499e55ed0aad8b2dd6b8c6378258d9c504ac78fcac3d6cf7e4abdda19e580b6c58ce8a58853db7d2342ab38a943f51e91329c
-  data.tar.gz: e68182faff627baf71b3b0074cc14fac995908123f0bcdef2e263b70cd147496a40fb299b7d9797fd31da826f37176bc7ab9781bd6fb8a2b045a913b6742f0b2
+  metadata.gz: adc8fd6c36acc6cbcdada4c027290049ebc623334f1eeeb7f92a2fc4b6615b9f1f25f8880ab97559d9ad2da09c9b4ef73c34758c12f25d90f14d7689f700912d
+  data.tar.gz: dc0a7bfae64f5d89262b77d187304b81c709818e83e74d8d178c1fe5ab7b23d7233cf81dab9cc3457da9e364292b7e53eafbc48c5d88219466f40f064b4550cf

data/LICENSE-Rally

@@ -0,0 +1,20 @@
+Copyright (c) 2014 Rally Software Development Corp
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/contribution-notice

@@ -0,0 +1,7 @@
+Contribution Notice
+ 
+By contributing to this Project, You grant to CenturyLink and to recipients of software distributed by CenturyLink, a perpetual worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, sublicense, and distribute your contributions to this Project (“Your Contributions”), including derivative works thereof.
+
+You grant to CenturyLink and to recipients of software distributed by CenturyLink a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section), patent license to make, have made, use, offer to sell, sell, import and otherwise transfer Your Contributions, where such license applies only to those patent claims licensable by You that are necessarily infringed by Your Contributions(s) alone or by combination of Your Contribution(s) with this Project.  If any entity institutes patent litigation against You or any other entity (including a cross-claim or counterclaim in a lawsuit) alleging that Your Contribution, or this Project, constitutes direct or contributory patent infringement, then any patent licenses granted to that entity under this agreement for Your Contribution or this Project shall terminate as of the date such litigation is filed.
+ 
+You represent that each of Your Contributions is Your original creation and represent that You are legally entitled to grant the above license and that no other third party permission is required. If your employer(s) has rights to intellectual property that is included in Your Contributions, You represent that You have received permission to make such contributions on behalf of that employer.

data/lib/chef/provisioning/vsphere_driver/driver.rb

@@ -155,7 +155,6 @@ module ChefProvisioningVsphere
 
     def find_or_create_vm(bootstrap_options, machine_spec, action_handler)
       vm = find_vm(
-        bootstrap_options[:datacenter],
         bootstrap_options[:vm_folder],
         machine_spec.name
       )
@@ -167,7 +166,11 @@ module ChefProvisioningVsphere
           'already created'
         )
       else
-        vm = clone_vm(action_handler, bootstrap_options, machine_spec.name)
+        vm = clone_vm(
+          action_handler,
+          bootstrap_options,
+          machine_spec.name
+        )
       end
       vm
     end
@@ -185,8 +188,7 @@ module ChefProvisioningVsphere
     end
 
     def ready_machine(action_handler, machine_spec, machine_options)
-      start_machine(action_handler, machine_spec, machine_options)
-      vm = vm_for(machine_spec)
+      vm = start_machine(action_handler, machine_spec, machine_options)
       if vm.nil?
         raise "Machine #{machine_spec.name} does not have a server "\
         'associated with it, or server does not exist.'
@@ -385,6 +387,7 @@ module ChefProvisioningVsphere
           start_vm(vm, machine_options[:bootstrap_options][:ssh][:port])
         end
       end
+      vm
     end
 
     def restart_server(action_handler, machine_spec, vm)
@@ -467,16 +470,13 @@ module ChefProvisioningVsphere
     end
 
     def clone_vm(action_handler, bootstrap_options, machine_name)
-      datacenter = bootstrap_options[:datacenter]
-
-      vm = find_vm(datacenter, bootstrap_options[:vm_folder], machine_name)
+      vm = find_vm(bootstrap_options[:vm_folder], machine_name)
       return vm if vm
 
       vm_template = vm_template_for(bootstrap_options)
 
       do_vm_clone(
         action_handler,
-        datacenter,
         vm_template,
         machine_name,
         bootstrap_options
@@ -484,10 +484,10 @@ module ChefProvisioningVsphere
     end
 
     def vm_template_for(bootstrap_options)
-      datacenter      = bootstrap_options[:datacenter]
       template_folder = bootstrap_options[:template_folder]
       template_name   = bootstrap_options[:template_name]
-      find_vm(datacenter, template_folder, template_name) or raise("vSphere VM Template not found [#{template_folder}/#{template_name}]")
+      find_vm(template_folder, template_name) ||
+        raise("vSphere VM Template not found [#{template_folder}/#{template_name}]")
     end
 
     def machine_for(machine_spec, machine_options)

data/lib/chef/provisioning/vsphere_driver/version.rb

@@ -1,3 +1,3 @@
 module ChefProvisioningVsphere
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

data/lib/chef/provisioning/vsphere_driver/vsphere_helpers.rb

@@ -26,13 +26,18 @@ module ChefProvisioningVsphere
       @current_connection
     end
 
-    def find_vm(dc_name, vm_folder, vm_name)
-      folder = find_folder(dc_name, vm_folder) or raise("vSphere Folder not found [#{vm_folder}] for vm #{vm_name}")
+    def find_vm(vm_folder, vm_name)
+      folder = find_folder(vm_folder) ||
+        raise("vSphere Folder not found [#{vm_folder}] for vm #{vm_name}")
       vm     = folder.find(vm_name, RbVmomi::VIM::VirtualMachine)
     end
 
     def find_vm_by_id(uuid, connection = vim)
-      vm = connection.searchIndex.FindByUuid({:uuid => uuid, :vmSearch => true, :instanceUuid => true})
+      vm = connection.searchIndex.FindByUuid(
+        uuid: uuid,
+        vmSearch: true,
+        instanceUuid: true
+      )
     end
 
     def vm_started?(vm, wait_on_port = 22)
@@ -92,21 +97,23 @@ module ChefProvisioningVsphere
     end
 
     #folder could be like:  /Level1/Level2/folder_name
-    def find_folder(dc_name, folder_name)
-      baseEntity = dc(dc_name).vmFolder
+    def find_folder(folder_name)
+      base = datacenter.vmFolder
       if folder_name && folder_name.length > 0
-        entityArray = folder_name.split('/')
-        entityArray.each do |entityArrItem|
-          if entityArrItem != ''
-            baseEntity = baseEntity.childEntity.grep(RbVmomi::VIM::Folder).find { |f| f.name == entityArrItem }
+        entityArray = folder_name.split('/').reject(&:empty?)
+        entityArray.each do |item|
+          base = base.childEntity.grep(RbVmomi::VIM::Folder).find do |f|
+            f.name == item
           end
         end
       end
-      baseEntity
+      base
     end
 
-    def dc(dc_name)
-      vim.serviceInstance.find_datacenter(dc_name) or raise("vSphere Datacenter not found [#{dc_name}]")
+    def datacenter
+      dc_name = config[:machine_options][:bootstrap_options][:datacenter]
+      @datacenter ||= vim.serviceInstance.find_datacenter(dc_name) ||
+        raise("vSphere Datacenter not found [#{dc_name}]")
     end
 
     def network_adapter_for(operation, network_name, network_label, device_key, backing_info)
@@ -116,7 +123,7 @@ module ChefProvisioningVsphere
         :startConnected => true)
       device = RbVmomi::VIM::VirtualVmxnet3(
         :backing => backing_info,
-        :deviceInfo => RbVmomi::VIM::Description(:label => network_label, :summary => network_name),
+        :deviceInfo => RbVmomi::VIM::Description(:label => network_label, :summary => network_name.split('/').last),
         :key => device_key,
         :connectable => connectable)
       RbVmomi::VIM::VirtualDeviceConfigSpec(
@@ -128,11 +135,11 @@ module ChefProvisioningVsphere
       vm.config.hardware.device.select {|d| d.is_a?(RbVmomi::VIM::VirtualEthernetCard)}
     end
 
-    def do_vm_clone(action_handler, dc_name, vm_template, vm_name, options)
+    def do_vm_clone(action_handler, vm_template, vm_name, options)
       deviceAdditions = []
 
       clone_spec = RbVmomi::VIM.VirtualMachineCloneSpec(
-        location: relocate_spec_for(dc_name, vm_template, options),
+        location: relocate_spec_for(vm_template, options),
         powerOn: false,
         template: false,
         config: RbVmomi::VIM.VirtualMachineConfigSpec(
@@ -163,11 +170,11 @@ module ChefProvisioningVsphere
 
       vm_template.CloneVM_Task(
         name: vm_name,
-        folder: find_folder(dc_name, options[:vm_folder]),
+        folder: find_folder(options[:vm_folder]),
         spec: clone_spec
       ).wait_for_completion
 
-      vm = find_vm(dc_name, options[:vm_folder], vm_name)
+      vm = find_vm(options[:vm_folder], vm_name)
 
       if options[:additional_disk_size_gb].to_i > 0
         task = vm.ReconfigVM_Task(:spec => RbVmomi::VIM.VirtualMachineConfigSpec(:deviceChange => [virtual_disk_for(vm, options)]))
@@ -201,13 +208,12 @@ module ChefProvisioningVsphere
       end
     end
 
-    def relocate_spec_for(dc_name, vm_template, options)
-      datacenter = dc(dc_name)
+    def relocate_spec_for(vm_template, options)
       if options.has_key?(:host)
-        host = find_host(datacenter, options[:host])
+        host = find_host(options[:host])
         rspec = RbVmomi::VIM.VirtualMachineRelocateSpec(host: host) 
       else
-        pool = options[:resource_pool] ? find_pool(datacenter, options[:resource_pool]) : vm_template.resourcePool
+        pool = options[:resource_pool] ? find_pool(options[:resource_pool]) : vm_template.resourcePool
         rspec = RbVmomi::VIM.VirtualMachineRelocateSpec(pool: pool)
         raise 'either :host or :resource_pool must be specified when cloning from a VM Template' if pool.nil?
       end
@@ -218,55 +224,55 @@ module ChefProvisioningVsphere
       end
 
       unless options[:datastore].to_s.empty?
-        rspec.datastore = find_datastore(datacenter, options[:datastore])
+        rspec.datastore = find_datastore(options[:datastore])
       end
 
       rspec
     end
 
     def create_delta_disk(vm_template)
-        disks = vm_template.config.hardware.device.grep(RbVmomi::VIM::VirtualDisk)
-        disks.select { |disk| disk.backing.parent == nil }.each do |disk|
-          spec = {
-              :deviceChange => [
-                  {
-                      :operation => :remove,
-                      :device => disk
-                  },
-                  {
-                      :operation => :add,
-                      :fileOperation => :create,
-                      :device => disk.dup.tap { |new_disk|
-                        new_disk.backing = new_disk.backing.dup
-                        new_disk.backing.fileName = "[#{disk.backing.datastore.name}]"
-                        new_disk.backing.parent = disk.backing
-                      },
-                  }
-              ]
-          }
-          vm_template.ReconfigVM_Task(:spec => spec).wait_for_completion
-          end
+      disks = vm_template.config.hardware.device.grep(RbVmomi::VIM::VirtualDisk)
+      disks.select { |disk| disk.backing.parent == nil }.each do |disk|
+        spec = {
+          :deviceChange => [
+            {
+              :operation => :remove,
+              :device => disk
+            },
+            {
+              :operation => :add,
+              :fileOperation => :create,
+              :device => disk.dup.tap { |new_disk|
+                new_disk.backing = new_disk.backing.dup
+                new_disk.backing.fileName = "[#{disk.backing.datastore.name}]"
+                new_disk.backing.parent = disk.backing
+              },
+            }
+          ]
+        }
+        vm_template.ReconfigVM_Task(:spec => spec).wait_for_completion
+        end
       end
 
     def virtual_disk_for(vm, options)
       if options[:datastore].to_s.empty? 
-        raise ":datastore must be specified when adding a disk to a cloned vm"
+        raise ':datastore must be specified when adding a disk to a cloned vm'
       end
       idx = vm.disks.count
       RbVmomi::VIM::VirtualDeviceConfigSpec(
-            :operation     => :add,
-            :fileOperation => :create,
-            :device        => RbVmomi::VIM.VirtualDisk(
-              :key           => idx,
-              :backing       => RbVmomi::VIM.VirtualDiskFlatVer2BackingInfo(
-                :fileName        => "[#{options[:datastore]}]",
-                :diskMode        => 'persistent',
-                :thinProvisioned => true
-              ),
-              :capacityInKB  => options[:additional_disk_size_gb] * 1024 * 1024,
-              :controllerKey => 1000,
-              :unitNumber    => idx
-            )
+        :operation     => :add,
+        :fileOperation => :create,
+        :device        => RbVmomi::VIM.VirtualDisk(
+          :key           => idx,
+          :backing       => RbVmomi::VIM.VirtualDiskFlatVer2BackingInfo(
+            :fileName        => "[#{options[:datastore]}]",
+            :diskMode        => 'persistent',
+            :thinProvisioned => true
+          ),
+          :capacityInKB  => options[:additional_disk_size_gb] * 1024 * 1024,
+          :controllerKey => 1000,
+          :unitNumber    => idx
+        )
       )
     end
 
@@ -283,7 +289,7 @@ module ChefProvisioningVsphere
       key = 4000
       networks.each_index do | i |
         label = "Ethernet #{i+1}"
-        backing_info = backing_info_for(action_handler, dc(options[:datacenter]), networks[i])
+        backing_info = backing_info_for(action_handler, networks[i])
         if card = cards.shift
           key = card.key
           operation = RbVmomi::VIM::VirtualDeviceConfigSpecOperation('edit')
@@ -301,73 +307,76 @@ module ChefProvisioningVsphere
       [additions, changes]
     end
 
-    def backing_info_for(action_handler, datacenter, network_name)
-      networks = datacenter.network.select {|net| net.name == network_name}
-      if networks.count > 0
-        dpg = networks.select { |net| net.is_a?(RbVmomi::VIM::DistributedVirtualPortgroup) }
-        networks = dpg unless dpg.empty?
-      end
-      action_handler.report_progress "network: #{network_name} is a #{networks[0].class}}"
-      if networks[0].is_a?(RbVmomi::VIM::DistributedVirtualPortgroup)
+    def backing_info_for(action_handler, network_name)
+      network = find_network(network_name)
+      action_handler.report_progress(
+        "network: #{network_name} is a #{network.class}")
+      if network.is_a?(RbVmomi::VIM::DistributedVirtualPortgroup)
         port = RbVmomi::VIM::DistributedVirtualSwitchPortConnection(
-          :switchUuid => networks[0].config.distributedVirtualSwitch.uuid,
-          :portgroupKey => networks[0].key
+          :switchUuid => network.config.distributedVirtualSwitch.uuid,
+          :portgroupKey => network.key
         )
-        RbVmomi::VIM::VirtualEthernetCardDistributedVirtualPortBackingInfo(:port => port)
+        RbVmomi::VIM::VirtualEthernetCardDistributedVirtualPortBackingInfo(
+          :port => port)
       else
-        RbVmomi::VIM::VirtualEthernetCardNetworkBackingInfo(:deviceName => network_name)
+        RbVmomi::VIM::VirtualEthernetCardNetworkBackingInfo(
+          deviceName: network_name.split('/').last)
       end
     end
 
-    def find_datastore(dc, datastore_name)
-        baseEntity = dc.datastore
-        baseEntity.find { |f| f.info.name == datastore_name } or raise "no such datastore #{datastore_name}"    
+    def find_datastore(datastore_name)
+      datacenter.datastore.find { |f| f.info.name == datastore_name } or raise "no such datastore #{datastore_name}"
     end
 
     def customization_options_from(action_handler, vm_template, vm_name, options)
       if options.has_key?(:customization_spec)
         if(options[:customization_spec].is_a?(Hash))
-            cust_options = options[:customization_spec]
-            raise ArgumentError, "domain is required" unless cust_options.key?(:domain)
-            cust_ip_settings = nil
-            if cust_options.key?(:ipsettings) and cust_options[:ipsettings].key?(:ip)
-              raise ArgumentError, "ip and subnetMask is required for static ip" unless cust_options[:ipsettings].key?(:ip) and
-                                                                                        cust_options[:ipsettings].key?(:subnetMask)
-              cust_ip_settings = RbVmomi::VIM::CustomizationIPSettings.new(cust_options[:ipsettings])
-              action_handler.report_progress "customizing #{vm_name} with static IP #{cust_options[:ipsettings][:ip]}"
-              cust_ip_settings.ip = RbVmomi::VIM::CustomizationFixedIp(:ipAddress => cust_options[:ipsettings][:ip])
-            end
-            cust_domain = cust_options[:domain]
-            if cust_ip_settings.nil?
-              cust_ip_settings= RbVmomi::VIM::CustomizationIPSettings.new(:ip => RbVmomi::VIM::CustomizationDhcpIpGenerator.new())
-              cust_ip_settings.dnsServerList = cust_options[:ipsettings][:dnsServerList]
-              action_handler.report_progress "customizing #{vm_name} with dynamic IP and DNS: #{cust_options[:ipsettings][:dnsServerList]}"
+          cust_options = options[:customization_spec]
+          ip_settings = cust_options[:ipsettings]
+          cust_domain = cust_options[:domain]
+
+          raise ArgumentError, 'domain is required' unless cust_domain
+          cust_ip_settings = nil
+          if ip_settings && ip_settings.key?(:ip)
+            unless cust_options[:ipsettings].key?(:subnetMask)
+              raise ArgumentError, 'subnetMask is required for static ip'
             end
+            cust_ip_settings = RbVmomi::VIM::CustomizationIPSettings.new(ip_settings)
+            action_handler.report_progress "customizing #{vm_name} with static IP #{ip_settings[:ip]}"
+            cust_ip_settings.ip = RbVmomi::VIM::CustomizationFixedIp(:ipAddress => ip_settings[:ip])
+          end
+          if cust_ip_settings.nil?
+            cust_ip_settings= RbVmomi::VIM::CustomizationIPSettings.new(:ip => RbVmomi::VIM::CustomizationDhcpIpGenerator.new())
+            cust_ip_settings.dnsServerList = ip_settings[:dnsServerList]
+            action_handler.report_progress "customizing #{vm_name} with dynamic IP and DNS: #{ip_settings[:dnsServerList]}"
+          end
 
-            cust_ip_settings.dnsDomain = cust_domain
-            cust_global_ip_settings = RbVmomi::VIM::CustomizationGlobalIPSettings.new
-            cust_global_ip_settings.dnsServerList = cust_ip_settings.dnsServerList
-            cust_global_ip_settings.dnsSuffixList = [cust_domain]
-            cust_hostname = hostname_from(options[:customization_spec], vm_name)
-            cust_hwclockutc = cust_options[:hw_clock_utc]
-            cust_timezone = cust_options[:time_zone]
-
-            if vm_template.config.guestId.start_with?('win')
-              cust_prep = windows_prep_for(action_handler, options, vm_name)
-            else
-              cust_prep = RbVmomi::VIM::CustomizationLinuxPrep.new(
-                :domain => cust_domain,
-                :hostName => cust_hostname,
-                :hwClockUTC => cust_hwclockutc,
-                :timeZone => cust_timezone)
-            end
-              cust_adapter_mapping = [RbVmomi::VIM::CustomizationAdapterMapping.new(:adapter => cust_ip_settings)]
-              RbVmomi::VIM::CustomizationSpec.new(
-                :identity => cust_prep,
-                :globalIPSettings => cust_global_ip_settings,
-                :nicSettingMap => cust_adapter_mapping)
+          cust_ip_settings.dnsDomain = cust_domain
+          cust_global_ip_settings = RbVmomi::VIM::CustomizationGlobalIPSettings.new
+          cust_global_ip_settings.dnsServerList = cust_ip_settings.dnsServerList
+          cust_global_ip_settings.dnsSuffixList = [cust_domain]
+          cust_hostname = hostname_from(cust_options, vm_name)
+          cust_hwclockutc = cust_options[:hw_clock_utc]
+          cust_timezone = cust_options[:time_zone]
+
+          if vm_template.config.guestId.start_with?('win')
+            cust_prep = windows_prep_for(action_handler, options, vm_name)
+          else
+            cust_prep = RbVmomi::VIM::CustomizationLinuxPrep.new(
+              :domain => cust_domain,
+              :hostName => cust_hostname,
+              :hwClockUTC => cust_hwclockutc,
+              :timeZone => cust_timezone
+            )
+          end
+          cust_adapter_mapping = [RbVmomi::VIM::CustomizationAdapterMapping.new(:adapter => cust_ip_settings)]
+          RbVmomi::VIM::CustomizationSpec.new(
+            :identity => cust_prep,
+            :globalIPSettings => cust_global_ip_settings,
+            :nicSettingMap => cust_adapter_mapping
+          )
         else
-          find_customization_spec(options[:customization_spec])
+          find_customization_spec(cust_options)
         end
       end
     end
@@ -423,50 +432,74 @@ module ChefProvisioningVsphere
       end
     end
 
-    def find_host(dc, host_name)
-      baseEntity = dc.hostFolder
-      entityArray = host_name.split('/')
-      entityArray.each do |entityArrItem|
-        if entityArrItem != ''
-          if baseEntity.is_a? RbVmomi::VIM::Folder
-            baseEntity = baseEntity.childEntity.find { |f| f.name == entityArrItem } or nil
-          elsif baseEntity.is_a? RbVmomi::VIM::ClusterComputeResource or baseEntity.is_a? RbVmomi::VIM::ComputeResource
-            baseEntity = baseEntity.host.find { |f| f.name == entityArrItem } or nil
-          elsif baseEntity.is_a? RbVmomi::VIM::HostSystem
-            baseEntity = baseEntity.host.find { |f| f.name == entityArrItem } or nil
-          else
-            baseEntity = nil
-          end
+    def find_entity(name, parent_folder, &block)
+      parts = name.split('/').reject(&:empty?)
+      parts.each do |item|
+        if parent_folder.is_a? RbVmomi::VIM::Folder
+          parent_folder = parent_folder.childEntity.find { |f| f.name == item }
+        else
+          parent_folder = block.call(parent_folder, item)
+        end
+      end
+      parent_folder
+    end
+
+    def find_host(host_name)
+      host = find_entity(host_name, datacenter.hostFolder) do |parent, part|
+        case parent
+        when RbVmomi::VIM::ClusterComputeResource || RbVmomi::VIM::ComputeResource
+          parent.host.find { |f| f.name == part }
+        when RbVmomi::VIM::HostSystem
+          parent.host.find { |f| f.name == part }
+        else
+          nil
         end
       end
 
-      raise "vSphere Host not found [#{host_name}]" if baseEntity.nil?
+      raise "vSphere Host not found [#{host_name}]" if host.nil?
 
-      baseEntity = baseEntity.host if not baseEntity.is_a?(RbVmomi::VIM::HostSystem) and baseEntity.respond_to?(:host)
-      baseEntity
+      if !host.is_a?(RbVmomi::VIM::HostSystem) && host.respond_to?(:host)
+        host = host.host
+      end
+      host
     end
 
-    def find_pool(dc, pool_name)
-      baseEntity = dc.hostFolder
-      entityArray = pool_name.split('/')
-      entityArray.each do |entityArrItem|
-        if entityArrItem != ''
-          if baseEntity.is_a? RbVmomi::VIM::Folder
-            baseEntity = baseEntity.childEntity.find { |f| f.name == entityArrItem } or nil
-          elsif baseEntity.is_a? RbVmomi::VIM::ClusterComputeResource or baseEntity.is_a? RbVmomi::VIM::ComputeResource
-            baseEntity = baseEntity.resourcePool.resourcePool.find { |f| f.name == entityArrItem } or nil
-          elsif baseEntity.is_a? RbVmomi::VIM::ResourcePool
-            baseEntity = baseEntity.resourcePool.find { |f| f.name == entityArrItem } or nil
-          else
-            baseEntity = nil
-          end
+    def find_pool(pool_name)
+      pool = find_entity(pool_name, datacenter.hostFolder) do |parent, part|
+        case parent
+        when RbVmomi::VIM::ClusterComputeResource || RbVmomi::VIM::ComputeResource
+          parent.resourcePool.resourcePool.find { |f| f.name == part }
+        when RbVmomi::VIM::ResourcePool
+          parent.resourcePool.find { |f| f.name == part }
+        else
+          nil
+        end
+      end
+
+      raise "vSphere ResourcePool not found [#{pool_name}]" if pool.nil?
+
+      if !pool.is_a?(RbVmomi::VIM::ResourcePool) && pool.respond_to?(:resourcePool)
+        pool = pool.resourcePool
+      end
+      pool
+    end
+
+    def find_network(name)
+      base = datacenter.networkFolder
+      entity_array = name.split('/').reject(&:empty?)
+      entity_array.each do |item|
+        case base
+        when RbVmomi::VIM::Folder
+          base = base.childEntity.find { |f| f.name == item }
+        when RbVmomi::VIM::VmwareDistributedVirtualSwitch
+          idx = base.summary.portgroupName.find_index(item)
+          base = idx.nil? ? nil : base.portgroup[idx]
         end
       end
 
-      raise "vSphere ResourcePool not found [#{pool_name}]" if baseEntity.nil?
+      raise "vSphere Network not found [#{name}]" if base.nil?
 
-      baseEntity = baseEntity.resourcePool if not baseEntity.is_a?(RbVmomi::VIM::ResourcePool) and baseEntity.respond_to?(:resourcePool)
-      baseEntity
+      base
     end
 
     def find_customization_spec(customization_spec)

data/spec/unit_tests/VsphereDriver_spec.rb

@@ -86,30 +86,13 @@ describe ChefProvisioningVsphere::VsphereDriver do
     context "when no url is in the config" do
       let(:metal_config) do
         {
-          :driver_options => { 
-            :user => 'vmapi',
-            :password => '<password>',
-            :host => '4.4.4.4',
-            :port => 888,
-            :path => '/yoda',
-            :use_ssl => false,
-            :insecure => true
-          },
-          :machine_options => { 
-            :ssh => {
-              :password => '<password>',
-              :paranoid => false
-            },
-            :bootstrap_options => {
-              :datacenter => 'QA1',
-              :template_name => 'UBUNTU-12-64-TEMPLATE',
-              :vm_folder => 'DLAB',
-              :num_cpus => 2,
-              :memory_mb => 4096,
-              :resource_pool => 'CLSTR02/DLAB'
-            }
-          },
-          :log_level => :debug
+          :user => 'vmapi',
+          :password => '<password>',
+          :host => '4.4.4.4',
+          :port => 888,
+          :path => '/yoda',
+          :use_ssl => false,
+          :insecure => true
         }
       end
 
@@ -128,26 +111,9 @@ describe ChefProvisioningVsphere::VsphereDriver do
     context "when no url is in the config and config is missing defaulted values" do
       let(:metal_config) do
         {
-          :driver_options => { 
-            :user => 'vmapi',
-            :password => '<password>',
-            :host => '4.4.4.4'
-          },
-          :machine_options => { 
-            :bootstrap_options => {
-              :datacenter => 'QA1',
-              :template_name => 'UBUNTU-12-64-TEMPLATE',
-              :vm_folder => 'DLAB',
-              :num_cpus => 2,
-              :memory_mb => 4096,
-              :resource_pool => 'CLSTR02/DLAB',
-              :ssh => {
-                :password => '<password>',
-                :paranoid => false
-              }
-            }
-          },
-          :log_level => :debug
+          :user => 'vmapi',
+          :password => '<password>',
+          :host => '4.4.4.4'
         }
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning-vsphere
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - CenturyLink Cloud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-16 00:00:00.000000000 Z
+date: 2015-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbvmomi
@@ -82,9 +82,11 @@ files:
 - ".gitignore"
 - Gemfile
 - LICENSE
+- LICENSE-Rally
 - README.md
 - Rakefile
 - chef-provisioning-vsphere.gemspec
+- contribution-notice
 - lib/chef/provisioning/driver_init/vsphere.rb
 - lib/chef/provisioning/vsphere_driver.rb
 - lib/chef/provisioning/vsphere_driver/driver.rb