knife-vsphere 1.0.0.pre.2 → 1.0.0.pre.3

data/lib/chef/knife/vsphere_vm_config.rb

@@ -1,46 +1,46 @@
-# 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::VsphereVmConfig < Chef::Knife::BaseVsphereCommand
-  banner "knife vsphere vm config VMNAME PROPERTY VALUE.  See \"http://pubs.vmware.com/vi3/sdk/ReferenceGuide/vim.vm.ConfigSpec.html\" for allowed ATTRIBUTE values (any property of type xs:string is supported)."
-
-  get_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
-
-    property_name = @name_args[1]
-    if property_name.nil?
-      show_usage
-      fatal_exit("You must specify a PROPERTY name (e.g. annotation)")
-    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 = get_vim_connection
-
-    dc = get_datacenter
-    folder = find_folder(get_config(:folder)) || dc.vmFolder
-
-    vm = traverse_folders_for_vm(folder, vmname) or abort "VM #{vmname} not found"
-
-    properties = {}
-    properties[property_name] = property_value
-    vm.ReconfigVM_Task(:spec => RbVmomi::VIM.VirtualMachineConfigSpec(properties)).wait_for_completion
-  end
-end
+# 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::VsphereVmConfig < Chef::Knife::BaseVsphereCommand
+  banner "knife vsphere vm config VMNAME PROPERTY VALUE.  See \"http://pubs.vmware.com/vi3/sdk/ReferenceGuide/vim.vm.ConfigSpec.html\" for allowed ATTRIBUTE values (any property of type xs:string is supported)."
+
+  get_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
+
+    property_name = @name_args[1]
+    if property_name.nil?
+      show_usage
+      fatal_exit("You must specify a PROPERTY name (e.g. annotation)")
+    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 = get_vim_connection
+
+    dc = get_datacenter
+    folder = find_folder(get_config(:folder)) || dc.vmFolder
+
+    vm = traverse_folders_for_vm(folder, vmname) or abort "VM #{vmname} not found"
+
+    properties = {}
+    properties[property_name] = property_value
+    vm.ReconfigVM_Task(:spec => RbVmomi::VIM.VirtualMachineConfigSpec(properties)).wait_for_completion
+  end
+end

data/lib/chef/knife/vsphere_vm_execute.rb

@@ -1,66 +1,66 @@
-# Author:: Ian Delahorne (<ian@delahorne.com>)
-# License:: Apache License, Version 2.0
-
-require 'chef/knife'
-require 'chef/knife/base_vsphere_command'
-require 'rbvmomi'
-require 'netaddr'
-
-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
-
-  option :exec_passwd,
-         :long => "--exec-passwd PASSWORD",
-         :description => "Password for execute user",
-         :required => true
-
-  option :exec_dir,
-         :long => "--exec-dir DIRECTORY",
-         :description => "Working directory to execute in"
-
-  get_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
-    command = @name_args[1]
-    if command.nil?
-      show_usage
-      fatal_exit("You must specify a command to execute")
-    end
-
-    args = @name_args[2]
-    if args.nil?
-      args = ""
-    end
-
-    vim = get_vim_connection
-
-    dc = get_datacenter
-    folder = find_folder(get_config(:folder)) || dc.vmFolder
-
-    vm = find_in_folder(folder, RbVmomi::VIM::VirtualMachine, vmname) or
-        abort "VM #{vmname} not found"
-
-    gom = vim.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,
-                                               :workingDirectory => get_config(:exec_dir))
-
-    gom.processManager.StartProgramInGuest(:vm => vm, :auth => guest_auth, :spec => prog_spec)
-
-  end
-end
+# Author:: Ian Delahorne (<ian@delahorne.com>)
+# License:: Apache License, Version 2.0
+
+require 'chef/knife'
+require 'chef/knife/base_vsphere_command'
+require 'rbvmomi'
+require 'netaddr'
+
+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
+
+  option :exec_passwd,
+         :long => "--exec-passwd PASSWORD",
+         :description => "Password for execute user",
+         :required => true
+
+  option :exec_dir,
+         :long => "--exec-dir DIRECTORY",
+         :description => "Working directory to execute in"
+
+  get_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
+    command = @name_args[1]
+    if command.nil?
+      show_usage
+      fatal_exit("You must specify a command to execute")
+    end
+
+    args = @name_args[2]
+    if args.nil?
+      args = ""
+    end
+
+    vim = get_vim_connection
+
+    dc = get_datacenter
+    folder = find_folder(get_config(:folder)) || dc.vmFolder
+
+    vm = find_in_folder(folder, RbVmomi::VIM::VirtualMachine, vmname) or
+        abort "VM #{vmname} not found"
+
+    gom = vim.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,
+                                               :workingDirectory => get_config(:exec_dir))
+
+    gom.processManager.StartProgramInGuest(:vm => vm, :auth => guest_auth, :spec => prog_spec)
+
+  end
+end

