knife-vsphere 0.7.0 → 0.8.0

data/lib/chef/knife/vsphere_vm_clone.rb

@@ -39,6 +39,10 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
 		:description => "The source VM / Template to clone from",
 		:required => true
 
+	option :annotation,
+		:long => "--annotation TEXT",
+		:description => "Add TEXT in Notes field from annotation"
+
 	option :customization_spec,
 		:long => "--cspec CUST_SPEC",
 		:description => "The name of any customization specification to apply"
@@ -264,6 +268,10 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
 
 		clone_spec.config = RbVmomi::VIM.VirtualMachineConfigSpec(:deviceChange => Array.new)
 
+		if get_config(:annotation)
+			clone_spec.config.annotation = get_config(:annotation)
+		end
+
 		if get_config(:customization_cpucount)
 			clone_spec.config.numCPUs = get_config(:customization_cpucount)
 		end
@@ -318,7 +326,6 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
 
     unless get_config(:disable_customization)
       use_ident = !config[:customization_hostname].nil? || !get_config(:customization_domain).nil? || cust_spec.identity.nil?
-    end
 
 
 		if use_ident
@@ -346,6 +353,7 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
 		end
 
 		clone_spec.customization = cust_spec
+	end
 		clone_spec
 	end
 

data/lib/chef/knife/vsphere_vm_list.rb

@@ -1,58 +1,66 @@
-#
-# Author:: Ezra Pagel (<ezra@cpan.org>)
-# License:: Apache License, Version 2.0
-#
-require 'chef/knife'
-require 'chef/knife/BaseVsphereCommand'
-
-# Lists all known virtual machines in the configured datacenter
-class Chef::Knife::VsphereVmList < Chef::Knife::BaseVsphereCommand
-
-	banner "knife vsphere vm list"
-
-	get_common_options
-
-	option :recursive,
-		:long  => "--recursive",
-		:short => "-r",
-		:description => "Recurse down through sub-folders"
-
-	option :only_folders,
-		:long  => "--only-folders",
-		:description => "Print only sub-folders"
-
-	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)
-		end
-	end
-
-	def print_vms_in_folder(folder)
-		vms = find_all_in_folder(folder, RbVmomi::VIM::VirtualMachine)
-		vms.each do |vm|
-			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}"
-		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
-	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
-	end
-end
+#
+# Author:: Ezra Pagel (<ezra@cpan.org>)
+# License:: Apache License, Version 2.0
+#
+require 'chef/knife'
+require 'chef/knife/BaseVsphereCommand'
+
+# Lists all known virtual machines in the configured datacenter
+class Chef::Knife::VsphereVmList < Chef::Knife::BaseVsphereCommand
+
+	banner "knife vsphere vm list"
+
+	get_common_options
+
+	option :recursive,
+		:long  => "--recursive",
+		:short => "-r",
+		:description => "Recurse down through sub-folders"
+
+	option :only_folders,
+		:long  => "--only-folders",
+		:description => "Print only sub-folders"
+
+	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)
+		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}"
+		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
+	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
+	end
+end

data/lib/knife-vsphere/version.rb

@@ -1,4 +1,4 @@
 module KnifeVsphere
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end
 

metadata

@@ -2,7 +2,7 @@
 name: knife-vsphere
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Ezra Pagel
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-05 00:00:00 -05:00
+date: 2013-08-02 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency