knife-vsphere 0.9.7 → 0.9.8

data/lib/chef/knife/base_vsphere_command.rb

@@ -126,21 +126,16 @@ class Chef
       end
 
       def traverse_folders_for_vm(folder, vmname)
-        # not sure why @vm is necessary, but it returns class Array
-        # instead of class VirtualMachine without it... ugh
-        @vm = nil
-        folders = find_all_in_folder(folder, RbVmomi::VIM::Folder)
-        folders.each do |child|
-          traverse_folders_for_vm(child, vmname)
-          vms = find_all_in_folder(folder, RbVmomi::VIM::VirtualMachine)
-          vms.each do |vm|
-            if vm.name == vmname
-              @vm = vm
-              return @vm
-            end
+        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)
+            if vm then return vm end
           end
         end
-        return @vm
+        return false
       end
 
       def traverse_folders_for_dc(folder, dcname)

data/lib/chef/knife/vsphere_datastore_maxfree.rb

@@ -1,49 +1,49 @@
-# Copyright (C) 2012, SCM Ventures AB
-# Author: Ian Delahorne <ian@scmventures.se>
-#
-# Permission to use, copy, modify, and/or distribute this software for
-# any purpose with or without fee is hereby granted, provided that the
-# above copyright notice and this permission notice appear in all
-# copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
-# WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
-# AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
-# DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA
-# OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-# PERFORMANCE OF THIS SOFTWARE
-
-require 'chef/knife'
-require 'chef/knife/base_vsphere_command'
-
-# Gets the data store with the most free space in datacenter
-class Chef::Knife::VsphereDatastoreMaxfree < Chef::Knife::BaseVsphereCommand
-
-  banner "knife vsphere datastore maxfree"
-
-  option :regex,
-         :short => "-r REGEX",
-         :long => "--regex REGEX",
-         :description => "Regex to match the datastore name"
-  $default[:regex] = ''
-
-  get_common_options
-
-  def run
-    $stdout.sync = true
-
-    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.datastore.each do |store|
-	  if regex.match(store.name) and (max == nil or max.summary[:freeSpace] < store.summary[:freeSpace])
-	    max = store
-	  end      
-    end
-	puts max ? max.name : ""
-  end
-end
+# Copyright (C) 2012, SCM Ventures AB
+# Author: Ian Delahorne <ian@scmventures.se>
+#
+# Permission to use, copy, modify, and/or distribute this software for
+# any purpose with or without fee is hereby granted, provided that the
+# above copyright notice and this permission notice appear in all
+# copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+# WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+# AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+# DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA
+# OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE
+
+require 'chef/knife'
+require 'chef/knife/base_vsphere_command'
+
+# Gets the data store with the most free space in datacenter
+class Chef::Knife::VsphereDatastoreMaxfree < Chef::Knife::BaseVsphereCommand
+
+  banner "knife vsphere datastore maxfree"
+
+  option :regex,
+         :short => "-r REGEX",
+         :long => "--regex REGEX",
+         :description => "Regex to match the datastore name"
+
+  get_common_options
+  $default[:regex] = ''
+
+  def run
+    $stdout.sync = true
+
+    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.datastore.each do |store|
+	  if regex.match(store.name) and (max == nil or max.summary[:freeSpace] < store.summary[:freeSpace])
+	    max = store
+	  end      
+    end
+	puts max ? max.name : ""
+  end
+end

data/lib/chef/knife/vsphere_datastorecluster_list.rb

