knife-vsphere 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7da50d689bdd4164cea3df391395eca1a9acb4e5
-  data.tar.gz: 6682cf4d67ef8da7290a9fda877813b8ab33a8e5
+  metadata.gz: eb16b64d53791bd6e96ba472a5567de9c8f16cf2
+  data.tar.gz: 6da5cf9fe415bba0e43e48ecf6b70e084152dde1
 SHA512:
-  metadata.gz: e1f0c1e19b98f0292b9596ed8df1fae872f88c17d8fb3e0ba0d4f0d78a115a54e18c0b224165d19fd6b0e22bd02c492d151312e7a932708636f96c7b305b19fd
-  data.tar.gz: 2f286acc8610eeba75e6edadb76a3c6282b2243eec4fbd7c1582962b5f3b5baea2a57041db9f6e94ee3308035f80a526c08fe0d448ab07717aacddb0f31939fc
+  metadata.gz: 29a121097a149a4f65a477e25e81a8a5050f30211a34819453bd9ee40f919b5173c6fd42f96ffc23804c5530e1ec79a18f8453eac427e3146d4b6db654fd586c
+  data.tar.gz: 54c0d812429c81c78961c7e3cdda47c713fa175e53304289831c1fb8105f5132a7bcdb7a57e4648519d53daae996812c556c2b944c3c7ea6d7e7b72726d2b069

data/lib/chef/knife/base_vsphere_command.rb

@@ -126,31 +126,6 @@ class Chef
         @password ||= ui.ask('Enter your password: ') { |q| q.echo = false }
       end
 
-      def get_vm(vmname)
-        vim_connection
-        base_folder = find_folder(get_config(:folder))
-        traverse_folders_for_vm(base_folder, vmname)
-      end
-
-      def get_vms(vmname)
-        vim_connection
-        base_folder = find_folder(get_config(:folder))
-        traverse_folders_for_vms(base_folder, vmname)
-      end
-
-      def traverse_folders_for_vm(folder, vmname)
-        children = folder.children.find_all
-        children.each do |child|
-          if child.class == RbVmomi::VIM::VirtualMachine && child.name == vmname
-            return child
-          elsif child.class == RbVmomi::VIM::Folder
-            vm = traverse_folders_for_vm(child, vmname)
-            return vm if vm
-          end
-        end
-        false
-      end
-
       def traverse_folders_for_pools(folder)
         retval = []
         children = folder.children.find_all
@@ -177,19 +152,6 @@ class Chef
         retval
       end
 
-      def traverse_folders_for_vms(folder, vmname)
-        retval = []
-        children = folder.children.find_all
-        children.each do |child|
-          if child.class == RbVmomi::VIM::VirtualMachine && child.name == vmname
-            retval << child
-          elsif child.class == RbVmomi::VIM::Folder
-            retval.concat(traverse_folders_for_vms(child, vmname))
-          end
-        end
-        retval
-      end
-
       def traverse_folders_for_dc(folder, dcname)
         children = folder.children.find_all
         children.each do |child|

data/lib/chef/knife/search_helper.rb

@@ -6,14 +6,20 @@ module SearchHelper
   # and `#obj` will return the actual object (but make a call to the server)
   # param [Array<String>] properties to retrieve
   # @return [Array<RbVmomi::VIM::ObjectContent>]
-  def get_all_vm_objects(properties = ['name'])
+  def get_all_vm_objects(opts = {})
     pc = vim_connection.serviceInstance.content.propertyCollector
     viewmgr = vim_connection.serviceInstance.content.viewManager
-    root_folder = vim_connection.serviceInstance.content.rootFolder
-    vmview = viewmgr.CreateContainerView(container: root_folder,
+    folder = if opts[:folder]
+               find_folder(opts[:folder])
+             else
+               vim_connection.serviceInstance.content.rootFolder
+             end
+    vmview = viewmgr.CreateContainerView(container: folder,
                                          type: ['VirtualMachine'],
                                          recursive: true)
 
+    opts[:properties] ||= ['name']
+
     filter_spec = RbVmomi::VIM.PropertyFilterSpec(
       objectSet: [
         obj: vmview,
@@ -28,14 +34,14 @@ module SearchHelper
         ]
       ],
       propSet: [
-        { type: 'VirtualMachine', pathSet: properties }
+        { type: 'VirtualMachine', pathSet: opts[:properties] }
       ]
     )
     pc.RetrieveProperties(specSet: [filter_spec])
   end
 
