knife-vsphere 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b99f48fa873d629a1882d1f8f269fa314014fea
-  data.tar.gz: 980c7c2071e841eb6008515308d4241f9196dc94
+  metadata.gz: 06e3ee523488e2e14df1e267f2c980880a427e19
+  data.tar.gz: 7050570b79976dc09f12b4370176645a857e3894
 SHA512:
-  metadata.gz: 77f5f85d54f7e1df223cba68410c076ff732bb3a7e5379bed7e331c45e307f7911f7ea68e26662dc6857e7bead771a43436442636bed9a9c98a6b38bf54b1a37
-  data.tar.gz: cfc52c14fff451c70b0f0878fef47ce45bac4a41c74089dba8315ada86ad62329456be23fb723282447e7fff706d2ee6a804724308bc30a435700d73d22a953e
+  metadata.gz: 6df9b92b2fe8a8ece228ca68104968c49943e6440ddbf239a590fd4de221836533cc665d5c5447e8188c1298c542966072570f44b05066a0afe7df28b0d96bc6
+  data.tar.gz: 733ec8e53a9930bb05632f5d8864d19bfa51c5eb44ef8ac068a532127bfe6141ee7147c05751954c5cb9db4b865100f0f45a700fb36d98d2aacad1b587c78614

data/lib/chef/knife/vsphere_pool_query.rb

@@ -8,51 +8,11 @@ class Chef::Knife::VspherePoolQuery < Chef::Knife::BaseVsphereCommand
 
   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
-        return child if child.name == poolname
-      elsif child.class == RbVmomi::VIM::Folder
-        pool = traverse_folders_for_pool(child, poolname)
-        return pool if pool
-      end
-    end
-    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_connection
-
-    dc = datacenter
-    folder = dc.hostFolder
-
-    pool = traverse_folders_for_pool(folder, poolname) || 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
+    args = ARGV
+    args[2] = 'show'
+    ui.warn 'vsphere pool query is moving to vsphere pool show. Next time, please run'
+    ui.warn args.join " "
+    Chef::Knife.run(args)
   end
 end

data/lib/chef/knife/vsphere_pool_show.rb

@@ -0,0 +1,58 @@
+require 'chef/knife'
+require 'chef/knife/base_vsphere_command'
+require 'rbvmomi'
+require 'netaddr'
+
+class Chef::Knife::VspherePoolShow < Chef::Knife::BaseVsphereCommand
+  banner "knife vsphere pool show POOLNAME QUERY.  See \"http://pubs.vmware.com/vi3/sdk/ReferenceGuide/vim.ComputeResource.html\" for allowed QUERY values."
+
+  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
+        return child if child.name == poolname
+      elsif child.class == RbVmomi::VIM::Folder
+        pool = traverse_folders_for_pool(child, poolname)
+        return pool if pool
+      end
+    end
+    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_connection
+
+    dc = datacenter
+    folder = dc.hostFolder
+
+    pool = traverse_folders_for_pool(folder, poolname) || 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_clone.rb

@@ -437,7 +437,10 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
       fatal_exit "No hosts have the requested DatastoreCluster available! #{get_config(:datastorecluster)}" if hosts.empty?
 
       if get_config(:customization_vlan)
-        hosts.reject! { |host| !host.network.include?(find_network(get_config(:customization_vlan))) }
+        vlan_list = get_config(:customization_vlan).split(',')
+        vlan_list.each do |network|
+          hosts.reject! { |host| !host.network.include?(find_network(network)) }
+        end
       end
 
       fatal_exit "No hosts have the requested Network available! #{get_config(:customization_vlan)}" if hosts.empty?

data/lib/chef/knife/vsphere_vm_find.rb

