knife-vsphere 2.1.1 → 2.1.3

data/lib/chef/knife/vsphere_vm_list.rb

@@ -2,23 +2,23 @@
 # Author:: Ezra Pagel (<ezra@cpan.org>)
 # License:: Apache License, Version 2.0
 #
-require 'chef/knife'
-require 'chef/knife/base_vsphere_command'
+require "chef/knife"
+require "chef/knife/base_vsphere_command"
 
 # Lists all known virtual machines in the configured datacenter
 class Chef::Knife::VsphereVmList < Chef::Knife::BaseVsphereCommand
-  banner 'knife vsphere vm list'
+  banner "knife vsphere vm list"
 
   common_options
 
   option :recursive,
-         long: '--recursive',
-         short: '-r',
-         description: 'Recurse into sub-folders'
+         long: "--recursive",
+         short: "-r",
+         description: "Recurse into sub-folders"
 
   option :onlyfolders,
-         long: '--only-folders',
-         description: 'List only the folders found',
+         long: "--only-folders",
+         description: "List only the folders found",
          boolean: false
 
   def traverse_folders(folder, is_top = false, recurse = false, only_folders = false)
@@ -44,11 +44,11 @@ class Chef::Knife::VsphereVmList < Chef::Knife::BaseVsphereCommand
   def print_vm(vm)
     state = case vm.runtime.powerState
             when PS_ON
-              ui.color('on', :green)
+              ui.color("on", :green)
             when PS_OFF
-              ui.color('off', :red)
+              ui.color("off", :red)
             when PS_SUSPENDED
-              ui.color('suspended', :yellow)
+              ui.color("suspended", :yellow)
             end
     puts "\t#{ui.color('VM Name:', :cyan)} #{vm.name}"
     puts "\t\t#{ui.color('IP:', :magenta)} #{vm.guest.ipAddress}"
@@ -57,7 +57,7 @@ class Chef::Knife::VsphereVmList < Chef::Knife::BaseVsphereCommand
   end
 
   def print_folder(folder)
-    puts "#{ui.color('Folder', :cyan)}: " + (folder.path[3..-1].map { |x| x[1] }.* '/')
+    puts "#{ui.color('Folder', :cyan)}: " + (folder.path[3..-1].map { |x| x[1] }.* "/")
   end
 
   def run

data/lib/chef/knife/vsphere_vm_markastemplate.rb

@@ -6,9 +6,9 @@
 # License:: Apache License, Version 2.0
 #
 
-require 'chef/knife'
-require 'chef/knife/base_vsphere_command'
-require 'chef/knife/search_helper'
+require "chef/knife"
+require "chef/knife/base_vsphere_command"
+require "chef/knife/search_helper"
 
 # Clone an existing template into a new VM, optionally applying a customization specification.
 # usage:
@@ -16,7 +16,7 @@ require 'chef/knife/search_helper'
 # Vspherevmmarkastemplate extends the Basevspherecommand
 class Chef::Knife::VsphereVmMarkastemplate < Chef::Knife::BaseVsphereCommand
   include SearchHelper
-  banner 'knife vsphere vm markastemplate VMNAME'
+  banner "knife vsphere vm markastemplate VMNAME"
 
   common_options
 
@@ -28,7 +28,7 @@ class Chef::Knife::VsphereVmMarkastemplate < Chef::Knife::BaseVsphereCommand
     vmname = @name_args[0]
     if vmname.nil?
       show_usage
-      fatal_exit('You must specify a virtual machine name')
+      fatal_exit("You must specify a virtual machine name")
     end
 
     vm = get_vm_by_name(vmname, get_config(:folder)) || fatal_exit("Could not find #{vmname}")

data/lib/chef/knife/vsphere_vm_migrate.rb

@@ -2,58 +2,53 @@
 # Author:: Raducu Deaconu (<rhadoo_io@yahoo.com>)
 # License:: Apache License, Version 2.0
 #
-require 'chef/knife'
-require 'chef/knife/base_vsphere_command'
-require 'chef/knife/search_helper'
+require "chef/knife"
+require "chef/knife/base_vsphere_command"
+require "chef/knife/search_helper"
 
 # migrate vm to specified resource pool , datastore and host
 class Chef::Knife::VsphereVmMigrate < Chef::Knife::BaseVsphereCommand
   include SearchHelper
   # migrate --resource-pool --dest-host --dest-datastore
