knife-vsphere 1.0.0.pre.3 → 1.0.0

data/lib/chef/knife/base_vsphere_command.rb

@@ -146,7 +146,7 @@ class Chef
       end
 
       def traverse_folders_for_vms(folder, vmname)
-	    retval = []
+      retval = []
         children = folder.children.find_all
         children.each do |child|
           if child.class == RbVmomi::VIM::VirtualMachine && child.name == vmname
@@ -204,7 +204,7 @@ class Chef
             if baseEntity.is_a? RbVmomi::VIM::Folder
               baseEntity = baseEntity.childEntity.find { |f| f.name == entityArrItem } or
                   abort "no such pool #{poolName} while looking for #{entityArrItem}"
-            elsif baseEntity.is_a? RbVmomi::VIM::ClusterComputeResource or baseEntity.is_a? RbVmomi::VIM::ComputeResource
+            elsif baseEntity.is_a? RbVmomi::VIM::ClusterComputeResource or baseEntity.is_a? RbVmomi::VIM::ComputeResource 
               baseEntity = baseEntity.resourcePool.resourcePool.find { |f| f.name == entityArrItem } or
                   abort "no such pool #{poolName} while looking for #{entityArrItem}"
             elsif baseEntity.is_a? RbVmomi::VIM::ResourcePool
@@ -272,10 +272,20 @@ class Chef
         baseEntity.find { |f| f.info.name == dsName } or abort "no such datastore #{dsName}"
       end
 
-      def find_datastorecluster(dsName)
-        dc = get_datacenter
-        baseEntity = dc.datastoreFolder.childEntity
-        baseEntity.find { |f| f.name == dsName and f.instance_of?(RbVmomi::VIM::StoragePod) } or abort "no such datastorecluster #{dsName}"
+      def find_datastorecluster(dsName, folder = nil)
+        if ! folder 
+          dc = get_datacenter
+          folder = dc.datastoreFolder
+        end
+        folder.childEntity.each do |child|
+          if child.class.to_s == 'Folder'
+            ds = find_datastorecluster(dsName, child)
+            if ds then return ds end
+          elsif child.class.to_s == 'StoragePod' && child.name == dsName
+            return child
+          end
+        end
+        return nil
       end
 
       def find_device(vm, deviceName)
@@ -304,8 +314,8 @@ class Chef
           if object.parent.is_a?(RbVmomi::VIM:: ManagedEntity)
             return get_path_to_object(object.parent) + "/" + object.parent.name
           else
-			return ""
-		  end
+      return ""
+      end
         else
           puts "Unknown type #{object.class}, not enumerating"
           nil

data/lib/chef/knife/vshpere_vm_move.rb

@@ -21,6 +21,50 @@ class Chef::Knife::VsphereVmMove < Chef::Knife::BaseVsphereCommand
          :long => "--dest-folder FOLDER",
          :description => "The destination folder into which the VM or template should be moved"
 
+  option :datastore,
+         :long => "--datastore STORE",
+         :description => "The datastore into which to put the cloned VM"
+
+  option :thin_provision,
+         :long => "--thin-provision",
+         :description => "Indicates whether disk should be thin provisioned.",
+         :boolean => true
+
+  option :thick_provision,
+         :long => "--thick-provision",
+         :description => "Indicates whether disk should be thick provisioned.",
+         :boolean => true
+
+  # Convert VM
+  def convert_vm(vm)
+    rspec = nil
+    dc = get_datacenter
+    hosts = find_all_in_folder(dc.hostFolder, RbVmomi::VIM::ComputeResource)
+    rp = hosts.first.resourcePool
+    rspec = RbVmomi::VIM.VirtualMachineRelocateSpec(:pool => rp)
+
+    if get_config(:thin_provision)
+      puts "Thin provsisioning #{vm.name}"
+      rspec = RbVmomi::VIM.VirtualMachineRelocateSpec(:datastore => find_datastore(get_config(:datastore)), :transform => :sparse)
+    end
+
+    if get_config(:thick_provision)
+      puts "Thick provsisioning #{vm.name}"
+      rspec = RbVmomi::VIM.VirtualMachineRelocateSpec(:datastore => find_datastore(get_config(:datastore)), :transform => :flat)
+    end
+
+    task = vm.RelocateVM_Task(:spec => rspec)
+    task.wait_for_completion
+  end
+
+  # Move VM
+  def move_vm(vm)
+    dest_name = config[:dest_name] || vmname
+    dest_folder = config[:dest_folder].nil? ? (vm.parent) : (find_folder(get_config(:dest_folder)))
+
+    vm.Rename_Task(:newName => dest_name).wait_for_completion unless vmname == dest_name
+    dest_folder.MoveIntoFolder_Task(:list => [vm]).wait_for_completion unless folder == dest_folder
+  end
 
   def run
     $stdout.sync = true
