knife-vsphere 1.2.19 → 1.2.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c25fd6b8d92bd7e275f83b51cf56547e11c40bc
-  data.tar.gz: fa0e605b6779e90693077b4505648ea123e9365d
+  metadata.gz: e13ce28b3bdc4b2b9bb0dbcc5d4d3d8bda496eed
+  data.tar.gz: 6f02adc6815fee8cb34417e860b6d4afce3ea17a
 SHA512:
-  metadata.gz: e82afdd76191d93c17ac79a3f349bf2fcf5225b50bc1bc97535ee7a1c017a50fe1528eb6bd83d5283f8cbe7912f458d346a7cafe482b4411c2bdf2f26ec02c24
-  data.tar.gz: 6ba7c5d6f7923ed5bbcb5d12b5de0855a8cfaa06656ed8b73d510bc1979c534037e6531eb294e6a2a2f9a182da62c8fe18ecd76b4deb78f94e74cdab73fa23ac
+  metadata.gz: eda8d5d50c86e096e4654cb33e7b42372f46192a42eea351ee722ecc3e29538b0ffa27fdbdbe9c2a86f99c89d28bb14c3f00a7f477d4c7357bf945588a151dd6
+  data.tar.gz: afe13ef5403727e774eab7a94901c99a76f0db13c8f999b4cac2228958a2111e87bf4cb6a3bf53443ff5254b261f4a9b5ad5278d5ab53f6558076045960be4fc

data/lib/chef/knife/vsphere_vm_cdrom.rb

@@ -8,6 +8,8 @@ require 'netaddr'
 class Chef::Knife::VsphereVmCdrom < Chef::Knife::BaseVsphereCommand
   banner 'knife vsphere vm cdrom VMNAME (options)'
 
+  EMPTY_DEVICE_NAME = ''.freeze
+
   common_options
 
   option :datastore,
@@ -21,11 +23,13 @@ class Chef::Knife::VsphereVmCdrom < Chef::Knife::BaseVsphereCommand
   option :attach,
          short: '-a',
          long: '--attach',
-         description: 'Attach the virtual cdrom to the VM'
+         description: 'Attach the virtual cdrom to the VM',
+         boolean: true
 
   option :disconnect,
          long: '--disconnect',
-         description: 'Disconnect the virtual cdrom from the VM'
+         description: 'Disconnect the virtual cdrom from the VM',
+         boolean: true
 
   option :on_boot,
          long: '--on_boot ONBOOT',
@@ -46,65 +50,68 @@ class Chef::Knife::VsphereVmCdrom < Chef::Knife::BaseVsphereCommand
     vmname = @name_args[0]
     if vmname.nil?
       show_usage
-      ui.fatal('You must specify a virtual machine name')
-      exit 1
+      fatal_exit('You must specify a virtual machine name')
+    end
+
+    unless get_config(:attach) ^ get_config(:disconnect)
+      fatal_exit('You must specify one of --attach or --disconnect')
     end
 
+    fatal_exit 'You must specify the name and path of an ISO with --iso' if get_config(:attach) && !get_config(:iso)
+    fatal_exit 'You must specify the datastore containing the ISO with --datastore' if get_config(:attach) && !get_config(:datastore)
+
     vim_connection
 
     if get_config(:recursive)
       vms = get_vms(vmname)
       if vms.length > 1
-        abort "More than one VM with name #{vmname} found:\n" + vms.map { |vm| get_path_to_object(vm) }.join("\n")
+        fatal_exit "More than one VM with name #{vmname} found:\n" + vms.map { |vm| get_path_to_object(vm) }.join("\n")
       end
-      abort "VM #{vmname} not found" if vms.length == 0
+      fatal_exit "VM #{vmname} not found" if vms.empty?
       vm = vms[0]
     else
       base_folder = find_folder(get_config(:folder))
 
-      vm = find_in_folder(base_folder, RbVmomi::VIM::VirtualMachine, vmname) || abort("VM #{vmname} not found")
+      vm = find_in_folder(base_folder, RbVmomi::VIM::VirtualMachine, vmname) || fatal_exit("VM #{vmname} not found")
     end
 
