knife-vsphere 3.0.1 → 4.0.1

data/lib/chef/knife/vsphere_vm_delete.rb

@@ -19,15 +19,15 @@ class Chef::Knife::VsphereVmDelete < Chef::Knife::BaseVsphereCommand
   banner "knife vsphere vm delete VMNAME (options)"
 
   option :purge,
-         short: "-P",
-         long: "--purge",
-         boolean: true,
-         description: "Destroy corresponding node and client on the Chef Server, in addition to destroying the VM itself."
+    short: "-P",
+    long: "--purge",
+    boolean: true,
+    description: "Destroy corresponding node and client on the Chef Server, in addition to destroying the VM itself."
 
   option :chef_node_name,
-         short: "-N NAME",
-         long: "--node-name NAME",
-         description: "Use this option if the Chef node name is different from the VM name"
+    short: "-N NAME",
+    long: "--node-name NAME",
+    description: "Use this option if the Chef node name is different from the VM name"
 
   common_options
 

data/lib/chef/knife/vsphere_vm_disk_extend.rb

@@ -14,8 +14,8 @@ class Chef::Knife::VsphereVmDiskExtend < Chef::Knife::BaseVsphereCommand
   common_options
 
   option :diskname,
-         long: "--diskname DISKNAME",
-         description: "The name of the disk that will be extended"
+    long: "--diskname DISKNAME",
+    description: "The name of the disk that will be extended"
 
   def run
     $stdout.sync = true
@@ -57,7 +57,8 @@ class Chef::Knife::VsphereVmDiskExtend < Chef::Knife::BaseVsphereCommand
       RbVmomi::VIM::VirtualMachineConfigSpec(
         deviceChange: [RbVmomi::VIM::VirtualDeviceConfigSpec(
           device: disk,
-          operation: RbVmomi::VIM::VirtualDeviceConfigSpecOperation("edit"))]
+          operation: RbVmomi::VIM::VirtualDeviceConfigSpecOperation("edit")
+        )]
       )).wait_for_completion
 
     puts "Disk resized successfully"

data/lib/chef/knife/vsphere_vm_execute.rb

@@ -12,18 +12,18 @@ class Chef::Knife::VsphereVmExecute < Chef::Knife::BaseVsphereCommand
   banner "knife vsphere vm execute VMNAME COMMAND ARGS"
 
   option :exec_user,
-         long: "--exec-user USER",
-         description: "User to execute as",
-         required: true
+    long: "--exec-user USER",
+    description: "User to execute as",
+    required: true
 
   option :exec_passwd,
-         long: "--exec-passwd PASSWORD",
-         description: "Password for execute user",
-         required: true
+    long: "--exec-passwd PASSWORD",
+    description: "Password for execute user",
+    required: true
 
   option :exec_dir,
-         long: "--exec-dir DIRECTORY",
-         description: "Working directory to execute in"
+    long: "--exec-dir DIRECTORY",
+    description: "Working directory to execute in"
 
   common_options
 

data/lib/chef/knife/vsphere_vm_find.rb

@@ -17,101 +17,101 @@ class Chef::Knife::VsphereVmFind < Chef::Knife::BaseVsphereCommand
 
   # Deprecating
   option :pool,
-         long: "--pool pool",
-         short: "-h",
-         description: "Target pool"
+    long: "--pool pool",
+    short: "-h",
+    description: "Target pool"
   # Deprecating
   option :poolpath,
-         long: "--pool-path",
-         description: "Pool is full-path"
+    long: "--pool-path",
+    description: "Pool is full-path"
 
   option :esx_disk,
-         long: "--esx-disk",
-         description: "Show esx disks"
+    long: "--esx-disk",
+    description: "Show esx disks"
 
   option :snapshots,
-         long: "--snapshots",
-         description: "Show snapshots"
+    long: "--snapshots",
+    description: "Show snapshots"
 
   option :os_disk,
-         long: "--os-disks",
-         description: "Show os disks"
+    long: "--os-disks",
+    description: "Show os disks"
 
   option :cpu,
