knife-vsphere 1.2.14 → 1.2.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5568fb262d8a952f210fb7a7100f54bbc4c0c989
-  data.tar.gz: 2d103c82c324bf3f9577adc8a92583771ce5ccd1
+  metadata.gz: ffde4a9240d703c519b66c4d7bddf1a26b5fdc2d
+  data.tar.gz: df28bd7b23377431778c93d79a6d04ec358dccbc
 SHA512:
-  metadata.gz: 96ccd1409e9573d2c26038163c32bfecb2d3d365d1b2af493ca1d0eb475fcd5f7a2a60a48a656f2d1dd26775da9f692fed192abdfe5281c9c159523cc3ff63a4
-  data.tar.gz: 9106e7eb45638e26928413b0fc2a6406bb79ab2023515edda7e5c8415e0e686ad137ba5fc54d834df694bb70033707e8bcd37489e7b40920d420ec6d900d72f4
+  metadata.gz: bf661f541572092f3a3746cc130ac5d04c7341cffee903e96118aa3ae813f5be37654d6effb654bb39de782ebb64e9a98ba2a59542dd8bf8912b026a2f385680
+  data.tar.gz: 7e641d48b040865eace2e255c29f149b2ebc66dcbf1d3af9509a63c230ca202a73bd933dcd5bd5561591eeaf428e7757341b01f608482181e43bc6b864ff2e34

data/lib/chef/knife/base_vsphere_command.rb

@@ -9,6 +9,10 @@ require 'rbvmomi'
 require 'base64'
 require 'filesize'
 
+PS_ON ||= 'poweredOn'.freeze
+PS_OFF ||= 'poweredOff'.freeze
+PS_SUSPENDED ||= 'suspended'.freeze
+
 # Base class for vsphere knife commands
 class Chef
   class Knife
@@ -110,7 +114,7 @@ class Chef
       end
 
       def vim_connection
-        config[:vim] = RbVmomi::VIM.connect conn_opts
+        config[:vim] ||= RbVmomi::VIM.connect conn_opts
       end
 
       def get_password_from_stdin
@@ -183,7 +187,7 @@ class Chef
 
       def datacenter
         dcname = get_config(:vsphere_dc)
-        traverse_folders_for_dc(config[:vim].rootFolder, dcname) || abort('datacenter not found')
+        traverse_folders_for_dc(vim_connection.rootFolder, dcname) || abort('datacenter not found')
       end
 
       def find_folder(folderName)
@@ -373,6 +377,7 @@ class Chef
       def linux?(config)
         gid = config.guestId.downcase
         # This makes the assumption that if it isn't mac or windows it's linux
+        # See https://www.vmware.com/support/developer/vc-sdk/visdk25pubs/ReferenceGuide/vim.vm.GuestOsDescriptor.GuestOsIdentifier.html for values
         is_linux_bool = !gid.include?('windows') && !gid.include?('darwin')
         Chef::Log.debug('Identified os as linux.') if is_linux_bool
         is_linux_bool

data/lib/chef/knife/vsphere_vm_clone.rb

@@ -16,14 +16,12 @@ require 'chef/knife/winrm_base'
 require 'chef/knife/customization_helper'
 require 'ipaddr'
 
-# Clone an existing template into a new VM, optionally applying a customization specification.
-# usage:
-# knife vsphere vm clone NewNode UbuntuTemplate --cspec StaticSpec \
-#     --cips 192.168.0.99/24,192.168.1.99/24 \
-#     --chostname NODENAME --cdomain NODEDOMAIN
 class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
   banner 'knife vsphere vm clone VMNAME (options)'
 
+  AUTO_MAC = 'auto'
+  NO_IPS = ''
+
   include Chef::Knife::WinrmBase
   include CustomizationHelper
   deps do
@@ -91,11 +89,12 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
   option :customization_macs,
          long: '--cmacs CUST_MACS',
          description: 'Comma-delimited list of MAC addresses for network adapters',
-         default: 'auto'
+         default: AUTO_MAC
 
   option :customization_ips,
          long: '--cips CUST_IPS',
-         description: 'Comma-delimited list of CIDR IPs for customization'
+         description: 'Comma-delimited list of CIDR IPs for customization',
+         default: NO_IPS
 
   option :customization_dns_ips,
          long: '--cdnsips CUST_DNS_IPS',