@@ -38,10 +82,11 @@ class Chef::Knife::VsphereVmMove < Chef::Knife::BaseVsphereCommand
     vm = find_in_folder(folder, RbVmomi::VIM::VirtualMachine, vmname) or
         abort "VM #{vmname} not found"
 
-    dest_name = config[:dest_name] || vmname
-    dest_folder = config[:dest_folder].nil? ? (vm.parent) : (find_folder(get_config(:dest_folder)))
-
-    vm.Rename_Task(:newName => dest_name).wait_for_completion unless vmname == dest_name
-    dest_folder.MoveIntoFolder_Task(:list => [vm]).wait_for_completion unless folder == dest_folder
+    if get_config(:thin_provision) || get_config(:thick_provision)
+      convert_vm(vm)
+    else
+      move_vm(vm)
+    end
   end
 end
+

data/lib/chef/knife/vsphere_cpu_ratio.rb

@@ -0,0 +1,45 @@
+require 'chef/knife'
+require 'chef/knife/base_vsphere_command'
+
+class Chef::Knife::VsphereCpuRatio < Chef::Knife::BaseVsphereCommand
+  banner 'knife vsphere cpu ratio [CLUSTER] [HOST]'
+
+  get_common_options
+
+  def run
+    $stdout.sync = true
+
+    cluster_name = @name_args[0]
+    host_name = @name_args[1]
+
+    get_vim_connection
+
+    dc = get_datacenter
+    hf = dc.hostFolder
+
+    cluster = cluster_name.nil? ? hf.childEntity : hf.childEntity.select { |c| c.name == cluster_name }
+
+    if cluster.empty?
+      fatal_exit("Cluster #{cluster_name} not found.")
+    end
+
+    cluster.each { |c|
+      host = host_name.nil? ? c.host : c.host.select { |h| h.name == host_name }
+      if host.empty?
+        fatal_exit("Host not found in cluster #{c.name}.")
+      end
+
+      puts "### Cluster #{c.name} ###"
+
+      host.each { |h|
+        v_cpu = h.vm.inject(0) { |sum, vm| sum + vm.config.hardware.numCPU }
+        p_cpu = h.summary.hardware.numCpuThreads
+
+        ratio = 1.0 * v_cpu/p_cpu
+
+        puts "#{h.name}: #{ratio}"
+      }
+      puts ''
+    }
+  end
+end

data/lib/chef/knife/vsphere_datastore_list.rb

@@ -43,6 +43,12 @@ class Chef::Knife::VsphereDatastoreList < Chef::Knife::BaseVsphereCommand
 
   get_common_options
 
+  option :list,
+	 :long => "--list",
+	 :short => "-L",
+	 :description => "Indicates whether to list VM's in datastore",
+	 :boolean => true
+
   def run
     $stdout.sync = true
 
@@ -52,6 +58,14 @@ class Chef::Knife::VsphereDatastoreList < Chef::Knife::BaseVsphereCommand
       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})"
+      if get_config(:list)
+        store.vm.each do |vms|
+	  hostName = vms.guest[:hostName]
+	  guestFullName = vms.guest[:guestFullName]
+	  guestState = vms.guest[:guestState]
+	  puts "#{ui.color("VM Name:", :green)} #{hostName} #{ui.color("OS:", :magenta)} #{guestFullName} #{ui.color("State:", :cyan)} #{guestState}"
+        end
+      end
     end
   end
 end

data/lib/chef/knife/vsphere_datastorecluster_list.rb

@@ -35,6 +35,24 @@ def number_to_human_size(number)
   return sprintf("%0.2f %s", number, unit)
 end
 
