knife-vsphere 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28d327261e11658b4d6f926e93b136a1c4979e55
-  data.tar.gz: 4c0499b076d8197ccdbd44f9aba9834989e65743
+  metadata.gz: 5a38302a790751f683b4e650f7bf7bb8425409b2
+  data.tar.gz: 2c4f53befb4b733af86250addfcd844f417df1be
 SHA512:
-  metadata.gz: dfdd72ab2858dc5ae00bc8e688c737562a68eb65e52a34e004629a7d7b40a1acb3776dc061c16cfc6699b788ea2f9c66c222af7608b8f3f174cee4fc0de775c1
-  data.tar.gz: 11f6c48d15e56559a0b6181d9e6506ae0c7d77ad9eec8f70dacbfaf4ab4103d31d18c8551c8a0c468097573c1e1fc4dcad753cded01d84a86a898b94e46a8e26
+  metadata.gz: 8fc957ac456c865811d93ea7b6e9ce6006b85e26ab710a21e8cd0ac31e6e39e5665c55a1b6ac1f1e78076cff52ea79c8863460e4f04d6df7c7bdb68f07a8ebd4
+  data.tar.gz: a51ce26b8a3e093dae4a11e82627fccfffa906b8c2fbef53aa935e29fbdb2cdb8dadd8830d1336e3e14b59f2d0dbe3d2b4c64bcc248452bd88eb468b9a14ac74

data/lib/chef/knife/vsphere_vm_config.rb

@@ -8,8 +8,8 @@ require 'chef/knife/search_helper'
 # VsphereVMconfig extends the BaseVspherecommand
 class Chef::Knife::VsphereVmConfig < Chef::Knife::BaseVsphereCommand
   include SearchHelper
-  banner "knife vsphere vm config VMNAME PROPERTY VALUE.
-          See \"http://pubs.vmware.com/vi3/sdk/ReferenceGuide/vim.vm.ConfigSpec.html\"
+  banner "knife vsphere vm config VMNAME PROPERTY VALUE (PROPERTY VALUE)...
+          See \"https://www.vmware.com/support/developer/converter-sdk/conv60_apireference/vim.vm.ConfigSpec.html\"
           for allowed ATTRIBUTE values (any property of type xs:string is supported)."
 
   common_options
@@ -18,31 +18,19 @@ class Chef::Knife::VsphereVmConfig < Chef::Knife::BaseVsphereCommand
   #
   def run
     $stdout.sync = true
-    vmname = @name_args[0]
+    vmname = @name_args.shift
     if vmname.nil?
       show_usage
       fatal_exit('You must specify a virtual machine name')
     end
 
-    property_name = @name_args[1]
-    if property_name.nil?
-      show_usage
-      fatal_exit('You must specify a PROPERTY name (e.g. annotation)')
+    unless @name_args.length > 0 && @name_args.length % 2 == 0
+      fatal_exit('You must specify a series of PROPERTY name (e.g. annotation) followed by a value')
     end
-    property_name = property_name.to_sym
-
-    property_value = @name_args[2]
-    if property_value.nil?
-      show_usage
-      fatal_exit('You must specify a PROPERTY value')
-    end
-
-    vim_connection
 
     vm = get_vm_by_name(vmname, get_config(:folder)) || fatal_exit("Could not find #{vmname}")
 
-    properties = {}
-    properties[property_name] = property_value
+    properties = @name_args.each_slice(2).map { |prop, val| [prop.to_sym, val] }.to_h
     vm.ReconfigVM_Task(spec: RbVmomi::VIM.VirtualMachineConfigSpec(properties)).wait_for_completion
   end
 end

data/lib/chef/knife/vsphere_vm_execute.rb

@@ -3,11 +3,12 @@
 
 require 'chef/knife'
 require 'chef/knife/base_vsphere_command'
-require 'rbvmomi'
-require 'netaddr'
+require 'chef/knife/search_helper'
 
 # VsphereVMexecute extends the Basevspherecommand
 class Chef::Knife::VsphereVmExecute < Chef::Knife::BaseVsphereCommand
+  include SearchHelper
+
   banner 'knife vsphere vm execute VMNAME COMMAND ARGS'
 
   option :exec_user,
@@ -30,34 +31,29 @@ class Chef::Knife::VsphereVmExecute < Chef::Knife::BaseVsphereCommand
   #
   def run
     $stdout.sync = true
-    vmname = @name_args[0]
+    vmname = @name_args.shift
     if vmname.nil?
       show_usage
       fatal_exit('You must specify a virtual machine name')
     end
-    command = @name_args[1]
+    command = @name_args.shift
     if command.nil?
       show_usage
       fatal_exit('You must specify a command to execute')
     end
 
-    args = @name_args[2]
-    args = '' if args.nil?
-
-    vim = vim_connection
-
-    dc = datacenter
-    folder = find_folder(get_config(:folder)) || dc.vmFolder
+    args = @name_args
+    args = '' if args.nil? || args.empty?
 
-    vm = find_in_folder(folder, RbVmomi::VIM::VirtualMachine, vmname) || abort("VM #{vmname} not found")
+    vm = get_vm_by_name(vmname, get_config(:folder)) || fatal_exit("Could not find #{vmname}")
 
-    gom = vim.serviceContent.guestOperationsManager
+    gom = vim_connection.serviceContent.guestOperationsManager
 
     guest_auth = RbVmomi::VIM::NamePasswordAuthentication(interactiveSession: false,
                                                           username: config[:exec_user],
                                                           password: config[:exec_passwd])
     prog_spec = RbVmomi::VIM::GuestProgramSpec(programPath: command,
-                                               arguments: args,
+                                               arguments: args.join(' '),
                                                workingDirectory: get_config(:exec_dir))
 
     gom.processManager.StartProgramInGuest(vm: vm, auth: guest_auth, spec: prog_spec)

data/lib/chef/knife/vsphere_vm_show.rb

@@ -16,33 +16,33 @@ class Chef::Knife::VsphereVmShow < Chef::Knife::BaseVsphereCommand
   #
   def run
     $stdout.sync = true
-    vmname = @name_args[0]
+    vmname = @name_args.shift
     if vmname.nil?
       show_usage
       fatal_exit('You must specify a virtual machine name')
     end
 
-    query_string = @name_args[1]
-    if query_string.nil?
+    if @name_args.empty?
       show_usage
       fatal_exit('You must specify a QUERY value (e.g. guest.ipAddress or network[0].name)')
     end
 
-    vim_connection
-
     vm = get_vm_by_name(vmname, get_config(:folder)) || fatal_exit("Could not find #{vmname}")
 
-    # 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.")
+    out = @name_args.map do |query_string|
+      # 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
 
-      result = index ? result.send(message)[index.to_i] : result.send(message)
+      { query_string => result }
     end
-    puts result
+  ui.output out
   end
 end

data/lib/knife-vsphere/version.rb

@@ -1,5 +1,5 @@
 # The main knife-vsphere module.
 module KnifeVsphere
   # The version of this gem.
-  VERSION = '2.1.0'
+  VERSION = '2.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-vsphere
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Ezra Pagel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-27 00:00:00.000000000 Z
+date: 2018-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knife-windows
@@ -208,7 +208,6 @@ files:
 - lib/chef/knife/vsphere_vm_network_set.rb
 - 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

data/lib/chef/knife/vsphere_vm_query.rb

@@ -1,19 +0,0 @@
-require 'chef/knife'
-require 'chef/knife/base_vsphere_command'
-
-# VsphereVmQuery extends the BaseVspherecommand
-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."
-
-  common_options
-
-  # The main run method for vm_query
-  #
-  def run
-    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