knife-vsphere 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f069c4c03cfac41d16940d9a0001ce6e5782baf
-  data.tar.gz: 747a52f56b215dfbee8b1c5260422513f0fcc5f6
+  metadata.gz: 7da50d689bdd4164cea3df391395eca1a9acb4e5
+  data.tar.gz: 6682cf4d67ef8da7290a9fda877813b8ab33a8e5
 SHA512:
-  metadata.gz: ee2324c39ef703042d4aa565c9af42c18f9dd91a582ac6af875c8d691b17662a6df07162ad7a6265672eeecacd3ca9a6b53f3238a19773c5bb3bb74fcfba57a0
-  data.tar.gz: d9ef842ef5b50f283086b6a28efdbc8c5df0d0f6d259498f51c149b9c7c7576ca189328640568c47c443032b0665af03b03767e57f7e3193ec989635ccb39a84
+  metadata.gz: e1f0c1e19b98f0292b9596ed8df1fae872f88c17d8fb3e0ba0d4f0d78a115a54e18c0b224165d19fd6b0e22bd02c492d151312e7a932708636f96c7b305b19fd
+  data.tar.gz: 2f286acc8610eeba75e6edadb76a3c6282b2243eec4fbd7c1582962b5f3b5baea2a57041db9f6e94ee3308035f80a526c08fe0d448ab07717aacddb0f31939fc

data/lib/chef/knife/search_helper.rb

@@ -0,0 +1,41 @@
+# Some helpers for faster searching of the inventory
+module SearchHelper
+  # Retrieves all the VM objects and returns their ObjectContents
+  # Note that since it's a ObjectContent coming back, the individual
+  # object's [] will return only the properties you asked for
+  # 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'])
+    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,
+                                         type: ['VirtualMachine'],
+                                         recursive: true)
+
+    filter_spec = RbVmomi::VIM.PropertyFilterSpec(
+      objectSet: [
+        obj: vmview,
+        skip: true,
+        selectSet: [
+          RbVmomi::VIM.TraversalSpec(
+            name: 'traverseEntities',
+            type: 'ContainerView',
+            path: 'view',
+            skip: false
+          )
+        ]
+      ],
+      propSet: [
+        { type: 'VirtualMachine', pathSet: properties }
+      ]
+    )
+    pc.RetrieveProperties(specSet: [filter_spec])
+  end
+
+  def get_vm_by_name(vmname)
+    vm = get_all_vm_objects.detect { |r| r['name'] == vmname }
+    vm ? vm.obj : nil
+  end
+end

data/lib/chef/knife/vsphere_vm_config.rb

@@ -3,11 +3,11 @@
 
 require 'chef/knife'
 require 'chef/knife/base_vsphere_command'
-require 'rbvmomi'
-require 'netaddr'
+require 'chef/knife/search_helper'
 
 # VsphereVMconfig extends the BaseVspherecommand
 class Chef::Knife::VsphereVmConfig < Chef::Knife::BaseVsphereCommand
+  include SearchHelper
   banner "knife vsphere vm config VMNAME PROPERTY VALUE.
           See \"http://pubs.vmware.com/vi3/sdk/ReferenceGuide/vim.vm.ConfigSpec.html\"
           for allowed ATTRIBUTE values (any property of type xs:string is supported)."
@@ -39,10 +39,7 @@ class Chef::Knife::VsphereVmConfig < 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) || fatal_exit("Could not find #{vmname}")
 
     properties = {}
     properties[property_name] = property_value

data/lib/chef/knife/vsphere_vm_disk_list.rb

@@ -1,9 +1,12 @@
 require 'chef/knife'
 require 'chef/knife/base_vsphere_command'
+require 'chef/knife/search_helper'
 
 # List the disks attached to a VM
 # VsphereVmdisklist extends the BaseVspherecommand
 class Chef::Knife::VsphereVmDiskList < Chef::Knife::BaseVsphereCommand