-  def get_vm_by_name(vmname)
-    vm = get_all_vm_objects.detect { |r| r['name'] == vmname }
+  def get_vm_by_name(vmname, folder = nil)
+    vm = get_all_vm_objects(folder: folder).detect { |r| r['name'] == vmname }
     vm ? vm.obj : nil
   end
 end

data/lib/chef/knife/vsphere_template_list.rb

@@ -5,10 +5,12 @@
 
 require 'chef/knife'
 require 'chef/knife/base_vsphere_command'
+require 'chef/knife/search_helper'
 
 # Lists all known VM templates in the configured datacenter
 # VsphereTemplatelist extends the BaseVspherecommand
 class Chef::Knife::VsphereTemplateList < Chef::Knife::BaseVsphereCommand
+  include SearchHelper
   banner 'knife vsphere template list'
 
   common_options
@@ -21,13 +23,13 @@ class Chef::Knife::VsphereTemplateList < Chef::Knife::BaseVsphereCommand
 
     vim_connection
 
-    base_folder = find_folder(get_config(:folder))
-
-    vms = find_all_in_folder(base_folder, RbVmomi::VIM::VirtualMachine)
-          .select { |v| !v.config.nil? && v.config.template == true }
+    vms = get_all_vm_objects(
+      folder: get_config(:folder),
+      properties: ['name', 'config.template']
+    ).select { |vm| vm['config.template'] == true }
 
     vm_list = vms.map do |vm|
-      { 'Template Name' => vm.name }
+      { 'Template Name' => vm['name'] }
     end
 
     ui.output(vm_list)

data/lib/chef/knife/vsphere_vm_cdrom.rb

@@ -2,11 +2,11 @@
 
 require 'chef/knife'
 require 'chef/knife/base_vsphere_command'
-require 'rbvmomi'
-require 'netaddr'
+require 'chef/knife/search_helper'
 
 # VsphereVmCdrom extends the BaseVspherecommand
 class Chef::Knife::VsphereVmCdrom < Chef::Knife::BaseVsphereCommand
+  include SearchHelper
   banner 'knife vsphere vm cdrom VMNAME (options)'
 
   # The empty device name.
@@ -64,20 +64,7 @@ class Chef::Knife::VsphereVmCdrom < Chef::Knife::BaseVsphereCommand
     fatal_exit 'You must specify the name and path of an ISO with --iso' if get_config(:attach) && !get_config(:iso)
     fatal_exit 'You must specify the datastore containing the ISO with --datastore' if get_config(:attach) && !get_config(:datastore)
 
-    vim_connection
-
-    if get_config(:recursive)
-      vms = get_vms(vmname)
-      if vms.length > 1
-        fatal_exit "More than one VM with name #{vmname} found:\n" + vms.map { |vm| get_path_to_object(vm) }.join("\n")
-      end
-      fatal_exit "VM #{vmname} not found" if vms.empty?
-      vm = vms[0]
-    else
-      base_folder = find_folder(get_config(:folder))
-
-      vm = find_in_folder(base_folder, RbVmomi::VIM::VirtualMachine, vmname) || fatal_exit("VM #{vmname} not found")
-    end
+    vm = get_vm_by_name(vmname, config[:folder]) || fatal_exit("Could not find #{vmname}")
 
     cdrom_obj = vm.config.hardware.device.find { |hw| hw.class == RbVmomi::VIM::VirtualCdrom }
     fatal_exit 'Could not find a cd drive' unless cdrom_obj

data/lib/chef/knife/vsphere_vm_config.rb

@@ -39,7 +39,7 @@ class Chef::Knife::VsphereVmConfig < Chef::Knife::BaseVsphereCommand
 
     vim_connection
 
