knife-vsphere 1.2.21 → 1.2.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75be37e04c524b55d4e49cf27e95b5d689f4588f
-  data.tar.gz: d68bd0bb8b73ce62437191cf74efec809e1412af
+  metadata.gz: c6a2061ebd4d7e9f14eb44fb90f8641e2f811c4c
+  data.tar.gz: 179ce77c203ad335c82a872ed55a93e8d4e8751c
 SHA512:
-  metadata.gz: aa48a83dc562b4af0798e3faa1bb9cba61b01343bf215f1937950b8e5b13f0f8b3e8a58d6d9065271a3cd9e1ec6fb2e350170b8b5e6fd2d2a6189a53dab13151
-  data.tar.gz: 84a0f2525640c43902a15ad7685ae91e9949f10dd26887d397ba20791713188387642aa8066862567f10b014bd3131be11113373c98530305711f070dd937d3a
+  metadata.gz: c78a89b81505d49aee5040c9863f128437bc55c54d4a7cd36e69e4af48ac700d1b89b7ac646b7f9ff0e5b11ff1c371b8d3d7e4ce407ee66fd2d094f2559658d6
+  data.tar.gz: d485ec257d46837ba95cb19ca1ed9148ce3193dafe1dfbf0eea04af3a6f3630286a67a2323349fdd6ce6ae893846ec87518db1da8c8277765af4be97896de0fe

data/lib/chef/knife/base_vsphere_command.rb

@@ -146,6 +146,19 @@ class Chef
         false
       end
 
+      def traverse_folders_for_pools(folder)
+        retval = []
+        children = folder.children.find_all
+        children.each do |child|
+          if child.class == RbVmomi::VIM::ResourcePool
+            retval << child
+          elsif child.class == RbVmomi::VIM::Folder
+            retval.concat(traverse_folders_for_pools(child))
+          end
+        end
+        retval
+      end
+
       def traverse_folders_for_computeresources(folder)
         retval = []
         children = folder.children.find_all
@@ -185,6 +198,13 @@ class Chef
         false
       end
 
+      def find_pools_and_clusters(folder, poolname = nil)
+        pools = traverse_folders_for_pools(folder)
+        clusters = traverse_folders_for_computeresources(folder)
+        cluster_pool = clusters + pools
+        poolname.nil? ? cluster_pool : cluster_pool.select { |p| p.name == poolname }
+      end
+
       def datacenter
         dcname = get_config(:vsphere_dc)
         traverse_folders_for_dc(vim_connection.rootFolder, dcname) || abort('datacenter not found')
@@ -293,6 +313,23 @@ class Chef
         nil
       end
 
+      def number_to_human_size(number)
+        number = number.to_f
+        storage_units_fmt = %w(byte kB MB GB TB)
+        base = 1024
+        if number.to_i < base
+          unit = storage_units_fmt[0]
+        else
+          max_exp = storage_units_fmt.size - 1
+          exponent = (Math.log(number) / Math.log(base)).to_i # Convert to base
+          exponent = max_exp if exponent > max_exp # we need this to avoid overflow for the highest unit
+          number /= base**exponent
+          unit = storage_units_fmt[exponent]
+        end
+
+        format('%0.2f %s', number, unit)
+      end
+
       def find_device(vm, deviceName)
         vm.config.hardware.device.each do |device|
           return device if device.deviceInfo.label == deviceName

data/lib/chef/knife/vsphere_cluster_list.rb

@@ -17,11 +17,11 @@ class Chef::Knife::VsphereClusterList < Chef::Knife::BaseVsphereCommand
 
     if folder.is_a? RbVmomi::VIM::ClusterComputeResource
       clusters = folder.path[3..-1].reject { |p| p.last == 'ClusterComputeResource' }
-      puts "#{ui.color('Cluster', :cyan)}: " + clusters.map(&:last).join('/')
+      return { 'Cluster' => clusters.map(&:last).join('/') }
     end
 
     folders = find_all_in_folder(folder, RbVmomi::VIM::ManagedObject) || []
-    folders.each do |child|
+    folders.map do |child|
       traverse_folders(child)
     end
   end
@@ -42,6 +42,6 @@ class Chef::Knife::VsphereClusterList < Chef::Knife::BaseVsphereCommand
   def run
     vim_connection
     base_folder = find_cluster_folder(get_config(:folder))
-    traverse_folders(base_folder)
+    ui.output(traverse_folders(base_folder))
   end
 end