+def traverse_folders_for_dsclusters(folder)
+  print_dsclusters_in_folder(folder)
+  folder.childEntity.each do |child|
+    if child.class.to_s == 'Folder'
+     traverse_folders_for_dsclusters(child)
+    end
+  end
+end
+
+def print_dsclusters_in_folder (folder)
+  folder.childEntity.each do |child|
+    if child.class.to_s == "StoragePod"
+      avail = number_to_human_size(child.summary[:freeSpace])
+      cap = number_to_human_size(child.summary[:capacity])
+      puts "#{ui.color("DatastoreCluster", :cyan)}: #{child.name} (#{avail} / #{cap})"
+    end
+  end
+end
 
 # Lists all known data store cluster in datacenter with sizes
 class Chef::Knife::VsphereDatastoreclusterList < Chef::Knife::BaseVsphereCommand
@@ -45,16 +63,9 @@ class Chef::Knife::VsphereDatastoreclusterList < Chef::Knife::BaseVsphereCommand
 
   def run
     $stdout.sync = true
-
     vim = get_vim_connection
     dc = get_datacenter
-    dc.datastoreFolder.childEntity.each do |store|
-	  if store.class.to_s == "StoragePod"
-		avail = number_to_human_size(store.summary[:freeSpace])
-		cap = number_to_human_size(store.summary[:capacity])
-		puts "#{ui.color("DatastoreCluster", :cyan)}: #{store.name} (#{avail} / #{cap})"
-	  end
-    end
+    traverse_folders_for_dsclusters(dc.datastoreFolder)
   end
 end
 

data/lib/chef/knife/vsphere_datastorecluster_maxfree.rb

@@ -18,6 +18,36 @@
 require 'chef/knife'
 require 'chef/knife/base_vsphere_command'
 
+def is_max_dscluster(dscluster, max_dscluster)
+  if ! max_dscluster 
+    return true
+  end
+
+  if dscluster.summary[:freeSpace] > max_dscluster.summary[:freeSpace]
+    return true
+  end
+
+  return false
+end
+
+def find_max_dscluster(folder, max_dscluster, regex)
+  folder.childEntity.each do |child|
+    if child.class.to_s == 'Folder'
+      sub_max = find_max_dscluster(child, max_dscluster, regex)
+      if is_max_dscluster(sub_max, max_dscluster)
+        max_dscluster = sub_max
+      end
+    elsif child.class.to_s == 'StoragePod'
+      
+      if is_max_dscluster(child, max_dscluster) && regex.match(child.name)
+        max_dscluster = child
+      end
+    end
+  end
+
+  return max_dscluster
+end
+
 # Gets the data store cluster with the most free space in datacenter
 class Chef::Knife::VsphereDatastoreclusterMaxfree < Chef::Knife::BaseVsphereCommand
 
@@ -35,14 +65,20 @@ class Chef::Knife::VsphereDatastoreclusterMaxfree < Chef::Knife::BaseVsphereComm
 
     vim = get_vim_connection
     dcname = get_config(:vsphere_dc)
-	regex = /#{Regexp.escape( get_config(:regex))}/
-    dc = config[:vim].serviceInstance.find_datacenter(dcname) or abort "datacenter not found"
-	max = nil
-    dc.datastoreFolder.childEntity.each do |store|
-	  if regex.match(store.name) and (store.class.to_s == "StoragePod") and (max == nil or max.summary[:freeSpace] < store.summary[:freeSpace])
-	    max = store
-	  end      
+    regex = /#{Regexp.escape( get_config(:regex))}/
+    max_dscluster = nil
+    
+    vim = get_vim_connection
+    dc = get_datacenter
+
+    max_dscluster = find_max_dscluster(dc.datastoreFolder, max_dscluster, regex)
+  
+    if max_dscluster 
+      puts max_dscluster.name
+    else
+      puts "No datastore clusters found"
+      exit 1
     end
-	puts max ? max.name : ""
+
   end
 end

data/lib/chef/knife/vsphere_folder_list.rb

@@ -0,0 +1,30 @@
+#
+# Author:: Ezra Pagel (<ezra@cpan.org>)
+# License:: Apache License, Version 2.0
+#
+require 'chef/knife'
+require 'chef/knife/base_vsphere_command'
+
+# Lists all vm folders
+class Chef::Knife::VsphereFolderList < Chef::Knife::BaseVsphereCommand
+
+  banner "knife vsphere folder list"
+
+  get_common_options
+
+  def traverse_folders(folder, indent_level)
+
+    puts "#{"  " * indent_level} #{ui.color("Folder", :cyan)}: " + folder.name
+
+    folders = find_all_in_folder(folder, RbVmomi::VIM::Folder)
+    folders.each do |child|
+      traverse_folders(child, indent_level  + 1)
+    end
+  end
+
+  def run
+    vim = get_vim_connection
+    baseFolder = find_folder(get_config(:folder));
+    traverse_folders(baseFolder, 0)
+  end
+end