-         long: "--cpu",
-         description: "Show cpu"
+    long: "--cpu",
+    description: "Show cpu"
 
   option :cpu_hot_add_enabled,
-         long: "--cpu_hot_add_enabled",
-         description: "Show cpu hot add enabled"
+    long: "--cpu_hot_add_enabled",
+    description: "Show cpu hot add enabled"
 
   option :memory_hot_add_enabled,
-         long: "--memory_hot_add_enabled",
-         description: "Show memory hot add enabled"
+    long: "--memory_hot_add_enabled",
+    description: "Show memory hot add enabled"
 
   option :ram,
-         long: "--ram",
-         description: "Show ram"
+    long: "--ram",
+    description: "Show ram"
 
   option :ip,
-         long: "--ip",
-         description: "Show primary ip"
+    long: "--ip",
+    description: "Show primary ip"
 
   option :networks,
-         long: "--networks",
-         description: "Show all networks with their IPs"
+    long: "--networks",
+    description: "Show all networks with their IPs"
 
   option :soff,
-         long: "--powered-off",
-         description: "Show only stopped machines"
+    long: "--powered-off",
+    description: "Show only stopped machines"
 
   option :son,
-         long: "--powered-on",
-         description: "Show only started machines"
+    long: "--powered-on",
+    description: "Show only started machines"
 
   option :matchip,
-         long: "--match-ip IP",
-         description: "match ip"
+    long: "--match-ip IP",
+    description: "match ip"
 
   option :matchos,
-         long: "--match-os OS",
-         description: "match os"
+    long: "--match-os OS",
+    description: "match os"
 
   option :matchname,
-         long: "--match-name VMNAME",
-         description: "match name"
+    long: "--match-name VMNAME",
+    description: "match name"
 
   option :matchtools,
-         long: "--match-tools TOOLSSTATE",
-         description: "match tools state"
+    long: "--match-tools TOOLSSTATE",
+    description: "match tools state"
 
   option :hostname,
-         long: "--hostname",
-         description: "show hostname of the guest"
+    long: "--hostname",
+    description: "show hostname of the guest"
 
   option :host_name,
-         long: "--host_name",
-         description: "show name of the VMs host"
+    long: "--host_name",
+    description: "show name of the VMs host"
 
   option :os,
-         long: "--os",
-         description: "show os details"
+    long: "--os",
+    description: "show os details"
 
   option :alarms,
-         long: "--alarms",
-         description: "show alarm status"
+    long: "--alarms",
+    description: "show alarm status"
 
   option :tools,
-         long: "--tools",
-         description: "show tools status"
+    long: "--tools",
+    description: "show tools status"
 
   option :full_path,
-         long: "--full-path",
-         description: "Show full folder path to the VM"
+    long: "--full-path",
+    description: "Show full folder path to the VM"
 
   option :short_path,
-         long: "--short-path",
-         description: "Show the VM's enclosing folder name"
+    long: "--short-path",
+    description: "Show the VM's enclosing folder name"
 
   $stdout.sync = true # smoother output from print
 
@@ -241,6 +241,7 @@ class Chef::Knife::VsphereVmFind < Chef::Knife::BaseVsphereCommand
     iterator = vm.obj
     while (iterator = iterator.parent)
       break if iterator.name == VMFOLDER
+
       path.unshift iterator.name
     end
 

data/lib/chef/knife/vsphere_vm_list.rb

@@ -12,14 +12,14 @@ class Chef::Knife::VsphereVmList < Chef::Knife::BaseVsphereCommand
   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",
-         boolean: false
+    long: "--only-folders",
+    description: "List only the folders found",
+    boolean: false
 
   def traverse_folders(folder, is_top = false, recurse = false, only_folders = false)
     if only_folders
@@ -30,11 +30,12 @@ class Chef::Knife::VsphereVmList < Chef::Knife::BaseVsphereCommand
         print_folder(folder)
         vms.each { |v| print_vm(v) }
       elsif is_top
-        puts "#{ui.color('No VMs', :cyan)}"
+        puts "#{ui.color("No VMs", :cyan)}"
       end
     end
 
     return unless recurse
