knife-vsphere 0.9.0 → 0.9.5

data/lib/chef/knife/vsphere_vm_state.rb

@@ -4,7 +4,7 @@
 #
 
 require 'chef/knife'
-require 'chef/knife/BaseVsphereCommand'
+require 'chef/knife/base_vsphere_command'
 require 'rbvmomi'
 require 'netaddr'
 
@@ -13,9 +13,9 @@ PsOff = 'poweredOff'
 PsSuspended = 'suspended'
 
 PowerStates = {
-  PsOn => 'powered on',
-  PsOff => 'powered off',
-  PsSuspended => 'suspended'
+    PsOn => 'powered on',
+    PsOff => 'powered off',
+    PsSuspended => 'suspended'
 }
 
 # Manage power state of a virtual machine
@@ -26,19 +26,19 @@ class Chef::Knife::VsphereVmState < Chef::Knife::BaseVsphereCommand
   get_common_options
 
   option :state,
-  :short => "-s STATE",
-  :long => "--state STATE",
-  :description => "The power state to transition the VM into; one of on|off|suspended"
+         :short => "-s STATE",
+         :long => "--state STATE",
+         :description => "The power state to transition the VM into; one of on|off|suspended"
 
   option :wait_port,
-    :short => "-w PORT",
-    :long => "--wait-port PORT",
-    :description => "Wait for VM to be accessible on a port"
+         :short => "-w PORT",
+         :long => "--wait-port PORT",
+         :description => "Wait for VM to be accessible on a port"
 
   option :shutdown,
-    :short => "-g",
-    :long => "--shutdown",
-    :description => "Guest OS shutdown"
+         :short => "-g",
+         :long => "--shutdown",
+         :description => "Guest OS shutdown"
 
   def run
 
@@ -56,7 +56,7 @@ class Chef::Knife::VsphereVmState < Chef::Knife::BaseVsphereCommand
     baseFolder = find_folder(get_config(:folder));
 
     vm = find_in_folder(baseFolder, RbVmomi::VIM::VirtualMachine, vmname) or
-      abort "VM #{vmname} not found"
+        abort "VM #{vmname} not found"
 
     state = vm.runtime.powerState
 
@@ -65,45 +65,45 @@ class Chef::Knife::VsphereVmState < Chef::Knife::BaseVsphereCommand
     else
 
       case config[:state]
-      when 'on'
-        if state == PsOn
-          puts "Virtual machine #{vmname} was already powered on"
-        else
-          vm.PowerOnVM_Task.wait_for_completion
-          puts "Powered on virtual machine #{vmname}"
-        end
-      when 'off'
-        if state == PsOff
-          puts "Virtual machine #{vmname} was already powered off"
-        else
-          if get_config(:shutdown)
-            vm.ShutdownGuest
-            print "Waiting for virtual machine #{vmname} to shut down..."
-            until vm.runtime.powerState == PsOff do
-              sleep 2
-              print "."
+        when 'on'
+          if state == PsOn
+            puts "Virtual machine #{vmname} was already powered on"
+          else
+            vm.PowerOnVM_Task.wait_for_completion
+            puts "Powered on virtual machine #{vmname}"
+          end
+        when 'off'
+          if state == PsOff
+            puts "Virtual machine #{vmname} was already powered off"
+          else
+            if get_config(:shutdown)
+              vm.ShutdownGuest
+              print "Waiting for virtual machine #{vmname} to shut down..."
+              until vm.runtime.powerState == PsOff do
+                sleep 2
+                print "."
+              end
+              puts "done"
+            else
+              vm.PowerOffVM_Task.wait_for_completion
+              puts "Powered off virtual machine #{vmname}"
             end
-            puts "done"
+          end
+        when 'suspend'
+          if state == PowerStates['suspended']
+            puts "Virtual machine #{vmname} was already suspended"
           else
-            vm.PowerOffVM_Task.wait_for_completion
-            puts "Powered off virtual machine #{vmname}"
+            vm.SuspendVM_Task.wait_for_completion
+            puts "Suspended virtual machine #{vmname}"
           end