@@ -0,0 +1,60 @@
+# Copyright (C) 2012, SCM Ventures AB
+# Author: Ian Delahorne <ian@scmventures.se>
+#
+# Permission to use, copy, modify, and/or distribute this software for
+# any purpose with or without fee is hereby granted, provided that the
+# above copyright notice and this permission notice appear in all
+# copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+# WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+# AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+# DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA
+# OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE
+
+require 'chef/knife'
+require 'chef/knife/base_vsphere_command'
+
+def number_to_human_size(number)
+  number = number.to_f
+  storage_units_fmt = ["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
+
+  return sprintf("%0.2f %s", number, unit)
+end
+
+
+# Lists all known data store cluster in datacenter with sizes
+class Chef::Knife::VsphereDatastoreclusterList < Chef::Knife::BaseVsphereCommand
+
+  banner "knife vsphere datastore list"
+
+  get_common_options
+
+  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
+  end
+end
+

data/lib/chef/knife/vsphere_datastorecluster_maxfree.rb

@@ -0,0 +1,49 @@
+# Copyright (C) 2012, SCM Ventures AB
+# Author: Ian Delahorne <ian@scmventures.se>
+#
+# Permission to use, copy, modify, and/or distribute this software for
+# any purpose with or without fee is hereby granted, provided that the
+# above copyright notice and this permission notice appear in all
+# copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+# WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+# AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+# DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA
+# OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE
+
+require 'chef/knife'
+require 'chef/knife/base_vsphere_command'
+
+# Gets the data store cluster with the most free space in datacenter
+class Chef::Knife::VsphereDatastoreclusterMaxfree < Chef::Knife::BaseVsphereCommand
+
+  banner "knife vsphere datastorecluster maxfree"
+
+  option :regex,
+         :short => "-r REGEX",
+         :long => "--regex REGEX",
+         :description => "Regex to match the datastore cluster name"
+  $default[:regex] = ''
+
+  get_common_options
+
+  def run
+    $stdout.sync = true
+
+    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      
+    end
+	puts max ? max.name : ""
+  end
+end

data/lib/chef/knife/vsphere_pool_query.rb

@@ -0,0 +1,58 @@
+require 'chef/knife'
+require 'chef/knife/base_vsphere_command'
+require 'rbvmomi'
+require 'netaddr'
+
+class Chef::Knife::VspherePoolQuery < Chef::Knife::BaseVsphereCommand
+  banner "knife vsphere pool query POOLNAME QUERY.  See \"http://pubs.vmware.com/vi3/sdk/ReferenceGuide/vim.ComputeResource.html\" for allowed QUERY values."
+
+  get_common_options
+
+  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
+  end
+
+  def run
+    $stdout.sync = true
+    poolname = @name_args[0]
+    if poolname.nil?
+      show_usage
+      fatal_exit("You must specify a resource poor or cluster name (see knife vsphere pool list)")
+    end
+
+    query_string = @name_args[1]
+    if query_string.nil?
+      show_usage
+      fatal_exit("You must specify a QUERY value (e.g. summary.overallStatus )")
+    end
+
+    vim = get_vim_connection
+    
+    dc = get_datacenter
+    folder = dc.hostFolder
+
+    pool = traverse_folders_for_pool(folder, poolname) or abort "Pool #{poolname} not found"
+
+    # split QUERY by dots, and walk the object model
+    query = query_string.split '.'
+    result = pool
+    query.each do |part|
+      message, index = part.split(/[\[\]]/)
+      unless result.respond_to? message.to_sym
+        fatal_exit("\"#{query_string}\" not recognized.")
+      end
+
+      result = index ? result.send(message)[index.to_i] : result.send(message)
+    end
+    puts result
+  end
+end

data/lib/chef/knife/vsphere_vm_query.rb

@@ -1,49 +1,48 @@
-# Author:: Brian Dupras (<bdupras@rallydev.com>)
-# License:: Apache License, Version 2.0
-
-require 'chef/knife'
-require 'chef/knife/base_vsphere_command'
-require 'rbvmomi'
-require 'netaddr'
-
-class Chef::Knife::VsphereVmQuery < Chef::Knife::BaseVsphereCommand
-  banner "knife vsphere vm query VMNAME QUERY.  See \"http://pubs.vmware.com/vi3/sdk/ReferenceGuide/vim.VirtualMachine.html\" for allowed QUERY values."
-
-  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
-
-    query_string = @name_args[1]
-    if query_string.nil?
-      show_usage
-      fatal_exit("You must specify a QUERY value (e.g. guest.ipAddress or network[0].name)")
-    end
-
-    vim = get_vim_connection
-
-    dc = get_datacenter
-    folder = find_folder(get_config(:folder)) || dc.vmFolder
-
-    vm = find_in_folder(folder, RbVmomi::VIM::VirtualMachine, vmname) or
-        abort "VM #{vmname} not found"
-
-    # split QUERY by dots, and walk the object model
-    query = query_string.split '.'
-    result = vm
-    query.each do |part|
-      message, index = part.split(/[\[\]]/)
-      unless result.respond_to? message.to_sym
-        fatal_exit("\"#{query_string}\" not recognized.")
-      end
-
-      result = index ? result.send(message)[index.to_i] : result.send(message)
-    end
-    puts result
-  end
-end
+# Author:: Brian Dupras (<bdupras@rallydev.com>)
+# License:: Apache License, Version 2.0
+
+require 'chef/knife'
+require 'chef/knife/base_vsphere_command'
+require 'rbvmomi'
+require 'netaddr'
+
+class Chef::Knife::VsphereVmQuery < Chef::Knife::BaseVsphereCommand
+  banner "knife vsphere vm query VMNAME QUERY.  See \"http://pubs.vmware.com/vi3/sdk/ReferenceGuide/vim.VirtualMachine.html\" for allowed QUERY values."
+
+  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
+
+    query_string = @name_args[1]
+    if query_string.nil?
+      show_usage
+      fatal_exit("You must specify a QUERY value (e.g. guest.ipAddress or network[0].name)")
+    end
+
+    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"
+
+    # split QUERY by dots, and walk the object model
+    query = query_string.split '.'
+    result = vm
+    query.each do |part|
+      message, index = part.split(/[\[\]]/)
+      unless result.respond_to? message.to_sym
+        fatal_exit("\"#{query_string}\" not recognized.")
+      end
+
+      result = index ? result.send(message)[index.to_i] : result.send(message)
+    end
+    puts result
+  end
+end

data/lib/knife-vsphere/version.rb

@@ -1,4 +1,4 @@
 module KnifeVsphere
-  VERSION = "0.9.7"
+  VERSION = "0.9.8"
 end
 

metadata

@@ -2,7 +2,7 @@
 name: knife-vsphere
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors: 
 - Ezra Pagel
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-12-09 00:00:00 -06:00
+date: 2014-01-30 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,9 +58,12 @@ files:
 - lib/chef/knife/base_vsphere_command.rb
 - lib/chef/knife/vshpere_vm_move.rb
 - lib/chef/knife/vsphere_customization_list.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/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_clone.rb