+  include SearchHelper
+
   banner 'knife vsphere vm disk list VMNAME'
 
   common_options
@@ -18,9 +21,7 @@ class Chef::Knife::VsphereVmDiskList < Chef::Knife::BaseVsphereCommand
       fatal_exit 'You must specify a virtual machine name'
     end
 
-    vim_connection
-    vm = get_vm(vmname)
-    fatal_exit "Could not find #{vmname}" unless vm
+    vm = get_vm_by_name(vmname) || 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_find.rb

@@ -39,6 +39,14 @@ class Chef::Knife::VsphereVmFind < Chef::Knife::BaseVsphereCommand
          long: '--cpu',
          description: 'Show cpu'
 
+  option :cpu_hot_add_enabled,
+         long: '--cpu_hot_add_enabled',
+         description: 'Show cpu hot add enabled'
+
+  option :memory_hot_add_enabled,
+         long: '--memory_hot_add_enabled',
+         description: 'Show memory hot add enabled'
+
   option :ram,
          long: '--ram',
          description: 'Show ram'
@@ -235,6 +243,14 @@ class Chef::Knife::VsphereVmFind < Chef::Knife::BaseVsphereCommand
         thisvm['ram'] = vm.summary.config.memorySizeMB
       end
 
+      if get_config(:cpu_hot_add_enabled)
+        thisvm['cpu_hot_add_enabled'] = vm.config.cpuHotAddEnabled
+      end
+
+      if get_config(:memory_hot_add_enabled)
+        thisvm['memory_hot_add_enabled'] = vm.config.memoryHotAddEnabled
+      end
+
       if get_config(:cpu)
         thisvm['cpu'] = vm.summary.config.numCpu
       end

data/lib/chef/knife/vsphere_vm_property_set.rb

@@ -3,11 +3,11 @@
 
 require 'chef/knife'
 require 'chef/knife/base_vsphere_command'
-require 'rbvmomi'
-require 'netaddr'
+require 'chef/knife/search_helper'
 
 # VsphereVMPropertySet extends Basevspherecommand
 class Chef::Knife::VsphereVmPropertySet < Chef::Knife::BaseVsphereCommand
+  include SearchHelper
   banner 'knife vsphere vm property set VMNAME PROPERTY VALUE.  Sets a vApp Property on VMNAME.'
 
   common_options
@@ -42,9 +42,8 @@ class Chef::Knife::VsphereVmPropertySet < Chef::Knife::BaseVsphereCommand
     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) || 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_snapshot.rb

@@ -4,11 +4,11 @@
 
 require 'chef/knife'
 require 'chef/knife/base_vsphere_command'
-require 'rbvmomi'
-require 'netaddr'
+require 'chef/knife/search_helper'
 
 # Manage snapshots of a virtual machine
 class Chef::Knife::VsphereVmSnapshot < Chef::Knife::BaseVsphereCommand
+  include SearchHelper
   banner 'knife vsphere vm snapshot VMNAME (options)'
 
   common_options
@@ -44,7 +44,7 @@ class Chef::Knife::VsphereVmSnapshot < Chef::Knife::BaseVsphereCommand
          description: 'Indicates whether to wait for creation/removal to complete',
          boolean: false
 
-  option :find,
+  option :find, # imma deprecate this
          long: '--find',
          description: 'Finds the virtual machine by searching all folders'
 
@@ -77,14 +77,7 @@ class Chef::Knife::VsphereVmSnapshot < Chef::Knife::BaseVsphereCommand
 
     vim_connection
 
-    vm = if get_config(:find)
-           puts "No folder entered, searching for #{vmname}"
-           src_folder = find_folder(get_config(:folder))
-           traverse_folders_for_vm(src_folder, vmname)
-         else
-           base_folder = find_folder get_config(:folder)
-           find_in_folder(base_folder, RbVmomi::VIM::VirtualMachine, vmname) || abort("VM #{vmname} not found")
-         end
+    vm = get_vm_by_name(vmname) || fatal_exit("Could not find #{vmname}")
 
     if vm.snapshot
       snapshot_list = vm.snapshot.rootSnapshotList