-    vm = get_vm_by_name(vmname) || fatal_exit("Could not find #{vmname}")
+    vm = get_vm_by_name(vmname, get_config(:folder)) || fatal_exit("Could not find #{vmname}")
 
     properties = {}
     properties[property_name] = property_value

data/lib/chef/knife/vsphere_vm_delete.rb

@@ -5,6 +5,7 @@
 
 require 'chef/knife'
 require 'chef/knife/base_vsphere_command'
+require 'chef/knife/search_helper'
 require 'rbvmomi'
 
 # These two are needed for the '--purge' deletion case
@@ -14,6 +15,7 @@ require 'chef/api_client'
 # Delete a virtual machine from vCenter
 # VsphereVmDelete extends the BaseVspherecommand
 class Chef::Knife::VsphereVmDelete < Chef::Knife::BaseVsphereCommand
+  include SearchHelper
   banner 'knife vsphere vm delete VMNAME (options)'
 
   option :purge,
@@ -56,11 +58,7 @@ class Chef::Knife::VsphereVmDelete < Chef::Knife::BaseVsphereCommand
       fatal_exit('You must specify a virtual machine name')
     end
 
-    vim_connection
-
-    base_folder = find_folder(get_config(:folder))
-
-    vm = traverse_folders_for_vm(base_folder, vmname) || fatal_exit("VM #{vmname} not found")
+    vm = get_vm_by_name(vmname, get_config(:folder)) || fatal_exit("Could not find #{vmname}")
 
     vm.PowerOffVM_Task.wait_for_completion unless vm.runtime.powerState == 'poweredOff'
     vm.Destroy_Task.wait_for_completion

data/lib/chef/knife/vsphere_vm_disk_extend.rb

@@ -5,9 +5,10 @@
 
 require 'chef/knife'
 require 'chef/knife/base_vsphere_command'
-require 'rbvmomi'
+require 'chef/knife/search_helper'
 
 class Chef::Knife::VsphereVmDiskExtend < Chef::Knife::BaseVsphereCommand
+  include SearchHelper
   banner 'knife vsphere vm disk extend VMNAME SIZE. Extends the disk of vm VMNAME to SIZE kilobytes.'
 
   common_options
@@ -36,9 +37,7 @@ class Chef::Knife::VsphereVmDiskExtend < Chef::Knife::BaseVsphereCommand
 
     dc = datacenter
 
-    folder = find_folder(get_config(:folder)) || dc.vmFolder
-
-    vm = find_in_folder(folder, RbVmomi::VIM::VirtualMachine, vmname) || abort("VM #{vmname} not found")
+    vm = get_vm_by_name(vmname, get_config(:folder)) || fatal_exit("Could not find #{vmname}")
 
     disks = vm.config.hardware.device.select do |device|
       device.is_a?(RbVmomi::VIM::VirtualDisk) && (disk_name.nil? || device.deviceInfo.label == disk_name)

data/lib/chef/knife/vsphere_vm_disk_list.rb

@@ -21,7 +21,7 @@ class Chef::Knife::VsphereVmDiskList < Chef::Knife::BaseVsphereCommand
       fatal_exit 'You must specify a virtual machine name'
     end
 
-    vm = get_vm_by_name(vmname) || fatal_exit("Could not find #{vmname}")
+    vm = get_vm_by_name(vmname, get_config(:folder)) || fatal_exit("Could not find #{vmname}")
 
     disks = vm.config.hardware.device.select do |device|
       device.is_a? RbVmomi::VIM::VirtualDisk

data/lib/chef/knife/vsphere_vm_markastemplate.rb

@@ -8,22 +8,18 @@
 
 require 'chef/knife'
 require 'chef/knife/base_vsphere_command'
-require 'rbvmomi'
+require 'chef/knife/search_helper'
 
 # Clone an existing template into a new VM, optionally applying a customization specification.
 # usage:
 # knife vsphere vm markastemplate MyVM --folder /templates
 # Vspherevmmarkastemplate extends the Basevspherecommand
 class Chef::Knife::VsphereVmMarkastemplate < Chef::Knife::BaseVsphereCommand
+  include SearchHelper
   banner 'knife vsphere vm markastemplate VMNAME'
 
   common_options
 