data/lib/chef/knife/vsphere_datastore_list.rb

@@ -18,23 +18,6 @@
 require 'chef/knife'
 require 'chef/knife/base_vsphere_command'
 
-def number_to_human_size(number)
-  number = number.to_f
-  storage_units_fmt = %w(byte kB MB GB TB)
-  base = 1024
-  if number.to_i < base
-    unit = storage_units_fmt[0]
-  else
-    max_exp = storage_units_fmt.size - 1
-    exponent = (Math.log(number) / Math.log(base)).to_i # Convert to base
-    exponent = max_exp if exponent > max_exp # we need this to avoid overflow for the highest unit
-    number /= base**exponent
-    unit = storage_units_fmt[exponent]
-  end
-
-  format('%0.2f %s', number, unit)
-end
-
 # Lists all known data stores in datacenter with sizes
 class Chef::Knife::VsphereDatastoreList < Chef::Knife::BaseVsphereCommand
   banner 'knife vsphere datastore list'
@@ -46,23 +29,49 @@ class Chef::Knife::VsphereDatastoreList < Chef::Knife::BaseVsphereCommand
          short: '-L',
          description: "Indicates whether to list VM's in datastore",
          boolean: true
+  option :pool,
+         long: '--pool pool',
+         description: 'Target pool'
 
   def run
     $stdout.sync = true
 
     vim_connection
     dc = datacenter
-    dc.datastore.each do |store|
+    folder = dc.hostFolder
+    target_pool = get_config(:pool)
+
+    pools = find_pools_and_clusters(folder, target_pool)
+    if target_pool && pools.empty?
+      puts "Pool #{target_pool} not found"
+      return
+    end
+
+    pool_info = pools.map do |pool|
+      datastores = list_ds(pool)
+      { 'Pool' => pool.name, 'Datastores' => datastores }
+    end
+    ui.output(pool_info)
+  end
+
+  private
+
+  def list_vms(store)
+    store.vm.map do |vm|
+      host_name = vm.guest[:hostName]
+      guest_full_name = vm.guest[:guest_full_name]
+      guest_state = vm.guest[:guest_state]
+      { 'VM Name' => host_name, 'OS' => guest_full_name, 'State' => guest_state }
+    end
+  end
+
+  def list_ds(pool)
+    pool.datastore.map do |store|
       avail = number_to_human_size(store.summary[:freeSpace])
       cap = number_to_human_size(store.summary[:capacity])
-      puts "#{ui.color('Datastore', :cyan)}: #{store.name} (#{avail} / #{cap})"
-      next unless get_config(:list)
-      store.vm.each do |vms|
-        host_name = vms.guest[:hostName]
-        guest_full_name = vms.guest[:guest_full_name]
-        guest_state = vms.guest[:guest_state]
-        puts "#{ui.color('VM Name:', :green)} #{host_name} #{ui.color('OS:', :magenta)} #{guest_full_name} #{ui.color('State:', :cyan)} #{guest_state}"
-      end
+      ds_info = { 'Datastore' => store.name, 'Free' => avail, 'Capacity' => cap }
+      ds_info['Vms'] = list_vms(store) if get_config(:list)
+      ds_info
     end
   end
 end

data/lib/chef/knife/vsphere_datastore_maxfree.rb

@@ -39,7 +39,7 @@ class Chef::Knife::VsphereDatastoreMaxfree < Chef::Knife::BaseVsphereCommand
 
     vim_connection
     dcname = get_config(:vsphere_dc)
-    regex = /#{Regexp.escape(get_config(:regex))}/
+    regex = /#{get_config(:regex)}/
     dc = config[:vim].serviceInstance.find_datacenter(dcname) || abort('datacenter not found')
     max = nil
     datastores = if get_config(:vlan)

data/lib/chef/knife/vsphere_hosts_list.rb

@@ -13,11 +13,6 @@ class Chef::Knife::VsphereHostsList < Chef::Knife::BaseVsphereCommand
          short: '-h',
          description: 'Target pool'
 
-  def find_pools(folder, poolname = nil)
-    pools = folder.children.find_all.select { |p| p.is_a?(RbVmomi::VIM::ComputeResource) || p.is_a?(RbVmomi::VIM::ResourcePool) }
-    poolname.nil? ? pools : pools.select { |p| p.name == poolname }
-  end
-
   def run
     vim_connection
     dc = datacenter