@@ -147,6 +146,10 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
          long: '--fqdn SERVER_FQDN',
          description: 'Fully qualified hostname for bootstrapping'
 
+  option :bootstrap_msi_url,
+         long: '--bootstrap-msi-url URL',
+         description: 'Location of the Chef Client MSI. The default templates will prefer to download from this location.'
+
   option :bootstrap_protocol,
          long: '--bootstrap-protocol protocol',
          description: 'Protocol to bootstrap windows servers. options: winrm/ssh',
@@ -311,6 +314,16 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
       fatal_exit('You must specify a virtual machine name OR use --random-vmname')
     end
 
+    abort '--template or knife[:source_vm] must be specified' unless config[:source_vm]
+
+    if get_config(:datastore) && get_config(:datastorecluster)
+      abort 'Please select either datastore or datastorecluster'
+    end
+
+    if get_config(:customization_macs) != AUTO_MAC && get_config(:customization_ips) == NO_IPS
+      abort('Must specify IP numbers with --cips when specifying MAC addresses with --cmacs, can use "dhcp" as placeholder')
+    end
+
     config[:chef_node_name] = vmname unless get_config(:chef_node_name)
     config[:vmname] = vmname
 
@@ -321,8 +334,6 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
 
     src_folder = find_folder(get_config(:folder)) || dc.vmFolder
 
-    abort '--template or knife[:source_vm] must be specified' unless config[:source_vm]
-
     src_vm = find_in_folder(src_folder, RbVmomi::VIM::VirtualMachine, config[:source_vm]) ||
              abort('VM/Template not found')
 
@@ -395,19 +406,18 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
     puts 'Waiting for network interfaces to become available...'
     sleep 2 while vm.guest.net.empty? || !vm.guest.ipAddress
     ui.info "Found address #{vm.guest.ipAddress}" if log_verbose?
-    guest_address ||=
-      config[:fqdn] = if config[:bootstrap_ipv4]
-                        ipv4_address(vm)
-                      elsif config[:fqdn]
-                        get_config(:fqdn)
-                      else
-                        # Use the first IP which is not a link-local address.
-                        # This is the closest thing to vm.guest.ipAddress but
-                        # allows specifying a NIC.
-                        vm.guest.net[bootstrap_nic_index].ipConfig.ipAddress.detect do |addr|
-                          addr.origin != 'linklayer'
-                        end.ipAddress
-                      end
+    config[:fqdn] = if config[:bootstrap_ipv4]
+                      ipv4_address(vm)
+                    elsif config[:fqdn]
+                      get_config(:fqdn)
+                    else
+                      # Use the first IP which is not a link-local address.
+                      # This is the closest thing to vm.guest.ipAddress but
+                      # allows specifying a NIC.
+                      vm.guest.net[bootstrap_nic_index].ipConfig.ipAddress.detect do |addr|
+                        addr.origin != 'linklayer'
+                      end.ipAddress
+                    end
   end
 
   def wait_for_access(connect_host, connect_port, protocol)
@@ -417,7 +427,7 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
         config[:winrm_port] = '5986'
       end
       connect_port = get_config(:winrm_port)
-      print "\n#{ui.color("Waiting for winrm access to become available on #{connect_host}:#{connect_port}",:magenta)}"
+      print "\n#{ui.color("Waiting for winrm access to become available on #{connect_host}:#{connect_port}", :magenta)}"
       print('.') until tcp_test_winrm(connect_host, connect_port) do
         sleep 10
         puts('done')
@@ -456,51 +466,47 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
     end
   end
 
-  # Builds a CloneSpec
-  def generate_clone_spec(src_config)
-    rspec = nil
-    if get_config(:resource_pool)
-      rspec = RbVmomi::VIM.VirtualMachineRelocateSpec(pool: find_pool(get_config(:resource_pool)))
-    else
-      dc = datacenter
-      hosts = traverse_folders_for_computeresources(dc.hostFolder)
-      fatal_exit('No ComputeResource found - Use --resource-pool to specify a resource pool or a cluster') if hosts.empty?
-      hosts.reject!(&:nil?)
-      hosts.reject! { |host| host.host.all? { |h| h.runtime.inMaintenanceMode } }
-      fatal_exit 'All hosts in maintenance mode!' if hosts.empty?
-
-      if get_config(:datastore)
-        hosts.reject! { |host| !host.datastore.include?(find_datastore(get_config(:datastore))) }
-      end
+  def find_available_hosts
+    hosts = traverse_folders_for_computeresources(datacenter.hostFolder)
+    fatal_exit('No ComputeResource found - Use --resource-pool to specify a resource pool or a cluster') if hosts.empty?
+    hosts.reject!(&:nil?)
+    hosts.reject! { |host| host.host.all? { |h| h.runtime.inMaintenanceMode } }
+    fatal_exit 'All hosts in maintenance mode!' if hosts.empty?
+    if get_config(:datastore)
+      hosts.reject! { |host| !host.datastore.include?(find_datastore(get_config(:datastore))) }
+    end
 