-  option :folder,
-         long: '--folder FOLDER',
-         description: 'The folder which contains the VM',
-         default: ''
-
   # The main run method for vm_markastemplate
   #
   def run
@@ -34,16 +30,8 @@ class Chef::Knife::VsphereVmMarkastemplate < Chef::Knife::BaseVsphereCommand
       show_usage
       fatal_exit('You must specify a virtual machine name')
     end
-    config[:chef_node_name] = vmname unless config[:chef_node_name]
-    config[:vmname] = vmname
-
-    vim_connection
-
-    dc = datacenter
-
-    src_folder = find_folder(get_config(:folder)) || dc.vmFolder
 
-    vm = find_in_folder(src_folder, RbVmomi::VIM::VirtualMachine, config[:vmname]) || abort('VM not found')
+    vm = get_vm_by_name(vmname, get_config(:folder)) || fatal_exit("Could not find #{vmname}")
 
     puts "Marking VM #{vmname} as template"
     vm.MarkAsTemplate()

data/lib/chef/knife/vsphere_vm_migrate.rb

@@ -4,9 +4,11 @@
 #
 require 'chef/knife'
 require 'chef/knife/base_vsphere_command'
+require 'chef/knife/search_helper'
 
 # migrate vm to specified resource pool , datastore and host
 class Chef::Knife::VsphereVmMigrate < Chef::Knife::BaseVsphereCommand
+  include SearchHelper
   # migrate --resource-pool --dest-host --dest-datastore
   banner 'knife vsphere vm migrate (options)'
 
@@ -45,17 +47,13 @@ class Chef::Knife::VsphereVmMigrate < Chef::Knife::BaseVsphereCommand
       fatal_exit('You must specify a virtual machine name')
     end
 
-    vim_connection
-    dc = datacenter
-    folder = find_folder(get_config(:folder)) || dc.vmFolder
-
-    vm = find_in_folder(folder, RbVmomi::VIM::VirtualMachine, vmname) || abort("VM #{vmname} not found")
+    vm = get_vm_by_name(vmname, get_config(:folder)) || fatal_exit("Could not find #{vmname}")
 
     priority = config[:priority]
     dest_host = config[:dest_host]
     ndc = find_datastore(config[:dest_datastore]) || abort('dest-datastore not found')
     pool = find_pool(config[:resource_pool]) if config[:resource_pool]
-    dest_host = find_host_folder(dc.hostFolder, dest_host)
+    dest_host = find_host_folder(datacenter.hostFolder, dest_host)
     migrate_spec = RbVmomi::VIM.VirtualMachineRelocateSpec(datastore: ndc, pool: pool, host: dest_host)
     vm.RelocateVM_Task(spec: migrate_spec, priority: priority).wait_for_completion
   end

data/lib/chef/knife/vsphere_vm_move.rb

@@ -4,10 +4,12 @@
 #
 require 'chef/knife'
 require 'chef/knife/base_vsphere_command'
+require 'chef/knife/search_helper'
 
 # Lists all known virtual machines in the configured datacenter
 # VsphereVmMove extends the BaseVspherecommand
 class Chef::Knife::VsphereVmMove < Chef::Knife::BaseVsphereCommand
+  include SearchHelper
   banner 'knife vsphere vm move'
 
   common_options
@@ -79,12 +81,7 @@ class Chef::Knife::VsphereVmMove < Chef::Knife::BaseVsphereCommand
       fatal_exit('You must specify a virtual machine name')
     end
 
-    vim = vim_connection
-    dcname = get_config(:vsphere_dc)
-    dc = vim.serviceInstance.find_datacenter(dcname) || abort('datacenter not found')
-    folder = find_folder(get_config(:folder)) || dc.vmFolder
-
-    vm = find_in_folder(folder, RbVmomi::VIM::VirtualMachine, vmname) || abort("VM #{vmname} not found")
+    vm = get_vm_by_name(vmname, get_config(:folder)) || fatal_exit("Could not find #{vmname}")
 
     if get_config(:thin_provision) || get_config(:thick_provision)
       convert_vm(vm)