data/lib/chef/knife/vsphere_hosts_list.rb

@@ -2,6 +2,7 @@ require 'chef/knife'
 require 'chef/knife/base_vsphere_command'
 require 'rbvmomi'
 require 'netaddr'
+
 #list hosts belonging to pool
 class Chef::Knife::VsphereHostsList < Chef::Knife::BaseVsphereCommand
   banner "knife vsphere hosts list"
@@ -12,38 +13,30 @@ class Chef::Knife::VsphereHostsList < Chef::Knife::BaseVsphereCommand
          :short => "-h",
          :description => "Target pool"
 
-  def traverse_folders_for_pool(folder, poolname)
-    children = folder.children.find_all
-    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 end
-      elsif child.class == RbVmomi::VIM::Folder
-        pool = traverse_folders_for_pool(child, poolname)
-        if pool then return pool end
-      end
-    end
-    return false
+  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
-    poolname = config[:pool]
-    if poolname.nil?
-      show_usage
-      fatal_exit("You must specify a resource pool or cluster name (see knife vsphere pool list)")
-    end
-
-
     vim = get_vim_connection
     dc = get_datacenter
     folder = dc.hostFolder
 
-    pool = traverse_folders_for_pool(folder, poolname) or abort "Pool #{poolname} not found"
+    target_pool = config[:pool]
 