-      fatal_exit "No hosts have the requested Datastore available! #{get_config(:datastore)}" if hosts.empty?
+    fatal_exit "No hosts have the requested Datastore available! #{get_config(:datastore)}" if hosts.empty?
 
-      if get_config(:datastorecluster)
-        hosts.reject! { |host| !host.datastore.include?(find_datastorecluster(get_config(:datastorecluster))) }
-      end
+    if get_config(:datastorecluster)
+      hosts.reject! { |host| !host.datastore.include?(find_datastorecluster(get_config(:datastorecluster))) }
+    end
 
-      fatal_exit "No hosts have the requested DatastoreCluster available! #{get_config(:datastorecluster)}" if hosts.empty?
+    fatal_exit "No hosts have the requested DatastoreCluster available! #{get_config(:datastorecluster)}" if hosts.empty?
 
-      if get_config(:customization_vlan)
-        vlan_list = get_config(:customization_vlan).split(',')
-        vlan_list.each do |network|
-          hosts.reject! { |host| !host.network.include?(find_network(network)) }
-        end
+    if get_config(:customization_vlan)
+      vlan_list = get_config(:customization_vlan).split(',')
+      vlan_list.each do |network|
+        hosts.reject! { |host| !host.network.include?(find_network(network)) }
       end
+    end
 
-      fatal_exit "No hosts have the requested Network available! #{get_config(:customization_vlan)}" if hosts.empty?
+    fatal_exit "No hosts have the requested Network available! #{get_config(:customization_vlan)}" if hosts.empty?
+    hosts
+  end
 
-      rp = hosts.first.resourcePool
-      rspec = RbVmomi::VIM.VirtualMachineRelocateSpec(pool: rp)
-    end
+  # Builds a CloneSpec
+  def generate_clone_spec(src_config)
+    rspec = RbVmomi::VIM.VirtualMachineRelocateSpec
 
-    if get_config(:linked_clone)
-      rspec = RbVmomi::VIM.VirtualMachineRelocateSpec(diskMoveType: :moveChildMostDiskBacking)
-    end
+    rspec.pool = if get_config(:resource_pool)
+                   find_pool(get_config(:resource_pool))
+                 else
+                   hosts = find_available_hosts
+                   hosts.first.resourcePool
+                 end
 
-    if get_config(:datastore) && get_config(:datastorecluster)
-      abort 'Please select either datastore or datastorecluster'
-    end
+    rspec.diskMoveType = :moveChildMostDiskBacking if get_config(:linked_clone)
 
     if get_config(:datastore)
       rspec.datastore = find_datastore(get_config(:datastore))
@@ -516,9 +522,7 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
       end
     end
 
-    if get_config(:thin_provision)
-      rspec = RbVmomi::VIM.VirtualMachineRelocateSpec(transform: :sparse, pool: find_pool(get_config(:resource_pool)))
-    end
+    rspec.transform = :sparse if get_config(:thin_provision)
 
     is_template = !get_config(:mark_as_template).nil?
     clone_spec = RbVmomi::VIM.VirtualMachineCloneSpec(location: rspec, powerOn: false, template: is_template)
@@ -537,12 +541,8 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
       clone_spec.config.memoryMB = Integer(get_config(:customization_memory)) * 1024
     end
 
-    if get_config(:customization_macs) && !get_config(:customization_ips)
-        abort('Must specify IP numbers with --cips when specifying MAC addresses with --cmacs, can use "dhcp" as placeholder')
-    end
-
-    mac_list = if get_config(:customization_macs) == 'auto'
-                 ['auto'] * get_config(:customization_ips).split(',').length
+    mac_list = if get_config(:customization_macs) == AUTO_MAC
+                 [AUTO_MAC] * get_config(:customization_ips).split(',').length
                else
                  get_config(:customization_macs).split(',')
                end
@@ -581,21 +581,26 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
           # not connected to a distibuted switch?
           card.backing = RbVmomi::VIM::VirtualEthernetCardNetworkBackingInfo(network: network, deviceName: network.name)
         end
-        card.macAddress = mac_list[index] if get_config(:customization_macs) && mac_list[index] != 'auto'
+        card.macAddress = mac_list[index] if get_config(:customization_macs) && mac_list[index] != AUTO_MAC
         dev_spec = RbVmomi::VIM.VirtualDeviceConfigSpec(device: card, operation: 'edit')
         clone_spec.config.deviceChange.push dev_spec
       end
     end
 
-    if get_config(:customization_spec)
-      csi = find_customization(get_config(:customization_spec)) ||
-            fatal_exit("failed to find customization specification named #{get_config(:customization_spec)}")
+    cust_spec = if get_config(:customization_spec)
+                  csi = find_customization(get_config(:customization_spec)) ||
+                    fatal_exit("failed to find customization specification named #{get_config(:customization_spec)}")
 
-      cust_spec = csi.spec
-    else
-      global_ipset = RbVmomi::VIM.CustomizationGlobalIPSettings
-      identity_settings = RbVmomi::VIM.CustomizationIdentitySettings
-      cust_spec = RbVmomi::VIM.CustomizationSpec(globalIPSettings: global_ipset, identity: identity_settings)
+                  csi.spec
+                else
+                  global_ipset = RbVmomi::VIM.CustomizationGlobalIPSettings
+                  identity_settings = RbVmomi::VIM.CustomizationIdentitySettings
+                  RbVmomi::VIM.CustomizationSpec(globalIPSettings: global_ipset, identity: identity_settings)
+                end
+
+    if get_config(:disable_customization)
+      clone_spec.customization = get_config(:customization_spec) ? cust_spec : nil
+      return clone_spec
     end
 
     if get_config(:customization_dns_ips)
@@ -612,71 +617,67 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
       }
     end
 