data/lib/chef/knife/vsphere_vm_net.rb

@@ -4,10 +4,12 @@
 #
 require 'chef/knife'
 require 'chef/knife/base_vsphere_command'
+require 'chef/knife/search_helper'
 
 # Switch VM networking state up/down (on all network interfaces)
 # VsphereVmNet extends the BaseVspherecommand
 class Chef::Knife::VsphereVmNet < Chef::Knife::BaseVsphereCommand
+  include SearchHelper
   banner 'knife vsphere vm net STATE VMNAME'
   common_options
 
@@ -32,11 +34,9 @@ class Chef::Knife::VsphereVmNet < Chef::Knife::BaseVsphereCommand
     elsif state == 'down'
       if_state = false
     end
-    vim_connection
-    dc = datacenter
-    folder = find_folder(get_config(:folder)) || dc.vmFolder
-    vm = find_in_folder(folder, RbVmomi::VIM::VirtualMachine, vmname) ||
-         abort("VM #{vmname} not found")
+
+    vm = get_vm_by_name(vmname, get_config(:folder)) || fatal_exit("Could not find #{vmname}")
+
     vm.config.hardware.device.each.grep(RbVmomi::VIM::VirtualEthernetCard) do |a|
       backing = a.backing
       key = a.key

data/lib/chef/knife/vsphere_vm_network_add.rb

@@ -4,10 +4,11 @@
 #
 require 'chef/knife'
 require 'chef/knife/base_vsphere_command'
-require 'rbvmomi'
+require 'chef/knife/search_helper'
 require 'netaddr'
 
 class Chef::Knife::VsphereVmNetworkAdd < Chef::Knife::BaseVsphereCommand
+  include SearchHelper
   banner 'knife vsphere vm network add VMNAME NETWORKNAME'
 
   option :adapter_type,
@@ -37,11 +38,8 @@ class Chef::Knife::VsphereVmNetworkAdd < Chef::Knife::BaseVsphereCommand
       fatal_exit('You must specify the network name')
     end
 
-    vim_connection
 
-    dc = datacenter
-    folder = find_folder(get_config(:folder)) || dc.vmFolder
-    vm = traverse_folders_for_vm(folder, vmname) || abort("VM #{vmname} not found")
+    vm = get_vm_by_name(vmname, get_config(:folder)) || fatal_exit("Could not find #{vmname}")
 
     network = find_network(networkname)
 

data/lib/chef/knife/vsphere_vm_network_delete.rb

@@ -4,10 +4,10 @@
 #
 require 'chef/knife'
 require 'chef/knife/base_vsphere_command'
-require 'rbvmomi'
-require 'netaddr'
+require 'chef/knife/search_helper'
 
 class Chef::Knife::VsphereVmNetworkDelete < Chef::Knife::BaseVsphereCommand
+  include SearchHelper
   banner 'knife vsphere vm network delete VMNAME NICNAME'
 
   common_options
@@ -27,8 +27,7 @@ class Chef::Knife::VsphereVmNetworkDelete < Chef::Knife::BaseVsphereCommand
       fatal_exit('You must specify the name of the NIC to delete')
     end
 
-    vim_connection
-    vm = get_vm(vmname) || abort('VM not found')
+    vm = get_vm_by_name(vmname, get_config(:folder)) || fatal_exit("Could not find #{vmname}")
 
     cards = vm.config.hardware.device.grep(RbVmomi::VIM::VirtualEthernetCard)
     card = cards.detect { |c| c.deviceInfo.label == nicname }

data/lib/chef/knife/vsphere_vm_network_list.rb

@@ -4,11 +4,11 @@
 #
 require 'chef/knife'
 require 'chef/knife/base_vsphere_command'
-require 'rbvmomi'
-require 'netaddr'
+require 'chef/knife/search_helper'
 
 # VsphereVmNetworklist extends the BaseVspherecommand
 class Chef::Knife::VsphereVmNetworkList < Chef::Knife::BaseVsphereCommand
+  include SearchHelper
   banner 'knife vsphere vm network list VMNAME'
 
   common_options