-  banner 'knife vsphere vm migrate (options)'
+  banner "knife vsphere vm migrate VMNAME (options)"
 
   common_options
 
   option :dest_host,
-         long: '--dest-host HOST',
-         description: 'Destination host for the VM or template'
+         long: "--dest-host HOST",
+         description: "Destination host for the VM or template"
 
   option :dest_datastore,
-         long: '--dest-datastore DATASTORE',
-         description: 'The destination datastore'
+         long: "--dest-datastore DATASTORE",
+         description: "The destination datastore"
 
   option :priority,
-         long: '--priority PRIORITY',
-         description: 'migration priority'
+         long: "--priority PRIORITY",
+         description: "migration priority"
 
   option :resource_pool,
-         long: '--resource-pool POOL',
-         description: 'The resource pool into which to put the VM'
-
-  def find_host_folder(folder, name)
-    folder.childEntity.each do |cluster|
-      cluster.host.each do |host|
-        return host if host.name == name
-      end
-    end
-    nil
-  end
+         long: "--resource-pool POOL",
+         description: "The resource pool into which to put the VM"
 
   def run
     $stdout.sync = true
     vmname = @name_args[0]
     if vmname.nil?
       show_usage
-      fatal_exit('You must specify a virtual machine name')
+      fatal_exit("You must specify a virtual machine name")
     end
 
     vm = get_vm_by_name(vmname, get_config(:folder)) || fatal_exit("Could not find #{vmname}")
 
     priority = config[:priority]
-    dest_host = config[:dest_host]
-    ndc = find_datastore(config[:dest_datastore]) || abort('dest-datastore not found')
+    dest_host = get_vm_host_by_name(config[:dest_host]) if config[:dest_host]
+    ndc = find_datastore(config[:dest_datastore]) if config[:dest_datastore]
     pool = find_pool(config[:resource_pool]) if config[:resource_pool]
-    dest_host = find_host_folder(datacenter.hostFolder, dest_host)
+
+    unless dest_host || ndc || pool
+      fatal_exit("You need to specify one or more of --dest-host, --dest-datastore, or --resource-pool")
+    end
+
     migrate_spec = RbVmomi::VIM.VirtualMachineRelocateSpec(datastore: ndc, pool: pool, host: dest_host)
     vm.RelocateVM_Task(spec: migrate_spec, priority: priority).wait_for_completion
   end

data/lib/chef/knife/vsphere_vm_move.rb

@@ -2,39 +2,39 @@
 # Author:: Brian Dupras (<bdupras@rallydev.com>)
 # License:: Apache License, Version 2.0
 #
-require 'chef/knife'
-require 'chef/knife/base_vsphere_command'
-require 'chef/knife/search_helper'
+require "chef/knife"
+require "chef/knife/base_vsphere_command"
+require "chef/knife/search_helper"
 
-# Lists all known virtual machines in the configured datacenter
+# Moves the VM to another folder or datastore
 # VsphereVmMove extends the BaseVspherecommand
 class Chef::Knife::VsphereVmMove < Chef::Knife::BaseVsphereCommand
   include SearchHelper
-  banner 'knife vsphere vm move'
+  banner "knife vsphere vm move VMNAME"
 
   common_options
 
   option :dest_name,
-         long: '--dest-name NAME',
-         short: '-r',
-         description: 'Destination name of the VM or template'
+         long: "--dest-name NAME",
+         short: "-r",
+         description: "Destination name of the VM or template"
 
   option :dest_folder,
-         long: '--dest-folder FOLDER',
-         description: 'The destination folder into which the VM or template should be moved'
+         long: "--dest-folder FOLDER",
+         description: "The destination folder into which the VM or template should be moved"
 
   option :datastore,
-         long: '--datastore STORE',
-         description: 'The datastore into which to put the cloned VM'
+         long: "--datastore STORE",
+         description: "The datastore into which to put the cloned VM"
 
   option :thin_provision,
-         long: '--thin-provision',
-         description: 'Indicates whether disk should be thin provisioned.',
+         long: "--thin-provision",
+         description: "Indicates whether disk should be thin provisioned.",
          boolean: true
 
   option :thick_provision,
-         long: '--thick-provision',
-         description: 'Indicates whether disk should be thick provisioned.',
+         long: "--thick-provision",
+         description: "Indicates whether disk should be thick provisioned.",
          boolean: true
 
   # Convert VM
@@ -78,7 +78,7 @@ class Chef::Knife::VsphereVmMove < Chef::Knife::BaseVsphereCommand
     vmname = @name_args[0]
     if vmname.nil?
       show_usage