+
     folders = find_all_in_folder(folder, RbVmomi::VIM::Folder)
     folders.each do |child|
       traverse_folders(child, false, recurse, only_folders)
@@ -50,14 +51,14 @@ class Chef::Knife::VsphereVmList < Chef::Knife::BaseVsphereCommand
             when PS_SUSPENDED
               ui.color("suspended", :yellow)
             end
-    puts "\t#{ui.color('VM Name:', :cyan)} #{vm.name}"
-    puts "\t\t#{ui.color('IP:', :magenta)} #{vm.guest.ipAddress}"
-    puts "\t\t#{ui.color('RAM:', :magenta)} #{vm.summary.config.memorySizeMB}"
-    puts "\t\t#{ui.color('State:', :magenta)} #{state}"
+    puts "\t#{ui.color("VM Name:", :cyan)} #{vm.name}"
+    puts "\t\t#{ui.color("IP:", :magenta)} #{vm.guest.ipAddress}"
+    puts "\t\t#{ui.color("RAM:", :magenta)} #{vm.summary.config.memorySizeMB}"
+    puts "\t\t#{ui.color("State:", :magenta)} #{state}"
   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_migrate.rb

@@ -15,20 +15,20 @@ class Chef::Knife::VsphereVmMigrate < Chef::Knife::BaseVsphereCommand
   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"
+    long: "--resource-pool POOL",
+    description: "The resource pool into which to put the VM"
 
   def run
     $stdout.sync = true

data/lib/chef/knife/vsphere_vm_move.rb

@@ -15,27 +15,27 @@ class Chef::Knife::VsphereVmMove < Chef::Knife::BaseVsphereCommand
   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.",
-         boolean: true
+    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.",
-         boolean: true
+    long: "--thick-provision",
+    description: "Indicates whether disk should be thick provisioned.",
+    boolean: true
 
   # Convert VM
   #

data/lib/chef/knife/vsphere_vm_net.rb

@@ -41,7 +41,7 @@ class Chef::Knife::VsphereVmNet < Chef::Knife::BaseVsphereCommand
       backing = a.backing
       key = a.key
 
-      puts "#{ui.color('Setting network adapter', :cyan)} :#{a.deviceInfo.label} on vlan :#{a.deviceInfo.summary} :#{state}"
+      puts "#{ui.color("Setting network adapter", :cyan)} :#{a.deviceInfo.label} on vlan :#{a.deviceInfo.summary} :#{state}"
 
       conninfo = RbVmomi::VIM.VirtualDeviceConnectInfo(startConnected: true,
                                                        allowGuestControl: true,

data/lib/chef/knife/vsphere_vm_network_add.rb

@@ -12,14 +12,14 @@ class Chef::Knife::VsphereVmNetworkAdd < Chef::Knife::BaseVsphereCommand
   banner "knife vsphere vm network add VMNAME NETWORKNAME"
 
   option :adapter_type,
-         long: "--adapter-type STRING",
-         description: "Adapter type eg e1000,vmxnet3",
-         required: true
+    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",
-         required: false
+    long: "--mac-address STRING",
+    description: "Adapter MAC address eg. AA:BB:CC:DD:EE:FF",
+    required: false
 
   common_options
 
@@ -83,8 +83,7 @@ class Chef::Knife::VsphereVmNetworkAdd < Chef::Knife::BaseVsphereCommand
             deviceInfo: { summary: summary, label: "" },
             backing: backing,
             addressType: address_type,
-            macAddress: mac_address
-          ),
+            macAddress: mac_address),
         }],
       }
     ).wait_for_completion

data/lib/chef/knife/vsphere_vm_network_delete.rb

@@ -43,7 +43,7 @@ class Chef::Knife::VsphereVmNetworkDelete < Chef::Knife::BaseVsphereCommand
       )
 
       vm.ReconfigVM_Task(spec: spec).wait_for_completion
-      puts "#{ui.color('NIC', :red)}: #{card.deviceInfo.label} was deleted"
+      puts "#{ui.color("NIC", :red)}: #{card.deviceInfo.label} was deleted"
     end
   end
 end