@@ -24,15 +24,14 @@ class Chef::Knife::VsphereVmNetworkList < Chef::Knife::BaseVsphereCommand
       fatal_exit('You must specify a virtual machine name')
     end
 
-    vim_connection
+    vm = get_vm_by_name(vmname, get_config(:folder)) || fatal_exit("Could not find #{vmname}")
     dc = datacenter
-    folder = find_folder(get_config(:folder)) || dc.vmFolder
-    vm = traverse_folders_for_vm(folder, vmname) || abort("VM #{vmname} not found")
 
     vm.config.hardware.device.each.grep(RbVmomi::VIM::VirtualEthernetCard).map do |nic|
-      dc.network.each.grep(RbVmomi::VIM::DistributedVirtualPortgroup) do |net|
+      dc.network.grep(RbVmomi::VIM::DistributedVirtualPortgroup) do |net|
         if nic.backing.port.portgroupKey.eql?(net.key)
           puts "NIC: #{nic.deviceInfo.label} VLAN: #{net.name}"
+          break
         end
       end
     end

data/lib/chef/knife/vsphere_vm_network_set.rb

@@ -4,10 +4,12 @@
 #
 require 'chef/knife'
 require 'chef/knife/base_vsphere_command'
+require 'chef/knife/search_helper'
 
 # Changes network on a certain VM
 # VsphereVmNetworkSet extends the BaseVspherecommand
 class Chef::Knife::VsphereVmNetworkSet < Chef::Knife::BaseVsphereCommand
+  include SearchHelper
   banner 'knife vsphere vm network set VMNAME NETWORKNAME'
 
   common_options
@@ -33,7 +35,7 @@ class Chef::Knife::VsphereVmNetworkSet < Chef::Knife::BaseVsphereCommand
     end
 
     network = find_network(networkname)
-    vm = get_vm(vmname) || abort('VM not found')
+    vm = get_vm_by_name(vmname, get_config(:folder)) || fatal_exit("Could not find #{vmname}")
     nic = vm.config.hardware.device.each.grep(RbVmomi::VIM::VirtualEthernetCard)[Integer(get_config(:nic))]
     if network.is_a? RbVmomi::VIM::DistributedVirtualPortgroup
       port = RbVmomi::VIM.DistributedVirtualSwitchPortConnection(switchUuid: network.config.distributedVirtualSwitch.uuid, portgroupKey: network.key)

data/lib/chef/knife/vsphere_vm_property_get.rb

@@ -3,11 +3,11 @@
 
 require 'chef/knife'
 require 'chef/knife/base_vsphere_command'
-require 'rbvmomi'
-require 'netaddr'
+require 'chef/knife/search_helper'
 
 # VsphereVMPropertyget extends the BaseVspherecommand
 class Chef::Knife::VsphereVmPropertyGet < Chef::Knife::BaseVsphereCommand
+  include SearchHelper
   banner 'knife vsphere vm property get VMNAME PROPERTY.  Gets a vApp Property on VMNAME.'
 
   common_options
@@ -29,12 +29,7 @@ class Chef::Knife::VsphereVmPropertyGet < Chef::Knife::BaseVsphereCommand
     end
     property_name = property_name.to_sym
 
-    vim_connection
-
-    dc = datacenter
-    folder = find_folder(get_config(:folder)) || dc.vmFolder
-
-    vm = find_in_folder(folder, RbVmomi::VIM::VirtualMachine, vmname) || abort("VM #{vmname} not found")
+    vm = get_vm_by_name(vmname, get_config(:folder)) || fatal_exit("Could not find #{vmname}")
 
     existing_property = vm.config.vAppConfig.property.find { |p| p.props[:id] == property_name.to_s  }
 

data/lib/chef/knife/vsphere_vm_property_set.rb

@@ -43,7 +43,7 @@ class Chef::Knife::VsphereVmPropertySet < Chef::Knife::BaseVsphereCommand
 
     dc = datacenter
 
-    vm = get_vm_by_name(vmname) || fatal_exit("Could not find #{vmname}")
+    vm = get_vm_by_name(vmname, get_config(:folder)) || fatal_exit("Could not find #{vmname}")
 
     if vm.config.vAppConfig && vm.config.vAppConfig.property
       existing_property = vm.config.vAppConfig.property.find { |p| p.props[:id] == property_name.to_s  }

data/lib/chef/knife/vsphere_vm_query.rb

@@ -1,7 +1,5 @@
 require 'chef/knife'
 require 'chef/knife/base_vsphere_command'
-require 'rbvmomi'
-require 'netaddr'
 
 # VsphereVmQuery extends the BaseVspherecommand
 class Chef::Knife::VsphereVmQuery < Chef::Knife::BaseVsphereCommand

data/lib/chef/knife/vsphere_vm_show.rb

@@ -3,11 +3,11 @@
 
 require 'chef/knife'
 require 'chef/knife/base_vsphere_command'
-require 'rbvmomi'
-require 'netaddr'
+require 'chef/knife/search_helper'
 
 # VsphereVmShow extends the BaseVspherecommand
 class Chef::Knife::VsphereVmShow < Chef::Knife::BaseVsphereCommand
+  include SearchHelper
   banner "knife vsphere vm show VMNAME QUERY.  See \"http://pubs.vmware.com/vi3/sdk/ReferenceGuide/vim.VirtualMachine.html\" for allowed QUERY values."
 
   common_options
@@ -30,10 +30,7 @@ class Chef::Knife::VsphereVmShow < Chef::Knife::BaseVsphereCommand
 
     vim_connection
 
-    dc = datacenter
-    folder = find_folder(get_config(:folder)) || dc.vmFolder
-
-    vm = traverse_folders_for_vm(folder, vmname) || abort("VM #{vmname} not found")
+    vm = get_vm_by_name(vmname, get_config(:folder)) || fatal_exit("Could not find #{vmname}")
 
     # split QUERY by dots, and walk the object model
     query = query_string.split '.'

data/lib/chef/knife/vsphere_vm_snapshot.rb

@@ -75,9 +75,7 @@ class Chef::Knife::VsphereVmSnapshot < Chef::Knife::BaseVsphereCommand
       exit 1
     end
 
-    vim_connection
-
-    vm = get_vm_by_name(vmname) || fatal_exit("Could not find #{vmname}")
+    vm = get_vm_by_name(vmname, get_config(:folder)) || fatal_exit("Could not find #{vmname}")
 
     if vm.snapshot
       snapshot_list = vm.snapshot.rootSnapshotList

data/lib/chef/knife/vsphere_vm_toolsconfig.rb

@@ -3,11 +3,11 @@
 
 require 'chef/knife'
 require 'chef/knife/base_vsphere_command'
-require 'rbvmomi'
-require 'netaddr'
+require 'chef/knife/search_helper'
 
 # Vspherevmtoolsconfig extends the BaseVspherecommand
 class Chef::Knife::VsphereVmToolsconfig < Chef::Knife::BaseVsphereCommand
+  include SearchHelper
   banner "knife vsphere vm toolsconfig PROPERTY VALUE.
           See \"https://www.vmware.com/support/developer/vc-sdk/visdk25pubs/ReferenceGuide/vim.vm.ToolsConfigInfo.html\"
           for available properties and types."
@@ -42,12 +42,7 @@ class Chef::Knife::VsphereVmToolsconfig < Chef::Knife::BaseVsphereCommand
 
     value = '' if get_config(:empty)
 
-    vim_connection
-
-    dc = datacenter
-    folder = find_folder(get_config(:folder)) || dc.vmFolder
-
-    vm = traverse_folders_for_vm(folder, vmname) || abort("VM #{vmname} not found")
+    vm = get_vm_by_name(vmname, get_config(:folder)) || fatal_exit("Could not find #{vmname}")
 
     vm_config_spec = RbVmomi::VIM.VirtualMachineConfigSpec(tools: RbVmomi::VIM.ToolsConfigInfo(property => value))
     vm.ReconfigVM_Task(spec: vm_config_spec)

data/lib/chef/knife/vsphere_vm_vmdk_add.rb

@@ -4,10 +4,12 @@
 #
 require 'chef/knife'
 require 'chef/knife/base_vsphere_command'