-      fatal_exit('You must specify a virtual machine name')
+      fatal_exit("You must specify a virtual machine name")
     end
 
     vm = get_vm_by_name(vmname, get_config(:folder)) || fatal_exit("Could not find #{vmname}")

data/lib/chef/knife/vsphere_vm_net.rb

@@ -2,15 +2,15 @@
 # Author:: Raducu Deaconu (<rhadoo_io@yahoo.com>)
 # License:: Apache License, Version 2.0
 #
-require 'chef/knife'
-require 'chef/knife/base_vsphere_command'
-require 'chef/knife/search_helper'
+require "chef/knife"
+require "chef/knife/base_vsphere_command"
+require "chef/knife/search_helper"
 
 # Switch VM networking state up/down (on all network interfaces)
 # VsphereVmNet extends the BaseVspherecommand
 class Chef::Knife::VsphereVmNet < Chef::Knife::BaseVsphereCommand
   include SearchHelper
-  banner 'knife vsphere vm net STATE VMNAME'
+  banner "knife vsphere vm net STATE VMNAME"
   common_options
 
   # The main run method for vm_net
@@ -20,18 +20,18 @@ class Chef::Knife::VsphereVmNet < Chef::Knife::BaseVsphereCommand
     vmname = @name_args[1]
     if vmname.nil?
       show_usage
-      fatal_exit('You must specify a virtual machine name')
+      fatal_exit("You must specify a virtual machine name")
     end
 
     state = @name_args[0]
     if state.nil?
       show_usage
-      fatal_exit('You must specify networking state up/down')
+      fatal_exit("You must specify networking state up/down")
     end
 
-    if state == 'up'
+    if state == "up"
       if_state = true
-    elsif state == 'down'
+    elsif state == "down"
       if_state = false
     end
 

data/lib/chef/knife/vsphere_vm_network_add.rb

@@ -2,50 +2,48 @@
 # Author:: Scott Williams (<scott@backups.net.au>)
 # License:: Apache License, Version 2.0
 #
-require 'chef/knife'
-require 'chef/knife/base_vsphere_command'
-require 'chef/knife/search_helper'
-require 'netaddr'
+require "chef/knife"
+require "chef/knife/base_vsphere_command"
+require "chef/knife/search_helper"
+require "netaddr"
 
 class Chef::Knife::VsphereVmNetworkAdd < Chef::Knife::BaseVsphereCommand
   include SearchHelper
-  banner 'knife vsphere vm network add VMNAME NETWORKNAME'
+  banner "knife vsphere vm network add VMNAME NETWORKNAME"
 
   option :adapter_type,
-         long: '--adapter-type STRING',
-         description: 'Adapter type eg e1000,vmxnet3',
+         long: "--adapter-type STRING",
+         description: "Adapter type eg e1000,vmxnet3",
          required: true
 
   option :mac_address,
-         long: '--mac-address STRING',
-         description: 'Adapter MAC address eg. AA:BB:CC:DD:EE:FF',
+         long: "--mac-address STRING",
+         description: "Adapter MAC address eg. AA:BB:CC:DD:EE:FF",
          required: false
 
   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')
+      fatal_exit("You must specify a virtual machine name")
     end
 
     networkname = @name_args[1]
     if networkname.nil?
       show_usage
-      fatal_exit('You must specify the network name')
+      fatal_exit("You must specify the network name")
     end
 
-
     vm = get_vm_by_name(vmname, get_config(:folder)) || fatal_exit("Could not find #{vmname}")
 
     network = find_network(networkname)
 
     case network
     when RbVmomi::VIM::DistributedVirtualPortgroup