data/lib/chef/knife/vsphere_vm_markastemplate.rb

@@ -1,54 +1,54 @@
-#
-# Author:: Ezra Pagel (<ezra@cpan.org>)
-# Contributor:: Jesse Campbell (<hikeit@gmail.com>)
-# Contributor:: Bethany Erskine (<bethany@paperlesspost.com>)
-# Contributor:: Adrian Stanila (https://github.com/sacx)
-# License:: Apache License, Version 2.0
-#
-
-require 'chef/knife'
-require 'chef/knife/base_vsphere_command'
-require 'rbvmomi'
-
-# Clone an existing template into a new VM, optionally applying a customization specification.
-# usage:
-# knife vsphere vm markastemplate MyVM --folder /templates
-class Chef::Knife::VsphereVmMarkastemplate < Chef::Knife::BaseVsphereCommand
-
-  banner "knife vsphere vm markastemplate VMNAME"
-
-  get_common_options
-
-  option :folder,
-         :long => "--folder FOLDER",
-         :description => "The folder which contains 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")
-    end
-    config[:chef_node_name] = vmname unless config[:chef_node_name]
-    config[:vmname] = vmname
-
-    if get_config(:bootstrap) && get_config(:distro) && !@@chef_config_dir
-      fatal_exit("Can't find .chef for bootstrap files. chdir to a location with a .chef directory and try again")
-    end
-
-    vim = get_vim_connection
-
-    dc = get_datacenter
-
-    src_folder = find_folder(get_config(:folder)) || dc.vmFolder
-
-    vm = find_in_folder(src_folder, RbVmomi::VIM::VirtualMachine, config[:vmname]) or
-        abort "VM not found"
-
-    puts "Marking VM #{vmname} as template"
-    vm.MarkAsTemplate()
-    puts "Finished marking VM #{vmname} as template"
-  end
-end
+#
+# Author:: Ezra Pagel (<ezra@cpan.org>)
+# Contributor:: Jesse Campbell (<hikeit@gmail.com>)
+# Contributor:: Bethany Erskine (<bethany@paperlesspost.com>)
+# Contributor:: Adrian Stanila (https://github.com/sacx)
+# License:: Apache License, Version 2.0
+#
+
+require 'chef/knife'
+require 'chef/knife/base_vsphere_command'
+require 'rbvmomi'
+
+# Clone an existing template into a new VM, optionally applying a customization specification.
+# usage:
+# knife vsphere vm markastemplate MyVM --folder /templates
+class Chef::Knife::VsphereVmMarkastemplate < Chef::Knife::BaseVsphereCommand
+
+  banner "knife vsphere vm markastemplate VMNAME"
+
+  get_common_options
+
+  option :folder,
+         :long => "--folder FOLDER",
+         :description => "The folder which contains 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")
+    end
+    config[:chef_node_name] = vmname unless config[:chef_node_name]
+    config[:vmname] = vmname
+
+    if get_config(:bootstrap) && get_config(:distro) && !@@chef_config_dir
+      fatal_exit("Can't find .chef for bootstrap files. chdir to a location with a .chef directory and try again")
+    end
+
+    vim = get_vim_connection
+
+    dc = get_datacenter
+
+    src_folder = find_folder(get_config(:folder)) || dc.vmFolder
+
+    vm = find_in_folder(src_folder, RbVmomi::VIM::VirtualMachine, config[:vmname]) or
+        abort "VM not found"
+
+    puts "Marking VM #{vmname} as template"
+    vm.MarkAsTemplate()
+    puts "Finished marking VM #{vmname} as template"
+  end
+end

data/lib/chef/knife/vsphere_vm_property_get.rb

@@ -1,46 +1,46 @@
-# 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::VsphereVmPropertyGet < Chef::Knife::BaseVsphereCommand
-  banner "knife vsphere vm property get VMNAME PROPERTY.  Gets a vApp Property on VMNAME."
-
-  get_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
-
-    property_name = @name_args[1]
-    if property_name.nil?
-      show_usage
-      fatal_exit("You must specify a PROPERTY name (e.g. annotation)")
-    end
-    property_name = property_name.to_sym
-
-    vim = get_vim_connection
-
-    dc = get_datacenter
-    folder = find_folder(get_config(:folder)) || dc.vmFolder
-
-    vm = find_in_folder(folder, RbVmomi::VIM::VirtualMachine, vmname) or
-        abort "VM #{vmname} not found"
-
-    existing_property = vm.config.vAppConfig.property.find { |p| p.props[:id] == property_name.to_s  }
-
-    if existing_property
-      puts existing_property.props[:value]
-    else
-      fatal_exit("PROPERTY [#{property_name.to_s}] not found")
-    end
-
-  end
-end
+# 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::VsphereVmPropertyGet < Chef::Knife::BaseVsphereCommand
+  banner "knife vsphere vm property get VMNAME PROPERTY.  Gets a vApp Property on VMNAME."
+
+  get_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
+
+    property_name = @name_args[1]
+    if property_name.nil?
+      show_usage
+      fatal_exit("You must specify a PROPERTY name (e.g. annotation)")
+    end
+    property_name = property_name.to_sym
+
+    vim = get_vim_connection
+
+    dc = get_datacenter
+    folder = find_folder(get_config(:folder)) || dc.vmFolder
+
+    vm = find_in_folder(folder, RbVmomi::VIM::VirtualMachine, vmname) or
+        abort "VM #{vmname} not found"
+
+    existing_property = vm.config.vAppConfig.property.find { |p| p.props[:id] == property_name.to_s  }
+
+    if existing_property
+      puts existing_property.props[:value]
+    else
+      fatal_exit("PROPERTY [#{property_name.to_s}] not found")
+    end
+
+  end
+end