@@ -0,0 +1,235 @@
+#
+# Author:: Raducu Deaconu (<rhadoo_io@yahoo.com>)
+# License:: Apache License, Version 2.0
+#
+
+require 'chef/knife'
+require 'chef/knife/base_vsphere_command'
+require 'rbvmomi'
+require 'netaddr'
+
+PsOn = 'poweredOn'
+PsOff = 'poweredOff'
+PsSuspended = 'suspended'
+
+# find vms belonging to pool that match criteria, display specified fields
+class Chef::Knife::VsphereVmFind < Chef::Knife::BaseVsphereCommand
+  banner 'knife vsphere vm find'
+
+  common_options
+
+  option :pool,
+         long: '--pool pool',
+         short: '-h',
+         description: 'Target pool'
+
+  option :esx_disk,
+         long: '--esx-disk',
+         description: 'Show esx disks'
+
+  option :snapshots,
+         long: '--snapshots',
+         description: 'Show snapshots'
+
+  option :os_disk,
+         long: '--os-disks',
+         description: 'Show os disks'
+
+  option :cpu,
+         long: '--cpu',
+         description: 'Show cpu'
+
+  option :ram,
+         long: '--ram',
+         description: 'Show ram'
+
+  option :ip,
+         long: '--ip',
+         description: 'Show ip'
+
+  option :soff,
+         long: '--powered-off',
+         description: 'Show only stopped machines'
+
+  option :son,
+         long: '--powered-on',
+         description: 'Show only started machines'
+
+  option :matchip,
+         long: '--match-ip IP',
+         description: 'match ip'
+
+  option :matchos,
+         long: '--match-os OS',
+         description: 'match os'
+
+  option :matchname,
+         long: '--match-name VMNAME',
+         description: 'match name'
+
+  option :hostname,
+         long: '--hostname',
+         description: 'show hostname'
+
+  option :os,
+         long: '--os',
+         description: 'show os details'
+
+  option :alarms,
+         long: '--alarms',
+         description: 'show alarm status'
+
+  option :tools,
+         long: '--tools',
+         description: 'show tools status'
+
+  option :matchtools,
+         long: '--match-tools TOOLSSTATE',
+         description: 'match tools state'
+
+  option :full_path,
+         long: '--full-path',
+         description: 'Show full path'
+
+  $stdout.sync = true   # smoother output from print
+
+  def traverse_folders_for_pool_clustercompute(folder, poolname)
+    # children = folder.children.find_all
+    children = find_all_in_folder(folder, RbVmomi::VIM::ManagedObject)
+    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
+         else if child.class == RbVmomi::VIM::Folder || child.class == RbVmomi::VIM::ComputeResource || child.class == RbVmomi::VIM::ClusterComputeResource || child.class == RbVmomi::VIM::ResourcePool
+                pool = traverse_folders_for_pool_clustercompute(child, poolname)
+              end
+        end
+        if pool then return pool end
+      end
+    end
+    return false
+  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 = vim_connection
+    dc = datacenter
+    folder = dc.hostFolder
+
+    pool = traverse_folders_for_pool_clustercompute(folder, poolname) or abort "Pool #{poolname} not found"
+
+    if pool.class == RbVmomi::VIM::ResourcePool
+      vm = pool.vm
+    else
+      vm = pool.resourcePool.vm
+    end
+
+    unless vm.nil?
+      vm.each do |vmc|
+       state = case vmc.runtime.powerState
+               when PsOn
+                 ui.color('on', :green)
+               when PsOff
+                 ui.color('off', :red)
+               when PsSuspended
+                 ui.color('suspended', :yellow)
+               end
+
+       if get_config(:matchname)
+         next unless vmc.name.include? config[:matchname]
+       end
+
+       if get_config(:matchtools)
+         next unless vmc.guest.toolsStatus == config[:matchtools]
+       end
+
+       next if get_config(:soff) && (vmc.runtime.powerState == PsOn)
+
+       next if get_config(:son) && (vmc.runtime.powerState == PsOff)
+
+       if get_config(:matchip)
+         if (!vmc.guest.ipAddress.nil? && vmc.guest.ipAddress != '')
+           next unless vmc.guest.ipAddress.include? config[:matchip]
+       else
+         next
+         end
+       end
+
+       unless vmc.guest.guestFullName.nil?
+         if get_config(:matchos)
+           next unless vmc.guest.guestFullName.include? config[:matchos]
+         end
+       end
+
+       print "#{ui.color("VM Name:", :cyan)} #{vmc.name}\t"
+       if get_config(:hostname)
+         print "#{ui.color("Hostname:", :cyan)} #{vmc.guest.hostName}\t"
+       end
+
+       if get_config(:full_path)
+         actualname = ''
+         vmcp = vmc
+         while vmcp.parent != nil && vmcp.parent.name != 'vm'
+           actualname.concat("#{vmcp.parent.name}/")
+           vmcp = vmcp.parent
+         end
+         print "#{ui.color("Folder:", :cyan)}"
+         print "\""
+         print actualname.split('/').reverse().join('/')
+         print "\"\t"
+
+       else
+         print "#{ui.color("Folder", :cyan)}: #{vmc.parent.name}\t"
+       end
+
+       if get_config(:ip)
+         print "#{ui.color("IP:", :cyan)} #{vmc.guest.ipAddress}\t"
+       end
+       if get_config(:os)
+         print "#{ui.color("OS:", :cyan)} #{vmc.guest.guestFullName}\t"
+       end
+       if get_config(:ram)
+         print "#{ui.color("RAM:", :cyan)} #{vmc.summary.config.memorySizeMB}\t"
+       end
+       if get_config(:cpu)
+         print "#{ui.color("CPU:", :cyan)} #{vmc.summary.config.numCpu}\t"
+       end
+       if get_config(:alarms)
+         print "#{ui.color("Alarms:", :cyan)} #{vmc.summary.overallStatus}\t"
+       end
+       print "#{ui.color("State:", :cyan)} #{state}\t"
+       if get_config(:tools)
+         print "#{ui.color("Tools:", :cyan)} #{vmc.guest.toolsStatus}\t"
+       end
+
+       if get_config(:os_disk)
+         print "#{ui.color("OS Disks:", :cyan)}"
+         vmc.guest.disk.each do |disc|
+           print "#{disc.diskPath} #{disc.capacity / 1024 / 1024}MB Free:#{disc.freeSpace / 1024 / 1024}MB |"
+         end
+       end
+
+       if get_config(:esx_disk)
+         print "#{ui.color("ESX Disks:", :cyan)}"
+         vmc.layout.disk.each do |dsc|
+           print "#{dsc.diskFile} | "
+         end
+       end
+
+       if get_config(:snapshots)
+         unless vmc.snapshot.nil?
+           print "#{ui.color("Snapshots:", :cyan)}"
+           vmc.snapshot.rootSnapshotList.each do |snap|
+             print " #{snap.name}"
+           end
+         end
+       end
+       puts
+      end
+    end
+  end
+end

