knife-vsphere 0.2.1 → 0.2.3

data/lib/chef/knife/BaseVsphereCommand.rb

@@ -56,14 +56,13 @@ class Chef
 					:description => "The VI SDK port number to use"
 				$default[:vsphere_port] = 443
 
-				option :vshere_ssl,
-					:long => "--vsssl USE_SSL",
-					:description => "Whether to use SSL connection"
-				$default[:vsphere_ssl] = true
+				option :vshere_nossl,
+					:long => "--vsnossl",
+					:description => "Disable SSL connectivity"
 
 				option :vsphere_insecure,
-					:long => "--vsinsecure USE_INSECURE_SSL",
-					:description => "Determines whether SSL certificate verification is skipped"
+					:long => "--vsinsecure",
+					:description => "Disable SSL certificate verification"
 
 				option :folder,
 					:short => "-f FOLDER",
@@ -85,7 +84,7 @@ class Chef
 					:host => get_config(:vsphere_host),
 					:path => get_config(:vshere_path),
 					:port => get_config(:vsphere_port),
-					:use_ssl => get_config(:vsphere_ssl),
+					:use_ssl => !get_config(:vsphere_nossl),
 					:user => get_config(:vsphere_user),
 					:password => get_config(:vsphere_pass),
 					:insecure => get_config(:vsphere_insecure)
@@ -154,7 +153,17 @@ class Chef
 
 
 			def find_all_in_folder(folder, type)
-				folder.childEntity.grep(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)

data/lib/chef/knife/vsphere_pool_list.rb

@@ -0,0 +1,45 @@
+#
+# Author:: Jesse Campbell (<hikeit@gmail.com>)
+# License:: Apache License, Version 2.0
+#
+require 'chef/knife'
+require 'chef/knife/BaseVsphereCommand'
+
+# Lists all known pools in the configured datacenter
+class Chef::Knife::VspherePoolList < Chef::Knife::BaseVsphereCommand
+
+	banner "knife vsphere pool list"
+
+	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
+		end
+	end
+
+	def find_pool_folder(folderName)
+		dcname = get_config(:vsphere_dc)
+		dc = config[:vim].serviceInstance.find_datacenter(dcname) or abort "datacenter not found"
+		baseEntity = dc.hostFolder
+		entityArray = folderName.split('/')
+		entityArray.each do |entityArrItem|
+			if entityArrItem != ''
+				baseEntity = baseEntity.childEntity.grep(RbVmomi::VIM::ManagedObject).find { |f| f.name == entityArrItem } or
+				abort "no such folder #{folderName} while looking for #{entityArrItem}"
+			end
+		end
+		baseEntity
+	end
+
+	def run
+		$stdout.sync = true
+		vim = get_vim_connection
+		baseFolder = find_pool_folder(get_config(:folder));
+		traverse_folders(baseFolder)
+	end
+end

data/lib/chef/knife/vsphere_vm_clone.rb

@@ -83,12 +83,14 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
 		:description => "Gigabytes of RAM"
 
 	option :power,
-		:long => "--start STARTVM",
-		:description => "Indicates whether to start the VM after a successful clone"
+		:long => "--start",
+		:description => "Indicates whether to start the VM after a successful clone",
+		:boolean => false
 
 	option :bootstrap,
-		:long => "--bootstrap FALSE",
-		:description => "Indicates whether to bootstrap the VM"
+		:long => "--bootstrap",
+		:description => "Indicates whether to bootstrap the VM",
+		:boolean => false
 
 	option :fqdn,
 		:long => "--fqdn SERVER_FQDN",
@@ -123,7 +125,8 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
 
 	option :prerelease,
 		:long => "--prerelease",
-		:description => "Install the pre-release chef gems"
+		:description => "Install the pre-release chef gems",
+		:boolean => false
 
 	option :bootstrap_version,
 		:long => "--bootstrap-version VERSION",
@@ -243,10 +246,15 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
 
 		if get_config(:customization_vlan)
 			network = find_network(get_config(:customization_vlan))
-			switch_port = RbVmomi::VIM.DistributedVirtualSwitchPortConnection(:switchUuid => network.config.distributedVirtualSwitch.uuid ,:portgroupKey => network.key)
 			card = src_config.hardware.device.find { |d| d.deviceInfo.label == "Network adapter 1" } or
         abort "Can't find source network card to customize"
-			card.backing.port = switch_port
+                        begin
+                            switch_port = RbVmomi::VIM.DistributedVirtualSwitchPortConnection(:switchUuid => network.config.distributedVirtualSwitch.uuid ,:portgroupKey => network.key)
+                            card.backing.port = switch_port
+                        rescue
+                            # not connected to a distibuted switch?
+                            card.backing.deviceName = network.name
+                        end
 			dev_spec = RbVmomi::VIM.VirtualDeviceConfigSpec(:device => card, :operation => "edit")
 			clone_spec.config.deviceChange.push dev_spec
 		end
@@ -384,7 +392,7 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
 	rescue Errno::ECONNREFUSED
 		sleep 2
 		false
-	rescue Errno::EHOSTUNREACH
+	rescue Errno::EHOSTUNREACH, Errno::ENETUNREACH
 		sleep 2
 		false
 	ensure

data/lib/chef/knife/vsphere_vm_list.rb

@@ -33,7 +33,7 @@ class Chef::Knife::VsphereVmList < Chef::Knife::BaseVsphereCommand
 	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}"
+			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
 

data/lib/knife-vsphere/version.rb

@@ -1,4 +1,4 @@
 module KnifeVsphere
-  VERSION = "0.2.1"
+  VERSION = "0.2.3"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-vsphere
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-25 00:00:00.000000000 -05:00
+date: 2012-08-14 00:00:00.000000000 -05:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netaddr
-  requirement: &70341464746140 !ruby/object:Gem::Requirement
+  requirement: &70275405040840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,21 +22,21 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70341464746140
+  version_requirements: *70275405040840
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &70341464742000 !ruby/object:Gem::Requirement
+  requirement: &70275405038940 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *70341464742000
+  version_requirements: *70275405038940
 - !ruby/object:Gem::Dependency
   name: rbvmomi
-  requirement: &70341464684660 !ruby/object:Gem::Requirement
+  requirement: &70275405038180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,7 +44,7 @@ dependencies:
         version: 1.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *70341464684660
+  version_requirements: *70275405038180
 description: VMware vSphere Support for Chef's Knife Command
 email: ezra@cpan.org
 executables: []
@@ -54,6 +54,7 @@ files:
 - lib/chef/knife/BaseVsphereCommand.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
@@ -62,7 +63,7 @@ files:
 - lib/chef/knife/vsphere_vm_state.rb
 - lib/knife-vsphere/version.rb
 has_rdoc: true
-homepage: 
+homepage: http://github.com/ezrapagel/knife-vsphere
 licenses: []
 post_install_message: 
 rdoc_options: []