-    if get_config(:disable_customization)
-      clone_spec.customization = cust_spec
-    else
-      use_ident = !config[:customization_hostname].nil? || !get_config(:customization_domain).nil? || cust_spec.identity.nil?
-
-      if use_ident
-        hostname = if config[:customization_hostname]
-                     config[:customization_hostname]
-                   else
-                     config[:vmname]
-                   end
-        if windows?(src_config)
-          identification = RbVmomi::VIM.CustomizationIdentification(
-            joinWorkgroup: cust_spec.identity.identification.joinWorkgroup
-          )
-          license_file_print_data = RbVmomi::VIM.CustomizationLicenseFilePrintData(
-            autoMode: cust_spec.identity.licenseFilePrintData.autoMode
-          )
-
-          user_data = RbVmomi::VIM.CustomizationUserData(
-            fullName: cust_spec.identity.userData.fullName,
-            orgName: cust_spec.identity.userData.orgName,
-            productId: cust_spec.identity.userData.productId,
-            computerName: RbVmomi::VIM.CustomizationFixedName(name: hostname)
-          )
-
-          gui_unattended = RbVmomi::VIM.CustomizationGuiUnattended(
-            autoLogon: cust_spec.identity.guiUnattended.autoLogon,
-            autoLogonCount: cust_spec.identity.guiUnattended.autoLogonCount,
-            password: RbVmomi::VIM.CustomizationPassword(
-              plainText: cust_spec.identity.guiUnattended.password.plainText,
-              value: cust_spec.identity.guiUnattended.password.value
-            ),
-            timeZone: cust_spec.identity.guiUnattended.timeZone
-          )
-          runonce = RbVmomi::VIM.CustomizationGuiRunOnce(
-            commandList: ['cust_spec.identity.guiUnattended.commandList']
-          )
-          ident = RbVmomi::VIM.CustomizationSysprep
-          ident.guiRunOnce = runonce
-          ident.guiUnattended = gui_unattended
-          ident.identification = identification
-          ident.licenseFilePrintData = license_file_print_data
-          ident.userData = user_data
-          cust_spec.identity = ident
-        elsif linux?(src_config)
-          ident = RbVmomi::VIM.CustomizationLinuxPrep
-          ident.hostName = RbVmomi::VIM.CustomizationFixedName(name: hostname)
-
-          ident.domain = if get_config(:customization_domain)
-                           get_config(:customization_domain)
-                         else
-                           ''
-                         end
-          cust_spec.identity = ident
-        else
-          ui.error('Customization only supports Linux and Windows currently.')
-          exit 1
-        end
+    # TODO: why does the domain matter?
+    use_ident = config[:customization_hostname] || get_config(:customization_domain) || cust_spec.identity.props.empty?
+
+    # TODO: How could we not take this? Only if the identity were empty, but that's statically defined as empty above
+    if use_ident
+      hostname = config[:customization_hostname] || config[:vmname]
+
+      if windows?(src_config)
+        # TODO: This is just copying itself onto itself, isn't it?
+        identification = RbVmomi::VIM.CustomizationIdentification(
+          joinWorkgroup: cust_spec.identity.identification.joinWorkgroup
+        )
+        license_file_print_data = RbVmomi::VIM.CustomizationLicenseFilePrintData(
+          autoMode: cust_spec.identity.licenseFilePrintData.autoMode
+        )
+
+        user_data = RbVmomi::VIM.CustomizationUserData(
+          fullName: cust_spec.identity.userData.fullName,
+          orgName: cust_spec.identity.userData.orgName,
+          productId: cust_spec.identity.userData.productId,
+          computerName: RbVmomi::VIM.CustomizationFixedName(name: hostname)
+        )
+
+        gui_unattended = RbVmomi::VIM.CustomizationGuiUnattended(
+          autoLogon: cust_spec.identity.guiUnattended.autoLogon,
+          autoLogonCount: cust_spec.identity.guiUnattended.autoLogonCount,
+          password: RbVmomi::VIM.CustomizationPassword(
+            plainText: cust_spec.identity.guiUnattended.password.plainText,
+            value: cust_spec.identity.guiUnattended.password.value
+          ),
+          timeZone: cust_spec.identity.guiUnattended.timeZone
+        )
+        runonce = RbVmomi::VIM.CustomizationGuiRunOnce(
+          commandList: ['cust_spec.identity.guiUnattended.commandList']
+        )
+        ident = RbVmomi::VIM.CustomizationSysprep
+        ident.guiRunOnce = runonce
+        ident.guiUnattended = gui_unattended
+        ident.identification = identification
+        ident.licenseFilePrintData = license_file_print_data
+        ident.userData = user_data
+        cust_spec.identity = ident
+      elsif linux?(src_config)
+        ident = RbVmomi::VIM.CustomizationLinuxPrep
+        ident.hostName = RbVmomi::VIM.CustomizationFixedName(name: hostname)
+
+        ident.domain = if get_config(:customization_domain)
+                         get_config(:customization_domain)
+                       else
+                         ''
+                       end
+        cust_spec.identity = ident
+      else
+        ui.error('Customization only supports Linux and Windows currently.')
+        exit 1
       end
-      clone_spec.customization = cust_spec
+    end
+    clone_spec.customization = cust_spec
 
-      if customization_plugin && customization_plugin.respond_to?(:customize_clone_spec)
-        clone_spec = customization_plugin.customize_clone_spec(src_config, clone_spec)
-      end
+    if customization_plugin && customization_plugin.respond_to?(:customize_clone_spec)
+      clone_spec = customization_plugin.customize_clone_spec(src_config, clone_spec)
     end
     clone_spec
   end
@@ -717,7 +718,7 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
   # @param name [String] name of customization
   # @return [RbVmomi::VIM::CustomizationSpecItem]
   def find_customization(name)
-    csm = config[:vim].serviceContent.customizationSpecManager
+    csm = vim_connection.serviceContent.customizationSpecManager
     csm.GetCustomizationSpec(name: name)
   end
 
@@ -748,7 +749,7 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
     end
 
     adapter_map = RbVmomi::VIM.CustomizationAdapterMapping
-    adapter_map.macAddress = mac if !mac.nil? && (mac != 'auto')
+    adapter_map.macAddress = mac if !mac.nil? && (mac != AUTO_MAC)
     adapter_map.adapter = settings
     adapter_map
   end
@@ -789,6 +790,7 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
       ui.error('Unsupported Bootstrapping Protocol. Supports : winrm, ssh')
       exit 1
     end
+    bootstrap.config[:msi_url] = get_config(:bootstrap_msi_url)
     bootstrap_common_params(bootstrap)
   end
 