@@ -92,9 +85,7 @@ class Chef::Knife::VsphereVmSnapshot < Chef::Knife::BaseVsphereCommand
     end
 
     if get_config(:list) && vm.snapshot
-      puts 'Current snapshot tree: '
-      puts "#{vmname}"
-      snapshot_list.each { |i| puts display_node(i, current_snapshot) }
+      ui.output(snapshot_list.map { |i| display_node(i, current_snapshot) })
     end
 
     if get_config(:create_new_snapshot)
@@ -146,18 +137,14 @@ class Chef::Knife::VsphereVmSnapshot < Chef::Knife::BaseVsphereCommand
     snapshot
   end
 
-  def display_node(node, current, shift = 1)
-    descr = node.name + ' ' + node.createTime.iso8601
-    out = ''
-    out << '+--' * shift
-    if node.snapshot == current
-      out << ui.color(descr, :cyan) << '\n'
-    else
-      out << descr << '\n'
-    end
-    unless node.childSnapshotList.empty?
-      node.childSnapshotList.each { |item| out << display_node(item, current, shift + 1) }
-    end
-    out
+  def display_node(node, current)
+    children = node.childSnapshotList.map { |item| display_node(item, current) }
+    snapshot_tree = { 'SnapshotName' => node.name,
+                      'SnapshotId' => node.id,
+                      'SnapshotDescription' => node.description,
+                      'SnapshotCreationDate' => node.createTime.iso8601,
+                      'Children' => children }
+    snapshot_tree.merge!({ 'IsCurrentSnapshot' => true }) if node.snapshot == current
+    snapshot_tree
   end
 end

data/lib/chef/knife/vsphere_vm_state.rb

@@ -5,12 +5,12 @@
 
 require 'chef/knife'
 require 'chef/knife/base_vsphere_command'
-require 'rbvmomi'
-require 'netaddr'
+require 'chef/knife/search_helper'
 
 # Manage power state of a virtual machine
 # VsphereVmState extends the BaseVspherecommand
 class Chef::Knife::VsphereVmState < Chef::Knife::BaseVsphereCommand
+  include SearchHelper
   # The Different power states that vSphere reports
   POWER_STATES = {
     PS_ON => 'powered on',
@@ -56,18 +56,7 @@ class Chef::Knife::VsphereVmState < Chef::Knife::BaseVsphereCommand
 
     vim_connection
 
-    if get_config(:recursive)
-      vms = get_vms(vmname)
-      if vms.length > 1
-        abort "More than one VM with name #{vmname} found:\n" + vms.map { |vm| get_path_to_object(vm) }.join("\n")
-      end
-      abort "VM #{vmname} not found" if vms.length == 0
-      vm = vms[0]
-    else
-      base_folder = find_folder(get_config(:folder))
-
-      vm = find_in_folder(base_folder, RbVmomi::VIM::VirtualMachine, vmname) || abort("VM #{vmname} not found")
-    end
+    vm = get_vm_by_name(vmname) || fatal_exit("Could not find #{vmname}")
 
     state = vm.runtime.powerState
 

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.3'
+  VERSION = '2.0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-vsphere
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Ezra Pagel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-22 00:00:00.000000000 Z
+date: 2018-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knife-windows
@@ -172,6 +172,7 @@ extra_rdoc_files: []
 files:
 - lib/chef/knife/base_vsphere_command.rb
 - lib/chef/knife/customization_helper.rb
+- lib/chef/knife/search_helper.rb
 - lib/chef/knife/vsphere_cluster_list.rb
 - lib/chef/knife/vsphere_cpu_ratio.rb
 - lib/chef/knife/vsphere_customization_list.rb
@@ -236,7 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: vSphere Support for Knife