data/lib/chef/knife/vsphere_vm_property_set.rb

@@ -1,84 +1,84 @@
-# 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::VsphereVmPropertySet < Chef::Knife::BaseVsphereCommand
-  banner "knife vsphere vm property set VMNAME PROPERTY VALUE.  Sets a vApp Property on VMNAME."
-
-  get_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."
-
-  def run
-    $stdout.sync = true
-    vmname = @name_args[0]
-    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)")
-    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 = get_vim_connection
-
-    dc = get_datacenter
-    folder = find_folder(get_config(:folder)) || dc.vmFolder
-
-    vm = find_in_folder(folder, RbVmomi::VIM::VirtualMachine, vmname) or
-        abort "VM #{vmname} not found"
-
-    if vm.config.vAppConfig && vm.config.vAppConfig.property
-      existing_property = vm.config.vAppConfig.property.find { |p| p.props[:id] == property_name.to_s  }
-    end
-
-    if existing_property
-      operation = 'edit'
-      property_key = existing_property.props[:key]
-    else
-      operation = 'add'
-      property_key = property_name.object_id
-    end
-
-    vm_config_spec = RbVmomi::VIM.VirtualMachineConfigSpec(
-      :vAppConfig => RbVmomi::VIM.VmConfigSpec(
-        :property => [
-          RbVmomi::VIM.VAppPropertySpec(
-            :operation => operation,
-            :info => {
-              :key => property_key,
-              :id => property_name.to_s,
-              :type => 'string',
-              :userConfigurable => true,
-              :value => property_value
-            }
-          )
-        ]
-      )
-    )
-
-    unless config[:ovf_environment_transport].nil?
-      transport = config[:ovf_environment_transport].split(",")
-      transport = [""] if transport == [] ## because "".split returns [] and vmware wants [""]
-      vm_config_spec[:vAppConfig][:ovfEnvironmentTransport] = transport
-    end
-
-    vm.ReconfigVM_Task( :spec => vm_config_spec ).wait_for_completion
-  end
-end
+# 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::VsphereVmPropertySet < Chef::Knife::BaseVsphereCommand
+  banner "knife vsphere vm property set VMNAME PROPERTY VALUE.  Sets a vApp Property on VMNAME."
+
+  get_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."
+
+  def run
+    $stdout.sync = true
+    vmname = @name_args[0]
+    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)")
+    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 = get_vim_connection
+
+    dc = get_datacenter
+    folder = find_folder(get_config(:folder)) || dc.vmFolder
+
+    vm = find_in_folder(folder, RbVmomi::VIM::VirtualMachine, vmname) or
+        abort "VM #{vmname} not found"
+
+    if vm.config.vAppConfig && vm.config.vAppConfig.property
+      existing_property = vm.config.vAppConfig.property.find { |p| p.props[:id] == property_name.to_s  }
+    end
+
+    if existing_property
+      operation = 'edit'
+      property_key = existing_property.props[:key]
+    else
+      operation = 'add'
+      property_key = property_name.object_id
+    end
+
+    vm_config_spec = RbVmomi::VIM.VirtualMachineConfigSpec(
+      :vAppConfig => RbVmomi::VIM.VmConfigSpec(
+        :property => [
+          RbVmomi::VIM.VAppPropertySpec(
+            :operation => operation,
+            :info => {
+              :key => property_key,
+              :id => property_name.to_s,
+              :type => 'string',
+              :userConfigurable => true,
+              :value => property_value
+            }
+          )
+        ]
+      )
+    )
+
+    unless config[:ovf_environment_transport].nil?
+      transport = config[:ovf_environment_transport].split(",")
+      transport = [""] if transport == [] ## because "".split returns [] and vmware wants [""]
+      vm_config_spec[:vAppConfig][:ovfEnvironmentTransport] = transport
+    end
+
+    vm.ReconfigVM_Task( :spec => vm_config_spec ).wait_for_completion
+  end
+end