-        end
-      when 'suspend'
-        if state == PowerStates['suspended']
-          puts "Virtual machine #{vmname} was already suspended"
-        else
-          vm.SuspendVM_Task.wait_for_completion
-          puts "Suspended virtual machine #{vmname}"
-        end
-      when 'reset'
-        vm.ResetVM_Task.wait_for_completion
-        puts "Reset virtual machine #{vmname}"
+        when 'reset'
+          vm.ResetVM_Task.wait_for_completion
+          puts "Reset virtual machine #{vmname}"
       end
 
       if get_config(:wait_port)
         print "Waiting for port #{get_config(:wait_port)}..."
-        print "." until tcp_test_port_vm(vm,get_config(:wait_port))
+        print "." until tcp_test_port_vm(vm, get_config(:wait_port))
         puts "done"
       end
     end

data/lib/chef/knife/vsphere_vm_vmdk_add.rb

@@ -3,7 +3,7 @@
 # License:: Apache License, Version 2.0
 #
 require 'chef/knife'
-require 'chef/knife/BaseVsphereCommand'
+require 'chef/knife/base_vsphere_command'
 
 # Lists all known virtual machines in the configured datacenter
 class Chef::Knife::VsphereVmVmdkAdd < Chef::Knife::BaseVsphereCommand
@@ -12,19 +12,19 @@ class Chef::Knife::VsphereVmVmdkAdd < Chef::Knife::BaseVsphereCommand
 
   get_common_options
 
-  option :vmdk_type, 
-    :long => "--vmdk-type TYPE",
-    :description => "Type of VMDK"
+  option :vmdk_type,
+         :long => "--vmdk-type TYPE",
+         :description => "Type of VMDK"
   # this is a bad idea as it will let you overcommit SAN by 400% or more. thick is a more "sane" default
-  $default[:vmdk_type] = "thin"      
+  $default[:vmdk_type] = "thin"
 
-  option :target_lun, 
-    :long => "--target-lun NAME",
-    :description => "name of target LUN"
+  option :target_lun,
+         :long => "--target-lun NAME",
+         :description => "name of target LUN"
 
   def run
     $stdout.sync = true
-    
+
     vmname = @name_args[0]
     if vmname.nil?
       show_usage
@@ -43,27 +43,26 @@ class Chef::Knife::VsphereVmVmdkAdd < Chef::Knife::BaseVsphereCommand
     vdm = vim.serviceContent.virtualDiskManager
     vm = get_vm(vmname)
     if vm.nil?
-        puts "Could not find #{vmname}"
-        return 
+      puts "Could not find #{vmname}"
+      return
     end
 
     target_lun = get_config(:target_lun) unless get_config(:target_lun).nil?
     vmdk_size_kb = size.to_i * 1024 * 1024
-    vmdk_size_B  = size.to_i * 1024 * 1024 * 1024 
 
     if target_lun.nil?
-      vmdk_datastore = choose_datastore(vm.datastore,size)
+      vmdk_datastore = choose_datastore(vm.datastore, size)
       exit -1 if vmdk_datastore.nil?
     else
-        vmdk_datastores = find_datastores_regex(target_lun)
-        vmdk_datastore = choose_datastore(vmdk_datastores,size)
-        exit -1 if vmdk_datastore.nil?
-        vmdk_dir  = "[#{vmdk_datastore.name}] #{vmname}"
-        # create the vm folder on the LUN or subsequent operations will fail.
-        if not vmdk_datastore.exists? vmname
-          dc = get_datacenter
-          dc._connection.serviceContent.fileManager.MakeDirectory :name => vmdk_dir, :datacenter => dc, :createParentDirectories => false
-        end
+      vmdk_datastores = find_datastores_regex(target_lun)
+      vmdk_datastore = choose_datastore(vmdk_datastores, size)
+      exit -1 if vmdk_datastore.nil?
+      vmdk_dir = "[#{vmdk_datastore.name}] #{vmname}"
+      # create the vm folder on the LUN or subsequent operations will fail.
+      if not vmdk_datastore.exists? vmname
+        dc = get_datacenter
+        dc._connection.serviceContent.fileManager.MakeDirectory :name => vmdk_dir, :datacenter => dc, :createParentDirectories => false
+      end
     end
 
     puts "Choosing: #{vmdk_datastore.name}"