@@ -802,6 +804,7 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
     bootstrap.config[:ssh_port] = get_config(:ssh_port)
     bootstrap.config[:identity_file] = get_config(:identity_file)
     bootstrap.config[:use_sudo] = true unless get_config(:ssh_user) == 'root'
+    bootstrap.config[:use_sudo_password] = true unless get_config(:ssh_user) == 'root'
     bootstrap.config[:log_level] = get_config(:log_level)
     bootstrap_common_params(bootstrap)
   end

data/lib/chef/knife/vsphere_vm_find.rb

@@ -8,10 +8,6 @@ require 'chef/knife/base_vsphere_command'
 require 'rbvmomi'
 require 'netaddr'
 
-PsOn = 'poweredOn'
-PsOff = 'poweredOff'
-PsSuspended = 'suspended'
-
 # find vms belonging to pool that match criteria, display specified fields
 class Chef::Knife::VsphereVmFind < Chef::Knife::BaseVsphereCommand
   banner 'knife vsphere vm find'
@@ -95,22 +91,20 @@ class Chef::Knife::VsphereVmFind < Chef::Knife::BaseVsphereCommand
          long: '--full-path',
          description: 'Show full path'
 
-  $stdout.sync = true   # smoother output from print
+  $stdout.sync = true # smoother output from print
 
   def traverse_folders_for_pool_clustercompute(folder, poolname)
-    # children = folder.children.find_all
     children = find_all_in_folder(folder, RbVmomi::VIM::ManagedObject)
     children.each do |child|
-      if child.class == RbVmomi::VIM::ClusterComputeResource || child.class == RbVmomi::VIM::ComputeResource || child.class == RbVmomi::VIM::ResourcePool
-        if child.name == poolname then return child
-         else if child.class == RbVmomi::VIM::Folder || child.class == RbVmomi::VIM::ComputeResource || child.class == RbVmomi::VIM::ClusterComputeResource || child.class == RbVmomi::VIM::ResourcePool
-                pool = traverse_folders_for_pool_clustercompute(child, poolname)
-              end
-        end
-        if pool then return pool end
+      next unless child.class == RbVmomi::VIM::ClusterComputeResource || child.class == RbVmomi::VIM::ComputeResource || child.class == RbVmomi::VIM::ResourcePool
+      if child.name == poolname
+        return child
+      elsif child.class == RbVmomi::VIM::Folder || child.class == RbVmomi::VIM::ComputeResource || child.class == RbVmomi::VIM::ClusterComputeResource || child.class == RbVmomi::VIM::ResourcePool
+        pool = traverse_folders_for_pool_clustercompute(child, poolname)
       end
+      return pool if pool
     end
-    return false
+    false
   end
 
   def run
@@ -120,125 +114,124 @@ class Chef::Knife::VsphereVmFind < Chef::Knife::BaseVsphereCommand
       fatal_exit('You must specify a resource pool or cluster name (see knife vsphere pool list)')
     end
 
-    vim = vim_connection
+    vim_connection
     dc = datacenter
     folder = dc.hostFolder
 
-    pool = traverse_folders_for_pool_clustercompute(folder, poolname) or abort "Pool #{poolname} not found"
+    pool = traverse_folders_for_pool_clustercompute(folder, poolname) || abort("Pool #{poolname} not found")
 
-    if pool.class == RbVmomi::VIM::ResourcePool
-      vm = pool.vm
-    else
-      vm = pool.resourcePool.vm
-    end
-
-    unless vm.nil?
-      vm.each do |vmc|
-       state = case vmc.runtime.powerState
-               when PsOn
-                 ui.color('on', :green)
-               when PsOff
-                 ui.color('off', :red)
-               when PsSuspended
-                 ui.color('suspended', :yellow)
-               end
-
-       if get_config(:matchname)
-         next unless vmc.name.include? config[:matchname]
-       end
-
-       if get_config(:matchtools)
-         next unless vmc.guest.toolsStatus == config[:matchtools]
-       end
-
-       next if get_config(:soff) && (vmc.runtime.powerState == PsOn)
-
-       next if get_config(:son) && (vmc.runtime.powerState == PsOff)
-
-       if get_config(:matchip)
-         if (!vmc.guest.ipAddress.nil? && vmc.guest.ipAddress != '')
-           next unless vmc.guest.ipAddress.include? config[:matchip]
-       else
-         next
+    vm = if pool.class == RbVmomi::VIM::ResourcePool
+           pool.vm
+         else
+           pool.resourcePool.vm
          end
-       end
 
-       unless vmc.guest.guestFullName.nil?
-         if get_config(:matchos)
-           next unless vmc.guest.guestFullName.include? config[:matchos]
-         end
-       end
-
-       print "#{ui.color("VM Name:", :cyan)} #{vmc.name}\t"
-       if get_config(:hostname)
-         print "#{ui.color("Hostname:", :cyan)} #{vmc.guest.hostName}\t"
-       end
-
-       if get_config(:full_path)
-         actualname = ''
-         vmcp = vmc
-         while vmcp.parent != nil && vmcp.parent.name != 'vm'
-           actualname.concat("#{vmcp.parent.name}/")
-           vmcp = vmcp.parent
-         end
-         print "#{ui.color("Folder:", :cyan)}"
-         print "\""
-         print actualname.split('/').reverse().join('/')
-         print "\"\t"
-
-       else
-         print "#{ui.color("Folder", :cyan)}: #{vmc.parent.name}\t"
-       end
-
-       if get_config(:ip)
-         print "#{ui.color("IP:", :cyan)} #{vmc.guest.ipAddress}\t"
-       end
-       if get_config(:ips)
-         ipregex = /^(?:[0-9]{1,3}\.){3}[0-9]{1,3}$/
-         networks = vmc.guest.net.map { |net| "#{net.network}:" + net.ipConfig.ipAddress.select { |i| i.ipAddress[ipregex] }[0].ipAddress }
-         print "#{ui.color("IPS:", :cyan)} #{networks.join(",")}\t"
-       end
-       if get_config(:os)
-         print "#{ui.color("OS:", :cyan)} #{vmc.guest.guestFullName}\t"
-       end
-       if get_config(:ram)
-         print "#{ui.color("RAM:", :cyan)} #{vmc.summary.config.memorySizeMB}\t"
-       end
-       if get_config(:cpu)
-         print "#{ui.color("CPU:", :cyan)} #{vmc.summary.config.numCpu}\t"
-       end
-       if get_config(:alarms)
-         print "#{ui.color("Alarms:", :cyan)} #{vmc.summary.overallStatus}\t"
-       end
-       print "#{ui.color("State:", :cyan)} #{state}\t"
-       if get_config(:tools)
-         print "#{ui.color("Tools:", :cyan)} #{vmc.guest.toolsStatus}\t"
-       end
-
-       if get_config(:os_disk)
-         print "#{ui.color("OS Disks:", :cyan)}"
-         vmc.guest.disk.each do |disc|
-           print "#{disc.diskPath} #{disc.capacity / 1024 / 1024}MB Free:#{disc.freeSpace / 1024 / 1024}MB |"
-         end
-       end
+    return if vm.nil?
+    vm.each do |vmc|
+      state = case vmc.runtime.powerState
+              when PS_ON
+                ui.color('on', :green)
+              when PS_OFF
+                ui.color('off', :red)
+              when PS_SUSPENDED
+                ui.color('suspended', :yellow)
+              end
 