-    hosts=pool.host
-     unless hosts.nil?
+    pools = find_pools(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
-   end
-end
+        puts "  #{ui.color("Host", :cyan)}: #{hostc.name}"
+      end
+    end
+  end
 end

data/lib/chef/knife/vsphere_pool_list.rb

@@ -13,13 +13,16 @@ class Chef::Knife::VspherePoolList < Chef::Knife::BaseVsphereCommand
   get_common_options
 
   def traverse_folders(folder)
-    puts "#{ui.color("#{folder.class}", :cyan)}: "+(folder.path[3..-1].map { |x| x[1] }.* '/')
-    folders = find_all_in_folder(folder, RbVmomi::VIM::ManagedObject)
-    unless folders.nil?
-      folders.each do |child|
-        traverse_folders(child)
-      end
+    return if folder.is_a? RbVmomi::VIM::VirtualApp
+
+    puts "#{ui.color("Pool", :cyan)}: "+(folder.path[3..-1].map { |x| x[1] }.* '/') if
+      folder.is_a? RbVmomi::VIM::ResourcePool
+
+    folders = find_all_in_folder(folder, RbVmomi::VIM::ManagedObject) || []
+    folders.each do |child|
+      traverse_folders(child)
     end
+
   end
 
   def find_pool_folder(folderName)
@@ -36,7 +39,6 @@ class Chef::Knife::VspherePoolList < Chef::Knife::BaseVsphereCommand
   end
 
   def run
-    $stdout.sync = true
     vim = get_vim_connection
     baseFolder = find_pool_folder(get_config(:folder));
     traverse_folders(baseFolder)

data/lib/chef/knife/vsphere_vm_clone.rb

@@ -47,6 +47,16 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
          :description => "Indicates whether to use linked clones.",
          :boolean => false
 
+  option :linked_clone,
+         :long => "--linked-clone",
+         :description => "Indicates whether to use linked clones.",
+         :boolean => false
+
+  option :thin_provision,
+         :long => "--thin-provision",
+         :description => "Indicates whether disk should be thin provisioned.",
+         :boolean => true
+
   option :annotation,
          :long => "--annotation TEXT",
          :description => "Add TEXT in Notes field from annotation"
@@ -113,6 +123,10 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
          :description => "Indicates whether to bootstrap the VM",
          :boolean => false
 
+  option :environment,
+         :long => "--environment ENVIRONMENT",
+         :description => "Environment to add the node to for bootstrapping"
+
   option :fqdn,
          :long => "--fqdn SERVER_FQDN",
          :description => "Fully qualified hostname for bootstrapping"
@@ -233,6 +247,7 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
     end
 
     vim = get_vim_connection
+    vdm = vim.serviceContent.virtualDiskManager
 
     dc = get_datacenter
 
@@ -310,7 +325,6 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
 
   # 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)))
@@ -343,15 +357,13 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
       end
     end
 
-    if get_config(:mark_as_template)
-      clone_spec = RbVmomi::VIM.VirtualMachineCloneSpec(:location => rspec,
-                                                        :powerOn => false,
-                                                        :template => true)
-    else
-      clone_spec = RbVmomi::VIM.VirtualMachineCloneSpec(:location => rspec,
-                                                        :powerOn => false,
-                                                        :template => false)      
+    if get_config(:thin_provision)
+      rspec = RbVmomi::VIM.VirtualMachineRelocateSpec(:transform => :sparse, :pool => find_pool(get_config(:resource_pool)))
     end
+
+    is_template = !get_config(:mark_as_template).nil?
+    clone_spec = RbVmomi::VIM.VirtualMachineCloneSpec(:location => rspec, :powerOn => false,:template => is_template)
+
     clone_spec.config = RbVmomi::VIM.VirtualMachineConfigSpec(:deviceChange => Array.new)
 
     if get_config(:annotation)
@@ -375,7 +387,7 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
         card.backing.port = switch_port
       rescue
         # not connected to a distibuted switch?
-        card.backing.deviceName = network.name
+        card.backing = RbVmomi::VIM::VirtualEthernetCardNetworkBackingInfo(:network => network, :deviceName => network.name)
       end
       dev_spec = RbVmomi::VIM.VirtualDeviceConfigSpec(:device => card, :operation => "edit")
       clone_spec.config.deviceChange.push dev_spec
@@ -417,24 +429,21 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
           config[:vmname]
         end
 
-        if src_config.guestId.downcase.include?("linux")
+        if src_config.guestId.downcase.include?("windows")
+          if cust_spec.identity.nil?
+            fatal_exit("Please provide Windows Guest Customization")
+          else
+            cust_spec.identity.userData.computerName = RbVmomi::VIM.CustomizationFixedName(:name => hostname)
+          end
+        else
           ident = RbVmomi::VIM.CustomizationLinuxPrep
-
           ident.hostName = RbVmomi::VIM.CustomizationFixedName(:name => hostname)
-
           if get_config(:customization_domain)
             ident.domain = get_config(:customization_domain)
           else
             ident.domain = ''
           end
-
           cust_spec.identity = ident
-        elsif src_config.guestId.downcase.include?("windows")
-          if cust_spec.identity.nil?
-            fatal_exit("Please provide Windows Guest Customization")
-          else
-            cust_spec.identity.userData.computerName = RbVmomi::VIM.CustomizationFixedName(:name => hostname)
-          end
         end
       end
 

data/lib/chef/knife/vsphere_vm_delete.rb

@@ -1,66 +1,66 @@
-#
-# Author:: Ezra Pagel (<ezra@cpan.org>)
-# License:: Apache License, Version 2.0
-#
-
-require 'chef/knife'
-require 'chef/knife/base_vsphere_command'
-require 'rbvmomi'
-
-# These two are needed for the '--purge' deletion case
-require 'chef/node'
-require 'chef/api_client'
-
-# Delete a virtual machine from vCenter
-class Chef::Knife::VsphereVmDelete < Chef::Knife::BaseVsphereCommand
-
-  banner "knife vsphere vm delete VMNAME"
-
-  option :purge,
-         :short => "-P",
-         :long => "--purge",
-         :boolean => true,
-         :description => "Destroy corresponding node and client on the Chef Server, in addition to destroying the VM itself."
-
-  get_common_options
-
-  # Extracted from Chef::Knife.delete_object, because it has a
-  # confirmation step built in... By specifying the '--purge'
-  # flag (and also explicitly confirming the server destruction!)
-  # the user is already making their intent known. It is not
-  # necessary to make them confirm two more times.
-  def destroy_item(itemClass, name, type_name)
-    object = itemClass.load(name)
-    object.destroy
-    puts "Deleted #{type_name} #{name}"
-  end
-
-  def run
-    $stdout.sync = true
-
-    vmname = @name_args[0]
-
-    if vmname.nil?
-      show_usage
-      fatal_exit("You must specify a virtual machine name")
-    end
-
-    vim = get_vim_connection
-
-    baseFolder = find_folder(get_config(:folder));
-
-    vm = find_in_folder(baseFolder, RbVmomi::VIM::VirtualMachine, vmname) or
-        fatal_exit("VM #{vmname} not found")
-
-    vm.PowerOffVM_Task.wait_for_completion unless vm.runtime.powerState == "poweredOff"
-    vm.Destroy_Task
-    puts "Deleted virtual machine #{vmname}"
-
-    if config[:purge]
-      destroy_item(Chef::Node, vmname, "node")
-      destroy_item(Chef::ApiClient, vmname, "client")
-    else
-      puts "Corresponding node and client for the #{vmname} server were not deleted and remain registered with the Chef Server"
-    end
-  end
-end
+#
+# Author:: Ezra Pagel (<ezra@cpan.org>)
+# License:: Apache License, Version 2.0
+#
+
+require 'chef/knife'
+require 'chef/knife/base_vsphere_command'
+require 'rbvmomi'
+
+# These two are needed for the '--purge' deletion case
+require 'chef/node'
+require 'chef/api_client'
+
+# Delete a virtual machine from vCenter
+class Chef::Knife::VsphereVmDelete < Chef::Knife::BaseVsphereCommand
+
+  banner "knife vsphere vm delete VMNAME"
+
+  option :purge,
+         :short => "-P",
+         :long => "--purge",
+         :boolean => true,
+         :description => "Destroy corresponding node and client on the Chef Server, in addition to destroying the VM itself."
+
+  get_common_options
+
+  # Extracted from Chef::Knife.delete_object, because it has a
+  # confirmation step built in... By specifying the '--purge'
+  # flag (and also explicitly confirming the server destruction!)
+  # the user is already making their intent known. It is not
+  # necessary to make them confirm two more times.
+  def destroy_item(itemClass, name, type_name)
+    object = itemClass.load(name)
+    object.destroy
+    puts "Deleted #{type_name} #{name}"
+  end
+
+  def run
+    $stdout.sync = true
+
+    vmname = @name_args[0]
+
+    if vmname.nil?
+      show_usage
+      fatal_exit("You must specify a virtual machine name")
+    end
+
+    vim = get_vim_connection
+
+    baseFolder = find_folder(get_config(:folder));
+
+    vm = traverse_folders_for_vm(baseFolder, vmname) or
+        fatal_exit("VM #{vmname} not found")
+
+    vm.PowerOffVM_Task.wait_for_completion unless vm.runtime.powerState == "poweredOff"
+    vm.Destroy_Task
+    puts "Deleted virtual machine #{vmname}"
+
+    if config[:purge]
+      destroy_item(Chef::Node, vmname, "node")
+      destroy_item(Chef::ApiClient, vmname, "client")
+    else
+      puts "Corresponding node and client for the #{vmname} server were not deleted and remain registered with the Chef Server"
+    end
+  end
+end

data/lib/chef/knife/vsphere_vm_list.rb

@@ -15,52 +15,47 @@ class Chef::Knife::VsphereVmList < Chef::Knife::BaseVsphereCommand
   option :recursive,
          :long => "--recursive",
          :short => "-r",
-         :description => "Recurse down through sub-folders"
+         :description => "Recurse into sub-folders"
 
-  option :only_folders,
-         :long => "--only-folders",
-         :description => "Print only sub-folders"
+  def traverse_folders(folder, is_top = false, recurse = false)
 
-  def traverse_folders(folder)
-    puts "#{ui.color("Folder", :cyan)}: "+(folder.path[3..-1].map { |x| x[1] }.* '/')
-    print_vms_in_folder(folder) unless get_config(:only_folders)
-    folders = find_all_in_folder(folder, RbVmomi::VIM::Folder)
-    folders.each do |child|
-      traverse_folders(child)
+    vms = find_all_in_folder(folder, RbVmomi::VIM::VirtualMachine).select {|v| v.config && !v.config.template }
+    if vms.any?
+      puts "#{ui.color("Folder", :cyan)}: "+(folder.path[3..-1].map { |x| x[1] }.* '/')
+      vms.each { |v|  print_vm(v) }
+    elsif is_top
+      puts "#{ui.color("No VMs", :cyan)}"
     end
-  end
 
-  def print_vms_in_folder(folder)
-    vms = find_all_in_folder(folder, RbVmomi::VIM::VirtualMachine)
-    vms.each do |vm|
-      state = case vm.runtime.powerState
-                when PsOn
-                  ui.color("on", :green)
-                when PsOff
-                  ui.color("off", :red)
-                when PsSuspended
-                  ui.color("suspended", :yellow)
-              end
-      puts "#{ui.color("VM Name:", :cyan)} #{vm.name}\t#{ui.color("IP:", :magenta)} #{vm.guest.ipAddress}\t#{ui.color("RAM:", :magenta)} #{vm.summary.config.memorySizeMB}\t#{ui.color("State:", :cyan)} #{state}"
+    if (recurse)
+      folders = find_all_in_folder(folder, RbVmomi::VIM::Folder)
+      folders.each do |child|
+        traverse_folders(child, false, recurse)
+      end
     end
+
   end
 
-  def print_subfolders(folder)
-    folders = find_all_in_folder(folder, RbVmomi::VIM::Folder)
-    folders.each do |subfolder|
-      puts "#{ui.color("Folder Name", :cyan)}: #{subfolder.name}"
-    end
+  def print_vm(vm)
+    state = case vm.runtime.powerState
+            when PsOn
+              ui.color("on", :green)
+            when PsOff
+              ui.color("off", :red)
+            when PsSuspended
+              ui.color("suspended", :yellow)
+            end
+    puts "\t#{ui.color("VM Name:", :cyan)} #{vm.name}"
+         "\t\t#{ui.color("IP:", :magenta)} #{vm.guest.ipAddress}"
+         "\t\t#{ui.color("RAM:", :magenta)} #{vm.summary.config.memorySizeMB}"
+         "\t\t#{ui.color("State:", :cyan)} #{state}"
   end
 
   def run
-    $stdout.sync = true
     vim = get_vim_connection
     baseFolder = find_folder(get_config(:folder));
-    if get_config(:recursive)
-      traverse_folders(baseFolder)
-    else
-      print_subfolders(baseFolder)
-      print_vms_in_folder(baseFolder)
-    end
+    recurse =  get_config(:recursive)
+    is_top = true
+    traverse_folders(baseFolder, is_top, recurse)
   end
 end

data/lib/chef/knife/vsphere_vm_snapshot.rb

@@ -106,6 +106,7 @@ class Chef::Knife::VsphereVmSnapshot < Chef::Knife::BaseVsphereCommand
     tree.each do |node|
       if node.name == name
         snapshot = node.snapshot
+        break
       elsif !node.childSnapshotList.empty?
         snapshot = find_node(node.childSnapshotList, name)
       end

data/lib/chef/knife/vsphere_vm_toolsconfig.rb

@@ -0,0 +1,52 @@
+# Author:: Malte Heidenreich
+# License:: Apache License, Version 2.0
+
+require 'chef/knife'
+require 'chef/knife/base_vsphere_command'
+require 'rbvmomi'
+require 'netaddr'
+
+class Chef::Knife::VsphereVmToolsconfig < Chef::Knife::BaseVsphereCommand
+  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."
+
+  option :empty,
+         :short => "-e",
+         :long => "--empty",
+         :description => "Allow empty string"
+  get_common_options
+
+  def run
+    $stdout.sync = true
+    vmname = @name_args[0]
+    if vmname.nil?
+      show_usage
+      fatal_exit("You must specify a virtual machine name")
+    end
+
+    property = @name_args[1]
+    if property.nil?
+      show_usage
+      fatal_exit("You must specify a property to modify")
+    end
+
+    value = @name_args[2]
+    if value.nil? && !get_config(:empty)
+      show_usage
+      fatal_exit("You must specify a value")
+    end
+
+    value = "" if get_config(:empty)
+
+    vim = get_vim_connection
+
+    dc = get_datacenter
+    folder = find_folder(get_config(:folder)) || dc.vmFolder
+
+    vm = traverse_folders_for_vm(folder, vmname) or abort "VM #{vmname} not found"
+
+    vmConfigSpec = RbVmomi::VIM.VirtualMachineConfigSpec(:tools => RbVmomi::VIM.ToolsConfigInfo(property => value))
+    vm.ReconfigVM_Task(:spec => vmConfigSpec)
+
+    puts "property #{property} updated successfully"
+  end
+end

data/lib/knife-vsphere/version.rb

@@ -1,4 +1,4 @@
 module KnifeVsphere
-  VERSION = "1.0.0.pre.3"
+  VERSION = "1.0.0"
 end
 

metadata

@@ -1,53 +1,60 @@
 --- !ruby/object:Gem::Specification
 name: knife-vsphere
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.3
+  version: 1.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Ezra Pagel
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-18 00:00:00.000000000 Z
+date: 2014-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: netaddr
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.5.0
-  name: netaddr
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.5.0
 - !ruby/object:Gem::Dependency
+  name: chef
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.10.0
-  name: chef
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.10.0
 - !ruby/object:Gem::Dependency
+  name: rbvmomi
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.5.1
-  name: rbvmomi
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -58,55 +65,59 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/chef/knife/base_vsphere_command.rb
-- lib/chef/knife/vshpere_vm_migrate.rb
-- lib/chef/knife/vshpere_vm_move.rb
-- lib/chef/knife/vshpere_vm_net.rb
-- lib/chef/knife/vsphere_customization_list.rb
+- lib/chef/knife/vsphere_vm_query.rb
+- lib/chef/knife/vsphere_cpu_ratio.rb
 - lib/chef/knife/vsphere_datastorecluster_list.rb
 - lib/chef/knife/vsphere_datastorecluster_maxfree.rb
-- lib/chef/knife/vsphere_datastore_list.rb
-- lib/chef/knife/vsphere_datastore_maxfree.rb
+- lib/chef/knife/vshpere_vm_migrate.rb
+- lib/chef/knife/vsphere_vm_property_get.rb
+- lib/chef/knife/vsphere_vm_state.rb
+- lib/chef/knife/vshpere_vm_net.rb
+- lib/chef/knife/vsphere_vm_execute.rb
 - lib/chef/knife/vsphere_hosts_list.rb
-- lib/chef/knife/vsphere_pool_list.rb
-- lib/chef/knife/vsphere_pool_query.rb
-- lib/chef/knife/vsphere_template_list.rb
-- lib/chef/knife/vsphere_vlan_list.rb
+- lib/chef/knife/vsphere_vm_snapshot.rb
+- lib/chef/knife/vsphere_vm_toolsconfig.rb
+- lib/chef/knife/vsphere_vm_markastemplate.rb
 - lib/chef/knife/vsphere_vm_clone.rb
-- lib/chef/knife/vsphere_vm_config.rb
+- lib/chef/knife/base_vsphere_command.rb
+- lib/chef/knife/vsphere_vm_vmdk_add.rb
+- lib/chef/knife/vsphere_customization_list.rb
+- lib/chef/knife/vsphere_template_list.rb
 - lib/chef/knife/vsphere_vm_delete.rb
-- lib/chef/knife/vsphere_vm_execute.rb
+- lib/chef/knife/vsphere_datastore_list.rb
+- lib/chef/knife/vsphere_vm_config.rb
+- lib/chef/knife/vsphere_vlan_list.rb
+- lib/chef/knife/vsphere_datastore_maxfree.rb
 - lib/chef/knife/vsphere_vm_list.rb
-- lib/chef/knife/vsphere_vm_markastemplate.rb
-- lib/chef/knife/vsphere_vm_property_get.rb
+- lib/chef/knife/vsphere_pool_query.rb
+- lib/chef/knife/vshpere_vm_move.rb
+- lib/chef/knife/vsphere_pool_list.rb
+- lib/chef/knife/vsphere_folder_list.rb
 - lib/chef/knife/vsphere_vm_property_set.rb
-- lib/chef/knife/vsphere_vm_query.rb
-- lib/chef/knife/vsphere_vm_snapshot.rb
-- lib/chef/knife/vsphere_vm_state.rb
-- lib/chef/knife/vsphere_vm_vmdk_add.rb
 - lib/knife-vsphere/version.rb
 homepage: http://github.com/ezrapagel/knife-vsphere
 licenses:
 - Apache
-metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.1.9
-signing_key:
-specification_version: 4
+rubyforge_project: 
+rubygems_version: 1.8.23
+signing_key: 
+specification_version: 3
 summary: vSphere Support for Knife
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: ca44c31e612974c4085c95cebd7ce9290782a76d
-  data.tar.gz: 03d2eae019a9a4d898e5a9bc94391aa640d28de2
-SHA512:
-  metadata.gz: f6d164cc5012c7eee2e351f7c241bc1fbd24f47b468fedb6f84e84ce9a7135c30481179eb46c9d2877a8c39dc4a667bc246ec9f8d2bc781677d61c3fa091a287
-  data.tar.gz: 03eeac904d852e5394f1a6d573fae6f664a202e72805a8a87a883d71f112d2677fc6f568b898237f1c2ab07bad3ee46f7a497521b9efd7519078a825633a6de2