data/lib/chef/knife/vsphere_vm_query.rb

@@ -1,6 +1,3 @@
-# Author:: Brian Dupras (<bdupras@rallydev.com>)
-# License:: Apache License, Version 2.0
-
 require 'chef/knife'
 require 'chef/knife/base_vsphere_command'
 require 'rbvmomi'
@@ -12,37 +9,10 @@ class Chef::Knife::VsphereVmQuery < Chef::Knife::BaseVsphereCommand
   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_connection
-
-    dc = datacenter
-    folder = find_folder(get_config(:folder)) || dc.vmFolder
-
-    vm = traverse_folders_for_vm(folder, vmname) || 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
+    args = ARGV
+    args[2] = 'show'
+    ui.warn 'vsphere vm query is moving to vsphere vm show. Next time, please run'
+    ui.warn args.join " "
+    Chef::Knife.run(args)
   end
 end

data/lib/chef/knife/vsphere_vm_show.rb

@@ -0,0 +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::VsphereVmShow < Chef::Knife::BaseVsphereCommand
+  banner "knife vsphere vm show VMNAME QUERY.  See \"http://pubs.vmware.com/vi3/sdk/ReferenceGuide/vim.VirtualMachine.html\" for allowed QUERY values."
+
+  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_connection
+
+    dc = datacenter
+    folder = find_folder(get_config(:folder)) || dc.vmFolder
+
+    vm = traverse_folders_for_vm(folder, vmname) || 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/chef/knife/vsphere_vm_snapshot.rb

@@ -39,6 +39,12 @@ class Chef::Knife::VsphereVmSnapshot < Chef::Knife::BaseVsphereCommand
          description: 'Indicates whether to start the VM after a successful revert',
          boolean: false
 
+  option :wait,
+         long: '--wait',
+         description: 'Indicates whether to wait for creation/removal to complete',
+         boolean: false
+
+
   def run
     $stdout.sync = true
 
@@ -67,14 +73,18 @@ class Chef::Knife::VsphereVmSnapshot < Chef::Knife::BaseVsphereCommand
     end
 
     if config[:create_new_snapshot]
-      vm.CreateSnapshot_Task(name: config[:create_new_snapshot], description: '', memory: false, quiesce: false)
+      snapshot_task=vm.CreateSnapshot_Task(name: config[:create_new_snapshot], description: '', memory: false, quiesce: false)
+      snapshot_task=snapshot_task.wait_for_completion if config[:wait]
+      snapshot_task
     end
 
     if config[:remove_named_snapshot]
       ss_name = config[:remove_named_snapshot]
       snapshot = find_node(snapshot_list, ss_name)
       puts "Found snapshot #{ss_name} removing."
-      snapshot.RemoveSnapshot_Task(removeChildren: false)
+      snapshot_task=snapshot.RemoveSnapshot_Task(removeChildren: false)
+      snapshot_task=snapshot_task.wait_for_completion if config[:wait]
+      snapshot_task
     end
 
     if config[:revert_current_snapshot]

data/lib/knife-vsphere/version.rb

@@ -1,3 +1,3 @@
 module KnifeVsphere
-  VERSION = '1.2.4'
+  VERSION = '1.2.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-vsphere
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Ezra Pagel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-02 00:00:00.000000000 Z
+date: 2015-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netaddr
@@ -86,6 +86,7 @@ files:
 - 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_pool_show.rb
 - lib/chef/knife/vsphere_template_list.rb
 - lib/chef/knife/vsphere_vlan_create.rb
 - lib/chef/knife/vsphere_vlan_list.rb
@@ -94,6 +95,7 @@ files:
 - 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_find.rb
 - lib/chef/knife/vsphere_vm_list.rb
 - lib/chef/knife/vsphere_vm_markastemplate.rb
 - lib/chef/knife/vsphere_vm_migrate.rb
@@ -102,6 +104,7 @@ files:
 - lib/chef/knife/vsphere_vm_property_get.rb
 - lib/chef/knife/vsphere_vm_property_set.rb
 - lib/chef/knife/vsphere_vm_query.rb
+- lib/chef/knife/vsphere_vm_show.rb
 - lib/chef/knife/vsphere_vm_snapshot.rb
 - lib/chef/knife/vsphere_vm_state.rb
 - lib/chef/knife/vsphere_vm_toolsconfig.rb