-       if get_config(:esx_disk)
-         print "#{ui.color("ESX Disks:", :cyan)}"
-         vmc.layout.disk.each do |dsc|
-           print "#{dsc.diskFile} | "
-         end
-       end
-
-       if get_config(:snapshots)
-         unless vmc.snapshot.nil?
-           print "#{ui.color("Snapshots:", :cyan)}"
-           vmc.snapshot.rootSnapshotList.each do |snap|
-             print " #{snap.name}"
-           end
-         end
-       end
-       puts
+      if get_config(:matchname)
+        next unless vmc.name.include? config[:matchname]
+      end
+
+      if get_config(:matchtools)
+        next unless vmc.guest.toolsStatus == config[:matchtools]
+      end
+
+      next if get_config(:soff) && (vmc.runtime.powerState == PS_ON)
+
+      next if get_config(:son) && (vmc.runtime.powerState == PS_OFF)
+
+      if get_config(:matchip)
+        if !vmc.guest.ipAddress.nil? && vmc.guest.ipAddress != ''
+          next unless vmc.guest.ipAddress.include? config[:matchip]
+        else
+          next
+        end
+      end
+
+      unless vmc.guest.guestFullName.nil?
+        if get_config(:matchos)
+          next unless vmc.guest.guestFullName.include? config[:matchos]
+        end
+      end
+
+      print "#{ui.color('VM Name:', :cyan)} #{vmc.name}\t"
+      if get_config(:hostname)
+        print "#{ui.color('Hostname:', :cyan)} #{vmc.guest.hostName}\t"
+      end
+
+      if get_config(:full_path)
+        actualname = ''
+        vmcp = vmc
+        while !vmcp.parent.nil? && vmcp.parent.name != 'vm'
+          actualname.concat("#{vmcp.parent.name}/")
+          vmcp = vmcp.parent
+        end
+        print ui.color('Folder:', :cyan)
+        print '"'
+        print actualname.split('/').reverse.join('/')
+        print "\"\t"
+
+      else
+        print "#{ui.color('Folder', :cyan)}: #{vmc.parent.name}\t"
+      end
+
+      if get_config(:ip)
+        print "#{ui.color('IP:', :cyan)} #{vmc.guest.ipAddress}\t"
+      end
+      if get_config(:ips)
+        ipregex = /^(?:[0-9]{1,3}\.){3}[0-9]{1,3}$/
+        networks = vmc.guest.net.map { |net| "#{net.network}:" + net.ipConfig.ipAddress.select { |i| i.ipAddress[ipregex] }[0].ipAddress }
+        print "#{ui.color('IPS:', :cyan)} #{networks.join(',')}\t"
+      end
+      if get_config(:os)
+        print "#{ui.color('OS:', :cyan)} #{vmc.guest.guestFullName}\t"
+      end
+      if get_config(:ram)
+        print "#{ui.color('RAM:', :cyan)} #{vmc.summary.config.memorySizeMB}\t"
+      end
+      if get_config(:cpu)
+        print "#{ui.color('CPU:', :cyan)} #{vmc.summary.config.numCpu}\t"
+      end
+      if get_config(:alarms)
+        print "#{ui.color('Alarms:', :cyan)} #{vmc.summary.overallStatus}\t"
+      end
+      print "#{ui.color('State:', :cyan)} #{state}\t"
+      if get_config(:tools)
+        print "#{ui.color('Tools:', :cyan)} #{vmc.guest.toolsStatus}\t"
+      end
+
+      if get_config(:os_disk)
+        print ui.color('OS Disks:', :cyan)
+        vmc.guest.disk.each do |disc|
+          print "#{disc.diskPath} #{disc.capacity / 1024 / 1024}MB Free:#{disc.freeSpace / 1024 / 1024}MB |"
+        end
+      end
+
+      if get_config(:esx_disk)
+        print ui.color('ESX Disks:', :cyan)
+        vmc.layout.disk.each do |dsc|
+          print "#{dsc.diskFile} | "
+        end
+      end
+
+      if get_config(:snapshots)
+        unless vmc.snapshot.nil?
+          print ui.color('Snapshots:', :cyan)
+          vmc.snapshot.rootSnapshotList.each do |snap|
+            print " #{snap.name}"
+          end
+        end
       end
+      puts
     end
   end
 end

data/lib/chef/knife/vsphere_vm_state.rb

@@ -8,18 +8,14 @@ require 'chef/knife/base_vsphere_command'
 require 'rbvmomi'
 require 'netaddr'
 
-PS_ON = 'poweredOn'
-PS_OFF = 'poweredOff'
-PS_SUSPENDED = 'suspended'
-
-POWER_STATES = {
-  PS_ON => 'powered on',
-  PS_OFF => 'powered off',
-  PS_SUSPENDED => 'suspended'
-}
-
 # Manage power state of a virtual machine
 class Chef::Knife::VsphereVmState < Chef::Knife::BaseVsphereCommand
+  POWER_STATES = {
+    PS_ON => 'powered on',
+    PS_OFF => 'powered off',
+    PS_SUSPENDED => 'suspended'
+  }
+
   banner 'knife vsphere vm state VMNAME (options)'
 
   common_options

data/lib/knife-vsphere/version.rb

@@ -1,3 +1,3 @@
 module KnifeVsphere
-  VERSION = '1.2.14'
+  VERSION = '1.2.16'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-vsphere
 version: !ruby/object:Gem::Version
-  version: 1.2.14
+  version: 1.2.16
 platform: ruby
 authors:
 - Ezra Pagel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-30 00:00:00.000000000 Z
+date: 2016-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: filesize
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: VMware vSphere Support for Chef's Knife Command
 email: ezra@cpan.org
 executables: []