@@ -74,27 +73,27 @@ class Chef::Knife::VsphereVmVmdkAdd < Chef::Knife::BaseVsphereCommand
     vms = vmdk_datastore.vm
     vmFiles = pc.collectMultiple vms, 'layoutEx.file'
     vmFiles.keys.each do |vm|
-        vmFiles[vm]["layoutEx.file"].each do |layout|
-          if layout.name.match(/^\[#{vmdk_datastore.name}\] #{vmname}\/#{vmname}_([0-9]+).vmdk/)
-            num = $1
-            if next_vmdk <= num.to_i
-              next_vmdk = num.to_i + 1
-            end
+      vmFiles[vm]["layoutEx.file"].each do |layout|
+        if layout.name.match(/^\[#{vmdk_datastore.name}\] #{vmname}\/#{vmname}_([0-9]+).vmdk/)
+          num = $1
+          if next_vmdk <= num.to_i
+            next_vmdk = num.to_i + 1
           end
         end
+      end
     end
     vmdk_fileName = "#{vmname}/#{vmname}_#{next_vmdk}.vmdk"
     vmdk_name = "[#{vmdk_datastore.name}] #{vmdk_fileName}"
     vmdk_type = get_config(:vmdk_type)
     vmdk_type = "preallocated" if vmdk_type == "thick"
     puts "Next vmdk name is => #{vmdk_name}"
-    
+
     # create the disk
     if not vmdk_datastore.exists? vmdk_fileName
       vmdk_spec = RbVmomi::VIM::FileBackedVirtualDiskSpec(
-        :adapterType => "lsiLogic",
-        :capacityKb => vmdk_size_kb,
-        :diskType => vmdk_type
+          :adapterType => "lsiLogic",
+          :capacityKb => vmdk_size_kb,
+          :diskType => vmdk_type
       )
       ui.info "Creating VMDK"
       ui.info "#{ui.color "Capacity:", :cyan} #{size} GB"
@@ -104,9 +103,9 @@ class Chef::Knife::VsphereVmVmdkAdd < Chef::Knife::BaseVsphereCommand
         ui.info "#{ui.color "Skipping disk creation process because --noop specified.", :red}"
       else
         vdm.CreateVirtualDisk_Task(
-          :datacenter => get_datacenter,
-          :name => vmdk_name,
-          :spec => vmdk_spec
+            :datacenter => get_datacenter,
+            :name => vmdk_name,
+            :spec => vmdk_spec
         ).wait_for_completion
       end
     end
@@ -119,26 +118,26 @@ class Chef::Knife::VsphereVmVmdkAdd < Chef::Knife::BaseVsphereCommand
     vm.config.hardware.device.each do |device|
       if device.class == RbVmomi::VIM::VirtualLsiLogicController
         if scsi_tree[device.controllerKey].nil?
-            scsi_tree[device.key]=Hash.new()
-            scsi_tree[device.key]['children'] = Array.new();
-            scsi_tree[device.key]['device'] = device;
+          scsi_tree[device.key]=Hash.new()
+          scsi_tree[device.key]['children'] = Array.new();
+          scsi_tree[device.key]['device'] = device;
         end
       end
       if device.class == RbVmomi::VIM::VirtualDisk
         if scsi_tree[device.controllerKey].nil?
-            scsi_tree[device.controllerKey]=Hash.new()
-            scsi_tree[device.controllerKey]['children'] = Array.new();
+          scsi_tree[device.controllerKey]=Hash.new()
+          scsi_tree[device.controllerKey]['children'] = Array.new();
         end
         scsi_tree[device.controllerKey]['children'].push(device)
       end
     end
     scsi_tree.keys.sort.each do |controller|
       if scsi_tree[controller]['children'].length < 15
-          available_controllers.push(scsi_tree[controller]['device'].deviceInfo.label)
+        available_controllers.push(scsi_tree[controller]['device'].deviceInfo.label)
       end
     end
 
-    if available_controllers.length > 0 
+    if available_controllers.length > 0
       use_controller = available_controllers[0]
       puts "using #{use_controller}"
     else
@@ -147,22 +146,22 @@ class Chef::Knife::VsphereVmVmdkAdd < Chef::Knife::BaseVsphereCommand
 
         # Add a controller if none are available
         puts "no controllers available. Will attempt to create"
-        new_scsi_key       = scsi_tree.keys.sort[scsi_tree.length - 1] + 1
+        new_scsi_key = scsi_tree.keys.sort[scsi_tree.length - 1] + 1
         new_scsi_busNumber = scsi_tree[scsi_tree.keys.sort[scsi_tree.length - 1]]['device'].busNumber + 1
 
         controller_device = RbVmomi::VIM::VirtualLsiLogicController(
-          :key       => new_scsi_key,
-          :busNumber => new_scsi_busNumber,
-          :sharedBus => :noSharing
+            :key => new_scsi_key,
+            :busNumber => new_scsi_busNumber,
+            :sharedBus => :noSharing
         )
 
         device_config_spec = RbVmomi::VIM::VirtualDeviceConfigSpec(
-          :device => controller_device,
-          :operation => RbVmomi::VIM::VirtualDeviceConfigSpecOperation("add")
+            :device => controller_device,
+            :operation => RbVmomi::VIM::VirtualDeviceConfigSpecOperation("add")
         )
-  
+
         vm_config_spec = RbVmomi::VIM::VirtualMachineConfigSpec(
-          :deviceChange => [device_config_spec]
+            :deviceChange => [device_config_spec]
         )
 
         if get_config(:noop)
@@ -172,10 +171,10 @@ class Chef::Knife::VsphereVmVmdkAdd < Chef::Knife::BaseVsphereCommand
         end
       else
         ui.info "Controllers maxed out at 4."
-        exit -1;
+        exit -1
       end
     end
-     
+
     # now go back and get the new device's name
     vm.config.hardware.device.each do |device|
       if device.class == RbVmomi::VIM::VirtualLsiLogicController
@@ -186,7 +185,7 @@ class Chef::Knife::VsphereVmVmdkAdd < Chef::Knife::BaseVsphereCommand
     end
 
     # add the disk
-    controller = find_device(vm,use_controller)
+    controller = find_device(vm, use_controller)
 
     used_unitNumbers = Array.new()
     scsi_tree.keys.sort.each do |c|
@@ -197,39 +196,40 @@ class Chef::Knife::VsphereVmVmdkAdd < Chef::Knife::BaseVsphereCommand
         end
       end
     end
+
     available_unitNumbers = Array.new
     (0 .. 15).each do |scsi_id|
-      if used_unitNumbers.grep(scsi_id).length > 0 
+      if used_unitNumbers.grep(scsi_id).length > 0
       else
-          available_unitNumbers.push(scsi_id)
+        available_unitNumbers.push(scsi_id)
       end
     end
 
     # ensure we don't try to add the controllers SCSI ID
     new_unitNumber = available_unitNumbers.sort[0]
-     puts "using SCSI ID #{new_unitNumber}"
+    puts "using SCSI ID #{new_unitNumber}"
 
     vmdk_backing = RbVmomi::VIM::VirtualDiskFlatVer2BackingInfo(
-      :datastore => vmdk_datastore,
-      :diskMode => "persistent",
-      :fileName => vmdk_name
+        :datastore => vmdk_datastore,
+        :diskMode => "persistent",
+        :fileName => vmdk_name
     )
 
     device = RbVmomi::VIM::VirtualDisk(
-      :backing => vmdk_backing,
-      :capacityInKB => vmdk_size_kb,
-      :controllerKey => controller.key,
-      :key => -1,
-      :unitNumber => new_unitNumber
+        :backing => vmdk_backing,
+        :capacityInKB => vmdk_size_kb,
+        :controllerKey => controller.key,
+        :key => -1,
+        :unitNumber => new_unitNumber
     )
 
     device_config_spec = RbVmomi::VIM::VirtualDeviceConfigSpec(
-      :device => device,
-      :operation => RbVmomi::VIM::VirtualDeviceConfigSpecOperation("add")
+        :device => device,
+        :operation => RbVmomi::VIM::VirtualDeviceConfigSpecOperation("add")
     )
 
     vm_config_spec = RbVmomi::VIM::VirtualMachineConfigSpec(
-      :deviceChange => [device_config_spec]
+        :deviceChange => [device_config_spec]
     )
 
     if get_config(:noop)

data/lib/knife-vsphere/version.rb

@@ -1,4 +1,4 @@
 module KnifeVsphere
-  VERSION = "0.9.0"
+  VERSION = "0.9.5"
 end
 

metadata

@@ -2,7 +2,7 @@
 name: knife-vsphere
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.0
+  version: 0.9.5
 platform: ruby
 authors: 
 - Ezra Pagel
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-08-22 00:00:00 -05:00
+date: 2013-09-06 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,13 +55,14 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/chef/knife/BaseVsphereCommand.rb
+- lib/chef/knife/base_vsphere_command.rb
 - lib/chef/knife/vsphere_customization_list.rb
 - lib/chef/knife/vsphere_datastore_list.rb
 - lib/chef/knife/vsphere_pool_list.rb
 - lib/chef/knife/vsphere_template_list.rb
 - lib/chef/knife/vsphere_vlan_list.rb
 - lib/chef/knife/vsphere_vm_clone.rb
+- lib/chef/knife/vsphere_vm_config.rb
 - lib/chef/knife/vsphere_vm_delete.rb
 - lib/chef/knife/vsphere_vm_execute.rb
 - lib/chef/knife/vsphere_vm_list.rb

data/lib/chef/knife/BaseVsphereCommand.rb

@@ -1,304 +0,0 @@
-#
-# Author:: Ezra Pagel (<ezra@cpan.org>)
-# Contributor:: Jesse Campbell (<hikeit@gmail.com>)
-# License:: Apache License, Version 2.0
-#
-
-require 'chef/knife'
-require 'rbvmomi'
-
-# Base class for vsphere knife commands
-class Chef
-	class Knife
-		class BaseVsphereCommand < Knife
-
-			deps do
-				require 'chef/knife/bootstrap'
-				Chef::Knife::Bootstrap.load_deps
-				require 'fog'
-				require 'socket'
-				require 'net/ssh/multi'
-				require 'readline'
-				require 'chef/json_compat'
-			end
-
-			def self.get_common_options
-				unless defined? $default
-					$default = Hash.new
-				end
-
-				option :vsphere_user,
-					:short => "-u USERNAME",
-					:long => "--vsuser USERNAME",
-					:description => "The username for vsphere"
-
-				option :vsphere_pass,
-					:short => "-p PASSWORD",
-					:long => "--vspass PASSWORD",
-					:description => "The password for vsphere"
-
-				option :vsphere_host,
-					:long => "--vshost HOST",
-					:description => "The vsphere host"
-
-				option :vsphere_dc,
-					:short => "-d DATACENTER",
-					:long => "--vsdc DATACENTER",
-					:description => "The Datacenter for vsphere"
-
-				option :vsphere_path,
-					:long => "--vspath SOAP_PATH",
-					:description => "The vsphere SOAP endpoint path"
-				$default[:vsphere_path] = "/sdk"
-
-				option :vsphere_port,
-					:long => "--vsport PORT",
-					:description => "The VI SDK port number to use"
-				$default[:vsphere_port] = 443
-
-				option :vshere_nossl,
-					:long => "--vsnossl",
-					:description => "Disable SSL connectivity"
-
-				option :vsphere_insecure,
-					:long => "--vsinsecure",
-					:description => "Disable SSL certificate verification"
-
-				option :folder,
-					:short => "-f FOLDER",
-					:long => "--folder FOLDER",
-					:description => "The folder to get VMs from"
-				$default[:folder] = ''
-			end
-
-			def get_config(key)
-				key = key.to_sym
-				rval = config[key] || Chef::Config[:knife][key] || $default[key]
-				Chef::Log.debug("value for config item #{key}: #{rval}")
-				rval
-			end
-
-			def get_vim_connection
-
-				conn_opts = {
-					:host => get_config(:vsphere_host),
-					:path => get_config(:vshere_path),
-					:port => get_config(:vsphere_port),
-					:use_ssl => !get_config(:vsphere_nossl),
-					:user => get_config(:vsphere_user),
-					:password => get_config(:vsphere_pass),
-					:insecure => get_config(:vsphere_insecure)
-				}
-				
-				# Grab the password from the command line
-				# if tt is not in the config file
-				if not conn_opts[:password]
-                                  conn_opts[:password] = get_password
-                                end
-
-				#    opt :debug, "Log SOAP messages", :short => 'd', :default => (ENV['RBVMOMI_DEBUG'] || false)
-
-				vim = RbVmomi::VIM.connect conn_opts
-				config[:vim] = vim
-				return vim
-			end
-			
-			def get_password
-			  @password ||= ui.ask("Enter your password: ") { |q| q.echo = false }
-			end
-
-			def get_vm(vmname)
-		          vim = get_vim_connection
-		          baseFolder = find_folder(get_config(:folder));
-                          retval = traverse_folders_for_vm(baseFolder,vmname)
-                          return retval
-                        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
-                             end
-                           end
-                           return @vm
-	                end
-
-                        def get_datacenter
-                           dc = config[:vim].serviceInstance.find_datacenter(get_config(:vsphere_dc)) or abort "datacenter not found"
-                        end
-
-			def find_folder(folderName)
-				dcname = get_config(:vsphere_dc)
-				dc = config[:vim].serviceInstance.find_datacenter(dcname) or abort "datacenter not found"
-				baseEntity = dc.vmFolder
-				entityArray = folderName.split('/')
-				entityArray.each do |entityArrItem|
-					if entityArrItem != ''
-						baseEntity = baseEntity.childEntity.grep(RbVmomi::VIM::Folder).find { |f| f.name == entityArrItem } or
-              abort "no such folder #{folderName} while looking for #{entityArrItem}"
-					end
-				end
-				baseEntity
-			end
-
-			def find_network(networkName)
-				dcname = get_config(:vsphere_dc)
-				dc = config[:vim].serviceInstance.find_datacenter(dcname) or abort "datacenter not found"
-				baseEntity = dc.network
-				baseEntity.find { |f| f.name == networkName } or abort "no such network #{networkName}"
-			end
-
-			def find_pool(poolName)
-				dcname = get_config(:vsphere_dc)
-				dc = config[:vim].serviceInstance.find_datacenter(dcname) or abort "datacenter not found"
-				baseEntity = dc.hostFolder
-				entityArray = poolName.split('/')
-				entityArray.each do |entityArrItem|
-					if entityArrItem != ''
-						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
-							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
-							baseEntity = baseEntity.resourcePool.find { |f| f.name == entityArrItem } or
-                abort "no such pool #{poolName} while looking for #{entityArrItem}"
-						else
-							abort "Unexpected Object type encountered #{baseEntity.type} while finding resourcePool"
-						end
-					end
-				end
-
-        baseEntity = baseEntity.resourcePool if not baseEntity.is_a?(RbVmomi::VIM::ResourcePool) and baseEntity.respond_to?(:resourcePool)
-        baseEntity
-			end
-
-                        def choose_datastore(dstores,size)
-                          vmdk_size_kb = size.to_i * 1024 * 1024
-                          vmdk_size_B = size.to_i * 1024 * 1024 * 1024
-             
-                          candidates = []
-                          dstores.each  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}(#{store.summary[:freeSpace]}) / #{cap})"     
-                      
-                            # vm's can span multiple datastores, so instead of grabbing the first one
-                            # let's find the first datastore with the available space on a LUN the vm 
-                            # is already using, or use a specified LUN (if given)
-                      
-                            
-                            if ( store.summary[:freeSpace] - vmdk_size_B ) > 0
-                              # also let's not use more than 90% of total space to save room for snapshots.
-                              cap_remains = 100 * ( (store.summary[:freeSpace].to_f - vmdk_size_B.to_f ) / store.summary[:capacity].to_f )
-                              if(cap_remains.to_i > 10)
-                                candidates.push(store)
-                              end 
-                            end
-                          end
-                          if candidates.length > 0
-                            vmdk_datastore = candidates[0]
-                          else
-                            puts "Insufficient space on all LUNs designated or assigned to the virtual machine. Please specify a new target."
-                            vmdk_datastore = nil
-                          end
-                          return vmdk_datastore
-                        end
-
-
-			def find_datastores_regex(regex)
-                          stores = Array.new()
-                          puts "Looking for all datastores that match /#{regex}/"
-                          dcname = get_config(:vsphere_dc)
-                          dc = config[:vim].serviceInstance.find_datacenter(dcname) or abort "datacenter not found"
-                          baseEntity = dc.datastore
-                          baseEntity.each do |ds|
-                            if ds.name.match /#{regex}/
-                              stores.push ds
-                            end
-                          end
-                          return stores
-                        end
-
-			def find_datastore(dsName)
-				dcname = get_config(:vsphere_dc)
-				dc = config[:vim].serviceInstance.find_datacenter(dcname) or abort "datacenter not found"
-				baseEntity = dc.datastore
-				baseEntity.find { |f| f.info.name == dsName } or abort "no such datastore #{dsName}"
-			end
-
-			def find_device(vm,deviceName)
-			  vm.config.hardware.device.each do |device|
-			    return device if device.deviceInfo.label == deviceName
-			  end
-			  nil
-			end
-
-			def find_all_in_folder(folder, type)
-				if folder.instance_of?(RbVmomi::VIM::ClusterComputeResource)
-					folder = folder.resourcePool
-				end
-				if folder.instance_of?(RbVmomi::VIM::ResourcePool)
-					folder.resourcePool.grep(type)
-				elsif folder.instance_of?(RbVmomi::VIM::Folder)
-					folder.childEntity.grep(type)
-				else
-					puts "Unknown type #{folder.class}, not enumerating"
-					nil
-				end
-			end
-
-			def find_in_folder(folder, type, name)
-				folder.childEntity.grep(type).find { |o| o.name == name }
-			end
-
-			def fatal_exit(msg)
-				ui.fatal(msg)
-				exit 1
-			end
-
-			def tcp_test_port_vm(vm,port)
-			  ip = vm.guest.ipAddress
-			  if ip.nil?
-			    sleep 2
-			    return false
-			  end
-			  tcp_test_port(ip, port)
-			end
-
-			def tcp_test_port(hostname,port)
-			  tcp_socket = TCPSocket.new(hostname, port)
-			  readable = IO.select([tcp_socket], nil, nil, 5)
-			  if readable
-			    Chef::Log.debug("sshd accepting connections on #{hostname}, banner is #{tcp_socket.gets}") if port == 22
-			    true
-			  else
-			    false
-			  end
-			  rescue Errno::ETIMEDOUT
-			    false
-			  rescue Errno::EPERM
-			    false
-			  rescue Errno::ECONNREFUSED
-			    sleep 2
-			    false
-			  rescue Errno::EHOSTUNREACH, Errno::ENETUNREACH
-			    sleep 2
-			    false
-			  ensure
-			    tcp_socket && tcp_socket.close
-			end
-			
-		end
-	end
-end