data/lib/chef/knife/vsphere_vm_property_set.rb

@@ -13,8 +13,8 @@ class Chef::Knife::VsphereVmPropertySet < Chef::Knife::BaseVsphereCommand
   common_options
 
   option :ovf_environment_transport,
-         long: "--ovf-environment-transport STRING",
-         description: "Comma delimited string.  Configures the transports to use for properties. Supported values are: iso and com.vmware.guestInfo."
+    long: "--ovf-environment-transport STRING",
+    description: "Comma delimited string.  Configures the transports to use for properties. Supported values are: iso and com.vmware.guestInfo."
 
   # The main run method for vm_property_set
   #
@@ -69,7 +69,7 @@ class Chef::Knife::VsphereVmPropertySet < Chef::Knife::BaseVsphereCommand
               userConfigurable: true,
               value: property_value,
             }
-          )
+          ),
         ]
       )
     )

data/lib/chef/knife/vsphere_vm_snapshot.rb

@@ -14,56 +14,56 @@ class Chef::Knife::VsphereVmSnapshot < Chef::Knife::BaseVsphereCommand
   common_options
 
   option :list,
-         long: "--list",
-         description: "The current tree of snapshots"
+    long: "--list",
+    description: "The current tree of snapshots"
 
   option :create_new_snapshot,
-         long: "--create SNAPSHOT",
-         description: "Create a new snapshot off of the current snapshot."
+    long: "--create SNAPSHOT",
+    description: "Create a new snapshot off of the current snapshot."
 
   option :remove_named_snapshot,
-         long: "--remove SNAPSHOT",
-         description: "Remove a named snapshot."
+    long: "--remove SNAPSHOT",
+    description: "Remove a named snapshot."
 
   option :revert_snapshot,
-         long: "--revert SNAPSHOT",
-         description: "Revert to a named snapshot."
+    long: "--revert SNAPSHOT",
+    description: "Revert to a named snapshot."
 
   option :revert_current_snapshot,
-         long: "--revert-current",
-         description: "Revert to current snapshot.",
-         boolean: false
+    long: "--revert-current",
+    description: "Revert to current snapshot.",
+    boolean: false
 
   option :power,
-         long: "--start",
-         description: "Indicates whether to start the VM after a successful revert",
-         boolean: false
+    long: "--start",
+    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
+    long: "--wait",
+    description: "Indicates whether to wait for creation/removal to complete",
+    boolean: false
 
   option :find, # imma deprecate this
-         long: "--find",
-         description: "Finds the virtual machine by searching all folders"
+    long: "--find",
+    description: "Finds the virtual machine by searching all folders"
 
   option :dump_memory,
-         long: "--dump-memory",
-         boolean: true,
-         description: "Dump the memory in the snapshot",
-         default: false
+    long: "--dump-memory",
+    boolean: true,
+    description: "Dump the memory in the snapshot",
+    default: false
 
   option :quiesce,
-         long: "--quiesce",
-         boolean: true,
-         description: "Quiesce the VM prior to snapshotting",
-         default: false
+    long: "--quiesce",
+    boolean: true,
+    description: "Quiesce the VM prior to snapshotting",
+    default: false
 
   option :snapshot_description,
-         long: "--snapshot-descr DESCR",
-         description: "Snapshot description",
-         default: ""
+    long: "--snapshot-descr DESCR",
+    description: "Snapshot description",
+    default: ""
 
   def run
     $stdout.sync = true
@@ -114,10 +114,12 @@ class Chef::Knife::VsphereVmSnapshot < Chef::Knife::BaseVsphereCommand
     end
 
     return unless get_config(:revert_snapshot)
+
     ss_name = get_config(:revert_snapshot)
     snapshot = find_node(snapshot_list, ss_name)
     snapshot.RevertToSnapshot_Task(suppressPowerOn: false).wait_for_completion
     return unless get_config(:power)
+
     vm.PowerOnVM_Task.wait_for_completion
     puts "Powered on virtual machine #{vmname}"
   end