@@ -25,18 +20,25 @@ class Chef::Knife::VsphereHostsList < Chef::Knife::BaseVsphereCommand
 
     target_pool = config[:pool]
 
-    pools = find_pools(folder, target_pool)
+    pools = find_pools_and_clusters(folder, target_pool)
     if target_pool && pools.empty?
       puts "Pool #{target_pool} not found"
       return
     end
 
-    pools.each do |pool|
-      puts "#{ui.color('Pool', :cyan)}: #{pool.name}"
-      hosts = pool.host || []
-      hosts.each do |hostc|
-        puts "  #{ui.color('Host', :cyan)}: #{hostc.name}"
-      end
+    pool_list = pools.map do |pool|
+      host_list = list_hosts(pool)
+      { 'Pool' => pool.name, 'Hosts' => host_list }
+    end
+    ui.output(pool_list)
+  end
+
+  private
+
+  def list_hosts(pool)
+    hosts = pool.host || []
+    hosts.map do |hostc|
+      { 'Host' => hostc.name }
     end
   end
 end

data/lib/chef/knife/vsphere_template_list.rb

@@ -23,8 +23,10 @@ class Chef::Knife::VsphereTemplateList < Chef::Knife::BaseVsphereCommand
     vms = find_all_in_folder(base_folder, RbVmomi::VIM::VirtualMachine)
           .select { |v| !v.config.nil? && v.config.template == true }
 
-    vms.each do |vm|
-      puts "#{ui.color('Template Name', :cyan)}: #{vm.name}"
+    vm_list = vms.map do |vm|
+      { 'Template Name' => vm.name }
     end
+
+    ui.output(vm_list)
   end
 end

data/lib/chef/knife/vsphere_vm_clone.rb

@@ -1,4 +1,3 @@
-#
 # Author:: Ezra Pagel (<ezra@cpan.org>)
 # Contributor:: Jesse Campbell (<hikeit@gmail.com>)
 # Contributor:: Bethany Erskine (<bethany@paperlesspost.com>)
@@ -44,6 +43,10 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
          long: '--datastorecluster STORE',
          description: 'The datastorecluster into which to put the cloned VM'
 
+  option :host,
+         long: '--host HOST',
+         description: 'The host into which to put the cloned VM'
+
   option :resource_pool,
          long: '--resource-pool POOL',
          description: 'The resource pool or cluster into which to put the cloned VM'
@@ -505,16 +508,40 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
     hosts
   end
 
+  def all_the_hosts
+    hosts = traverse_folders_for_computeresources(datacenter.hostFolder)
+    all_hosts = []
+    hosts.each do |host|
+      if host.is_a? RbVmomi::VIM::ClusterComputeResource
+        all_hosts.concat(host.host)
+      else
+        all_hosts.push host
+      end
+    end
+    all_hosts
+  end
+
+  def find_host(host_name)
+    host = all_the_hosts.find { |host| host.name == host_name }
+    raise "Can't find #{host_name}. I found #{all_the_hosts.map(&:name)}" unless host
+    host
+  end
+
   # Builds a CloneSpec
   def generate_clone_spec(src_config)
     rspec = RbVmomi::VIM.VirtualMachineRelocateSpec
 
-    rspec.pool = if get_config(:resource_pool)
-                   find_pool(get_config(:resource_pool))
-                 else
-                   hosts = find_available_hosts
-                   hosts.first.resourcePool
-                 end
+    case
+    when get_config(:host)
+      rspec.host = find_host(get_config(:host))
+      hosts = find_available_hosts
+      rspec.pool = hosts.first.resourcePool
+    when get_config(:resource_pool)
+      rspec.pool = find_pool(get_config(:resource_pool))
+    else
+      hosts = find_available_hosts
+      rspec.pool = hosts.first.resourcePool
+    end
 
     rspec.diskMoveType = :moveChildMostDiskBacking if get_config(:linked_clone)
 

data/lib/knife-vsphere/version.rb

@@ -1,3 +1,3 @@
 module KnifeVsphere
-  VERSION = '1.2.21'
+  VERSION = '1.2.22'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-vsphere
 version: !ruby/object:Gem::Version
-  version: 1.2.21
+  version: 1.2.22
 platform: ruby
 authors:
 - Ezra Pagel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-06 00:00:00.000000000 Z
+date: 2016-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: filesize
@@ -194,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: vSphere Support for Knife