-    if get_config(:iso)
-      cdrom_obj = vm.config.hardware.device.find { |hw| hw.class == RbVmomi::VIM::VirtualCdrom }
-      machine_conf_spec = RbVmomi::VIM::VirtualMachineConfigSpec(
-        deviceChange: [{
-          operation: :edit,
-          device: RbVmomi::VIM::VirtualCdrom(
-            backing: RbVmomi::VIM::VirtualCdromIsoBackingInfo(
-              fileName: "[#{get_config(:datastore)}] #{get_config(:iso)}"
-            ),
-            key: cdrom_obj.key,
-            controllerKey: cdrom_obj.controllerKey,
-            connectable: RbVmomi::VIM::VirtualDeviceConnectInfo(
-              startConnected: get_config(:on_boot) || false,
-              connected: get_config(:attach) || false,
-              allowGuestControl: true
-            )
-          )
-        }]
-      )
-      vm.ReconfigVM_Task(spec: machine_conf_spec).wait_for_completion
-    elsif get_config(:disconnect)
-      cdrom_obj = vm.config.hardware.device.find { |hw| hw.class == RbVmomi::VIM::VirtualCdrom }
-      machine_conf_spec = RbVmomi::VIM::VirtualMachineConfigSpec(
-        deviceChange: [{
-          operation: :edit,
-          device: RbVmomi::VIM::VirtualCdrom(
-            backing: RbVmomi::VIM::VirtualCdromRemoteAtapiBackingInfo(
-              deviceName: ''),
-            key: cdrom_obj.key,
-            controllerKey: cdrom_obj.controllerKey,
-            connectable: RbVmomi::VIM::VirtualDeviceConnectInfo(
-              startConnected: false,
-              connected: false,
-              allowGuestControl: true
-            )
+    cdrom_obj = vm.config.hardware.device.find { |hw| hw.class == RbVmomi::VIM::VirtualCdrom }
+    fatal_exit 'Could not find a cd drive' unless cdrom_obj
+
+    backing = if get_config(:attach)
+                RbVmomi::VIM::VirtualCdromIsoBackingInfo(
+                  fileName: iso_path
+                )
+              else
+                RbVmomi::VIM::VirtualCdromRemoteAtapiBackingInfo(deviceName: EMPTY_DEVICE_NAME)
+              end
+
+    vm.ReconfigVM_Task(
+      spec: spec(cdrom_obj, backing)
+    ).wait_for_completion
+  end
+
+  private
+
+  def spec(cd_device, backing)
+    RbVmomi::VIM::VirtualMachineConfigSpec(
+      deviceChange: [{
+        operation: :edit,
+        device: RbVmomi::VIM::VirtualCdrom(
+          backing: backing,
+          key: cd_device.key,
+          controllerKey: cd_device.controllerKey,
+          connectable: RbVmomi::VIM::VirtualDeviceConnectInfo(
+            startConnected: get_config(:on_boot) || false,
+            connected: get_config(:attach) || false,
+            allowGuestControl: true
           )
-        }]
-      )
-      puts 'attempting to reconfigure the vm'
-      vm.ReconfigVM_Task(spec: machine_conf_spec).wait_for_completion
-    end
+        )
+      }]
+    )
+  end
+
+  def iso_path
+    "[#{get_config(:datastore)}] #{get_config(:iso)}"
   end
 end

data/lib/chef/knife/vsphere_vm_disk_list.rb

@@ -26,7 +26,7 @@ class Chef::Knife::VsphereVmDiskList < Chef::Knife::BaseVsphereCommand
     disks.each do |disk|
       puts '%3d %20s %s' % [disk.unitNumber,
                             disk.deviceInfo.label,
-                            Filesize.from("#{disk.capacityInKB} KB").pretty]
+                            Filesize.from("#{disk.capacityInKB} KiB").pretty]
     end
   end
 end

data/lib/chef/knife/vsphere_vm_network_delete.rb

@@ -0,0 +1,50 @@
+#
+# Author:: Scott Williams (<scott@backups.net.au>)
+# License:: Apache License, Version 2.0
+#
+require 'chef/knife'
+require 'chef/knife/base_vsphere_command'
+require 'rbvmomi'
+require 'netaddr'
+
+class Chef::Knife::VsphereVmNetworkDelete < Chef::Knife::BaseVsphereCommand
+  banner 'knife vsphere vm network delete VMNAME NICNAME'
+
+  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
+
+    nicname = @name_args[1]
+    if nicname.nil?
+      show_usage
+      fatal_exit('You must specify the name of the NIC to delete')
+    end
+
+    vim_connection
+    vm = get_vm(vmname) || abort('VM not found')
+
+    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 ', '
+      fatal_exit "Could not find #{nicname}. I did find #{found}."
+    else
+      spec = RbVmomi::VIM.VirtualMachineConfigSpec(
+        deviceChange: [{
+          operation: :remove,
+          device: card
+        }]
+      )
+
+      vm.ReconfigVM_Task(spec: spec).wait_for_completion
+      puts "#{ui.color('NIC', :red)}: #{card.deviceInfo.label} was deleted"
+    end
+  end
+end

data/lib/chef/knife/vsphere_vm_network_list.rb

@@ -0,0 +1,37 @@
+#
+# Author:: Scott Williams (<scott@backups.net.au>)
+# License:: Apache License, Version 2.0
+#
+require 'chef/knife'
+require 'chef/knife/base_vsphere_command'
+require 'rbvmomi'
+require 'netaddr'
+
+class Chef::Knife::VsphereVmNetworkList < Chef::Knife::BaseVsphereCommand
+  banner 'knife vsphere vm network list VMNAME'
+
+  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
+
+    vim_connection
+    dc = datacenter
+    folder = find_folder(get_config(:folder)) || dc.vmFolder
+    vm = traverse_folders_for_vm(folder, vmname) || abort("VM #{vmname} not found")
+
+    vm.config.hardware.device.each.grep(RbVmomi::VIM::VirtualEthernetCard).map do |nic|
+      dc.network.each.grep(RbVmomi::VIM::DistributedVirtualPortgroup) do |net|
+        if nic.backing.port.portgroupKey.eql?(net.key)
+          puts "NIC: #{nic.deviceInfo.label} VLAN: #{net.name}"
+        end
+      end
+    end
+  end
+end

data/lib/knife-vsphere/version.rb

@@ -1,3 +1,3 @@
 module KnifeVsphere
-  VERSION = '1.2.19'
+  VERSION = '1.2.20'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-vsphere
 version: !ruby/object:Gem::Version
-  version: 1.2.19
+  version: 1.2.20
 platform: ruby
 authors:
 - Ezra Pagel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-14 00:00:00.000000000 Z
+date: 2016-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: filesize
@@ -160,6 +160,8 @@ files:
 - lib/chef/knife/vsphere_vm_move.rb
 - lib/chef/knife/vsphere_vm_net.rb
 - lib/chef/knife/vsphere_vm_network_add.rb
+- lib/chef/knife/vsphere_vm_network_delete.rb
+- lib/chef/knife/vsphere_vm_network_list.rb
 - lib/chef/knife/vsphere_vm_network_set.rb
 - lib/chef/knife/vsphere_vm_property_get.rb
 - lib/chef/knife/vsphere_vm_property_set.rb
@@ -192,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: vSphere Support for Knife