-      switch, pg_key = network.collect 'config.distributedVirtualSwitch', 'key'
+      switch, pg_key = network.collect "config.distributedVirtualSwitch", "key"
       port = RbVmomi::VIM.DistributedVirtualSwitchPortConnection(
         switchUuid: switch.uuid,
         portgroupKey: pg_key
@@ -55,23 +53,23 @@ class Chef::Knife::VsphereVmNetworkAdd < Chef::Knife::BaseVsphereCommand
     when RbVmomi::VIM::Network
       summary = network.name
       backing = RbVmomi::VIM.VirtualEthernetCardNetworkBackingInfo(deviceName: network.name)
-    else fail
+    else raise
     end
 
     device_type = case get_config(:adapter_type)
-    when 'e1000'
+    when "e1000"
       :VirtualE1000
-    when 'vmxnet3'
+    when "vmxnet3"
       :VirtualVmxnet3
     when *
-      fatal_exit('The adapter must be either e1000 or vmxnet3')
+      fatal_exit("The adapter must be either e1000 or vmxnet3")
                   end
 
     if get_config(:mac_address).nil?
-      address_type = 'generated'
-      mac_address = ''
+      address_type = "generated"
+      mac_address = ""
     else
-      address_type = 'manual'
+      address_type = "manual"
       mac_address = get_config(:mac_address)
     end
 
@@ -82,12 +80,12 @@ class Chef::Knife::VsphereVmNetworkAdd < Chef::Knife::BaseVsphereCommand
           fileOperation: nil,
           device: RbVmomi::VIM.send(device_type,
             key: -1,
-            deviceInfo: { summary: summary, label: '' },
+            deviceInfo: { summary: summary, label: "" },
             backing: backing,
             addressType: address_type,
             macAddress: mac_address
-          )
-        }]
+          ),
+        }],
       }
     ).wait_for_completion
   end

data/lib/chef/knife/vsphere_vm_network_delete.rb

@@ -2,13 +2,13 @@
 # Author:: Scott Williams (<scott@backups.net.au>)
 # License:: Apache License, Version 2.0
 #
-require 'chef/knife'
-require 'chef/knife/base_vsphere_command'
-require 'chef/knife/search_helper'
+require "chef/knife"
+require "chef/knife/base_vsphere_command"
+require "chef/knife/search_helper"
 
 class Chef::Knife::VsphereVmNetworkDelete < Chef::Knife::BaseVsphereCommand
   include SearchHelper
-  banner 'knife vsphere vm network delete VMNAME NICNAME'
+  banner "knife vsphere vm network delete VMNAME NICNAME"
 
   common_options
 
@@ -18,13 +18,13 @@ class Chef::Knife::VsphereVmNetworkDelete < Chef::Knife::BaseVsphereCommand
     vmname = @name_args[0]
     if vmname.nil?
       show_usage
-      fatal_exit('You must specify a virtual machine name')
+      fatal_exit("You must specify a virtual machine name")
     end
 
     nicname = @name_args[1]
     if nicname.nil?
       show_usage
-      fatal_exit('You must specify the name of the NIC to delete')
+      fatal_exit("You must specify the name of the NIC to delete")
     end
 
     vm = get_vm_by_name(vmname, get_config(:folder)) || fatal_exit("Could not find #{vmname}")
@@ -32,13 +32,13 @@ class Chef::Knife::VsphereVmNetworkDelete < Chef::Knife::BaseVsphereCommand
     cards = vm.config.hardware.device.grep(RbVmomi::VIM::VirtualEthernetCard)
     card = cards.detect { |c| c.deviceInfo.label == nicname }
     if card.nil?
-      found = cards.map { |c| c.deviceInfo.label }.join ', '
+      found = cards.map { |c| c.deviceInfo.label }.join ", "
       fatal_exit "Could not find #{nicname}. I did find #{found}."
     else
       spec = RbVmomi::VIM.VirtualMachineConfigSpec(
         deviceChange: [{
           operation: :remove,
-          device: card
+          device: card,
         }]
       )
 

data/lib/chef/knife/vsphere_vm_network_list.rb

@@ -2,14 +2,14 @@
 # Author:: Scott Williams (<scott@backups.net.au>)
 # License:: Apache License, Version 2.0
 #
-require 'chef/knife'
-require 'chef/knife/base_vsphere_command'
-require 'chef/knife/search_helper'
+require "chef/knife"
+require "chef/knife/base_vsphere_command"
+require "chef/knife/search_helper"
 
 # VsphereVmNetworklist extends the BaseVspherecommand
 class Chef::Knife::VsphereVmNetworkList < Chef::Knife::BaseVsphereCommand
   include SearchHelper
-  banner 'knife vsphere vm network list VMNAME'
+  banner "knife vsphere vm network list VMNAME"
 
   common_options
 
@@ -21,7 +21,7 @@ class Chef::Knife::VsphereVmNetworkList < Chef::Knife::BaseVsphereCommand
     vmname = @name_args[0]
     if vmname.nil?
       show_usage
-      fatal_exit('You must specify a virtual machine name')
+      fatal_exit("You must specify a virtual machine name")
     end
 
     vm = get_vm_by_name(vmname, get_config(:folder)) || fatal_exit("Could not find #{vmname}")