+require 'chef/knife/search_helper'
 
 # Add a new disk to a virtual machine
 # VsphereVmvmdkadd extends the BaseVspherecommand
 class Chef::Knife::VsphereVmVmdkAdd < Chef::Knife::BaseVsphereCommand
+  include SearchHelper
   banner 'knife vsphere vm vmdk add VMNAME DISK_GB'
 
   common_options
@@ -43,7 +45,8 @@ class Chef::Knife::VsphereVmVmdkAdd < Chef::Knife::BaseVsphereCommand
 
     vim = vim_connection
     vdm = vim.serviceContent.virtualDiskManager
-    vm = get_vm(vmname)
+    vm = get_vm_by_name(vmname, get_config(:folder)) || fatal_exit("Could not find #{vmname}")
+
     fatal_exit "Could not find #{vmname}" unless vm
 
     target_lun = get_config(:target_lun) unless get_config(:target_lun).nil?

data/lib/chef/knife/vsphere_vm_vnc_set.rb

@@ -4,11 +4,11 @@
 #
 require 'chef/knife'
 require 'chef/knife/base_vsphere_command'
-require 'rbvmomi'
-require 'netaddr'
+require 'chef/knife/search_helper'
 
 # Main class VsphereVMvncset extends the BaseVspherecommand
 class Chef::Knife::VsphereVmVncset < Chef::Knife::BaseVsphereCommand
+  include SearchHelper
   banner 'knife vsphere vm vncset VMNAME COMMAND ARGS'
 
   option :vnc_port,
@@ -33,12 +33,7 @@ class Chef::Knife::VsphereVmVncset < Chef::Knife::BaseVsphereCommand
       fatal_exit('You must specify a virtual machine name')
     end
 
-    vim_connection
-
-    dc = datacenter
-    folder = find_folder(get_config(:folder)) || dc.vmFolder
-
-    vm = find_in_folder(folder, RbVmomi::VIM::VirtualMachine, vmname) || abort("VM #{vmname} not found")
+    vm = get_vm_by_name(vmname, get_config(:folder)) || fatal_exit("Could not find #{vmname}")
 
     extra_config, = vm.collect('config.extraConfig')
 

data/lib/chef/knife/vsphere_vm_wait_sysprep.rb

@@ -6,7 +6,7 @@
 
 require 'chef/knife'
 require 'chef/knife/base_vsphere_command'
-require 'rbvmomi'
+require 'chef/knife/search_helper'
 require 'chef/knife/customization_helper'
 
 # Wait for vm finishing Sysprep.
@@ -14,6 +14,7 @@ require 'chef/knife/customization_helper'
 # knife vsphere vm wait sysprep somemachine --sleep 30 \
 #     --timeout 600
 class Chef::Knife::VsphereVmWaitSysprep < Chef::Knife::BaseVsphereCommand
+  include SearchHelper
   include CustomizationHelper
 
   banner 'knife vsphere vm wait sysprep VMNAME (options)'
@@ -47,10 +48,8 @@ class Chef::Knife::VsphereVmWaitSysprep < Chef::Knife::BaseVsphereCommand
     sleep_timeout = get_config(:timeout).to_i
 
     vim = vim_connection
-    dc = datacenter
+    vm = get_vm_by_name(vmname, get_config(:folder)) || fatal_exit("Could not find #{vmname}")
 
-    folder = find_folder(get_config(:folder)) || dc.vmFolder
-    vm = find_in_folder(folder, RbVmomi::VIM::VirtualMachine, vmname) || abort("VM could not be found in #{folder}")
 
     CustomizationHelper.wait_for_sysprep(vm, vim, sleep_timeout, sleep_time)
   end

data/lib/knife-vsphere/version.rb

@@ -1,5 +1,5 @@
 # The main knife-vsphere module.
 module KnifeVsphere
   # The version of this gem.
-  VERSION = '2.0.4'
+  VERSION = '2.0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-vsphere
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Ezra Pagel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-19 00:00:00.000000000 Z
+date: 2018-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knife-windows
@@ -237,7 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: vSphere Support for Knife