esx 0.4.1 → 0.4.2

data/CHANGELOG.md

@@ -8,17 +8,20 @@
 
 * Define a Logger object
 
+```
     ESX::Log.info "foobar"
+```
 
 * Added some debugging with Log.debug
-
 * ESX::Host now has a *templates_dir* attribute and supports uploading and cloning templates:
 
+```
     host = ESX::Host.connect 'my-esx-host', 
                              'root', 
                              'password'
 
     host.import_template "/path/to/template.vmdk"
+```
 
 This will copy the "template.vmdk" file to the default templates_dir in ESX. Default templates dir is "/vmfs/volumes/datastore1/esx-gem/templates".
 
@@ -26,13 +29,18 @@ The template is automatically converted to VMDK thin format.
   
 Using the template:
 
+```
     host.copy_from_template "template.vmdk", "/vmfs/volumes/datastore1/foo.vmdk"
 
+````
+
 Sorter version:
 
+```
     host.import_disk "/path/to/local/template.vmdk",      # local file 
                      "/vmfs/volumes/datastore1/foo.vmdk", # remote path in ESX
                      { :use_template => true }
+```
 
 If the template "template.vmdk" is found, use that. Otherwise import the disk, save it as a template and clone the template to "/vmfs/volumes/datastore1/foo.vmdk"
 

data/Gemfile

@@ -6,8 +6,12 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
+  gem "net-ssh"
+  gem "net-scp"
+  gem "rbvmomi"
+  gem "alchemist"
   gem "rspec", ">= 0"
-  gem "bundler", "~> 1.0.0"
+  gem "bundler", "> 1.0.0"
   gem "jeweler"
   gem "simplecov", ">= 0"
 end

data/Gemfile.lock

@@ -0,0 +1,51 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    alchemist (0.1.3)
+    builder (3.0.0)
+    diff-lcs (1.1.3)
+    git (1.2.5)
+    jeweler (1.8.4)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+      rdoc
+    json (1.7.5)
+    multi_json (1.3.6)
+    net-scp (1.0.4)
+      net-ssh (>= 1.99.1)
+    net-ssh (2.5.2)
+    nokogiri (1.5.5)
+    rake (0.9.2.2)
+    rbvmomi (1.5.1)
+      builder
+      nokogiri (>= 1.4.1)
+      trollop
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.2)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.2)
+    simplecov (0.6.4)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.5.3)
+    simplecov-html (0.5.3)
+    trollop (1.16.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  alchemist
+  bundler (> 1.0.0)
+  jeweler
+  net-scp
+  net-ssh
+  rbvmomi
+  rspec
+  simplecov

data/Rakefile

@@ -12,7 +12,7 @@ Jeweler::Tasks.new do |gem|
   gem.summary = %Q{Simple RbVmomi wrapper library to manage VMWare ESX hosts}
   gem.description = %Q{Manage VMWare ESX hosts with ease}
   gem.email = "rubiojr@frameos.org"
-  gem.authors = ["Sergio Rubio"]
+  gem.authors = ["Sergio Rubio","Massimo Maino"]
   # Include your dependencies below. Runtime dependencies are required when using your gem,
   # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
   gem.add_runtime_dependency 'alchemist'
@@ -22,6 +22,7 @@ Jeweler::Tasks.new do |gem|
   gem.add_runtime_dependency 'net-scp'
   gem.add_runtime_dependency 'clamp'
   gem.files.exclude 'spec/data/*'
+  gem.files.include 'templates/*'
   #  gem.add_development_dependency 'rspec', '> 1.2.3'
 end
 Jeweler::RubygemsDotOrgTasks.new

data/bin/esx

@@ -5,12 +5,14 @@ require 'terminal-table/import'
 require 'clamp'
 require 'net/http'
 require 'fileutils'
+require 'json'
 
 class BaseCommand < Clamp::Command
   parameter "ADDRESS", "ESX host address"
   option "--user", "USER", "Username", :default => "root"
   option "--password", "PASSWORD", "Password", :default => ""
   option "--debug", :flag, "Print debugging info"
+  option "--free-license", :flag, "If your Hypervisor have a free license", :default => false
 end
 
 class InfoCommand < BaseCommand
@@ -22,7 +24,7 @@ class InfoCommand < BaseCommand
   def execute
     begin
 
-      host = ESX::Host.connect(address, user, password)
+      host = ESX::Host.connect(address, user, password, true, {:free_license=>free_license?})
 
       puts
       name = host.name.upcase
@@ -78,9 +80,9 @@ class DestroyVMCommand < BaseCommand
 
   def execute
     begin
-      host = ESX::Host.connect address, user, password
+      host = ESX::Host.connect address, user, password, true, {:free_license=>free_license?}
       host.virtual_machines.each do |vm|
-        if vm.name == vm_name 
+        if vm.name == vm_name
           print "Destroying Virtual Machine '#{vm.name}'..."
           vm.power_off unless vm.power_state == 'poweredOff'
           vm.destroy
@@ -105,7 +107,7 @@ class PowerOffVMCommand < BaseCommand
 
   def execute
     begin
-      host = ESX::Host.connect address, user, password
+      host = ESX::Host.connect address, user, password, true, {:free_license=>free_license?}
       host.virtual_machines.each do |vm|
         if vm.name == vm_name and vm.power_state == 'poweredOn'
           print "Powering Off VM #{vm_name}... "
@@ -131,7 +133,7 @@ class PowerOnVMCommand < BaseCommand
 
   def execute
     begin
-      host = ESX::Host.connect address, user, password
+      host = ESX::Host.connect address, user, password, true, {:free_license=>free_license?}
       host.virtual_machines.each do |vm|
         if vm.name == vm_name and vm.power_state != 'poweredOn'
           print "Powering On VM #{vm_name}... "
@@ -150,6 +152,135 @@ class PowerOnVMCommand < BaseCommand
 
 end
 
+class DeleteNICCommand < BaseCommand
+  parameter "ADDRESS", "ESX host address"
+  option "--vm-name", "VM_NAME", "Virtual Machine"
+  option "--mac-address", "MAC_ADDRESS", "MAC address to remove"
+  option "--force", :flag, "Force reboot"
+
+  def execute
+    begin
+      host = ESX::Host.connect address, user, password, true, {:free_license=>free_license?}
+
+      vm = host.virtual_machines.find{|x| x.name.eql? vm_name}
+      if vm
+        hd=vm.vm_object.config.hardware.device.grep(RbVmomi::VIM::VirtualEthernetCard).find{|nic| nic.props[:macAddress].eql?mac_address}
+        if hd
+          spec = RbVmomi::VIM.VirtualMachineConfigSpec({:deviceChange => [{:operation => :remove,:device => hd}]})
+          unless free_license?
+            vm.vm_object.ReconfigVM_Task(:spec => spec).wait_for_completion
+          else
+            #TODO: This is horrible! Find a way to reconfigure the VM without downtime
+            key = hd.key
+            vmx_file = vm.vm_object.config.files.vmPathName.gsub("[","/vmfs/volumes/").gsub(/]\s*/,"/")
+            puts "VMX file: #{vmx_file}" if debug?
+            eth_name = host.remote_command("fgrep #{mac_address} #{vmx_file} | cut -d. -f1")
+            if eth_name
+              eth_name.strip!
+              puts "#{eth_name} found!" if debug?
+              host.remote_command "sed -i -e '/.*#{eth_name}\..*/d' #{vmx_file}"
+            end
+            if force?
+              vm.power_off
+              host.remote_command "vim-cmd vmsvc/unregister #{vm.vmid}"
+              id = host.remote_command "vim-cmd solo/registervm #{vmx_file}"
+              host.remote_command "vim-cmd vmsvc/power.on #{id}"
+            else
+              puts "You have to power-off the vm unregister it and register it agin."
+            end
+          end
+          puts "Done."
+        else
+          puts "No NIC with #{mac_address} mac address was found!"
+        end
+      else
+        puts "No Virtual Machine found!"
+      end
+    rescue Exception => e
+      $stderr.puts "Can't connect to the host #{address}."
+      if debug?
+        $stderr.puts e.message
+      end
+      exit 1
+    end
+  end
+end
+
+
+class AddNICCommand < BaseCommand
+  parameter "ADDRESS", "ESX host address"
+  option "--vm-name", "VM_NAME", "Virtual Machine"
+  option "--mac-address", "MAC_ADDRESS", "MAC address to add", :default => nil
+  option "--network", "NETWORK", "Network name for new interface"
+  option "--force", :flag, "Force reboot"
+
+  def execute
+    begin
+      host = ESX::Host.connect address, user, password, true, {:free_license=>free_license?}
+      vm = host.virtual_machines.find{|x| x.name.eql? vm_name}
+      if vm
+        hd = vm.vm_object.config.hardware.device.grep(RbVmomi::VIM::VirtualEthernetCard).find{|nic| nic.props[:macAddress].eql?mac_address}
+        s = vm.vm_object.config.hardware.device.grep(RbVmomi::VIM::VirtualEthernetCard).size
+        if hd
+          puts "NIC with #{mac_address} mac address already exists!"
+        else
+          if mac_address
+            nics = {:macAddress => mac_address, :addressType => 'manual'}
+          else
+            nics = {:addressType => 'generated'}
+          end
+          spec = RbVmomi::VIM.VirtualMachineConfigSpec({:deviceChange => [{
+            :operation => :add,
+            :device => RbVmomi::VIM.VirtualE1000({
+              :key => s,
+              :deviceInfo => {
+                :label => "Network Adapter #{s}",
+                :summary => network || 'VM Network'
+              },
+              :backing => RbVmomi::VIM.VirtualEthernetCardNetworkBackingInfo(
+                :deviceName => network || 'VM Network'
+              )
+            }.merge(nics))
+          }]})
+          unless free_license?
+            vm.vm_object.ReconfigVM_Task(:spec => spec).wait_for_completion
+          else
+            #TODO: This is horrible! Find a way to reconfigure the VM without downtime
+            vmx_file = vm.vm_object.config.files.vmPathName.gsub("[","/vmfs/volumes/").gsub(/]\s*/,"/")
+            puts "VMX file: #{vmx_file}" if debug?
+            host.remote_command " echo 'ethernet#{s}.present = \"true\"' >> #{vmx_file}"
+            host.remote_command " echo 'ethernet#{s}.virtualDev = \"e1000\"' >> #{vmx_file}"
+            host.remote_command " echo 'ethernet#{s}.wakeOnPcktRcv = \"false\"' >> #{vmx_file}"
+            host.remote_command " echo 'ethernet#{s}.networkName = \"#{network || 'VM Network'}\"' >> #{vmx_file}"
+            if mac_address
+              host.remote_command " echo 'ethernet#{s}.addressType = \"static\"' >> #{vmx_file}"
+              host.remote_command " echo 'ethernet#{s}.address = \"#{mac_address}\"' >> #{vmx_file}"
+            else
+              host.remote_command " echo 'ethernet#{s}.addressType = \"generated\"' >> #{vmx_file}"
+            end
+            if force?
+              vm.power_off
+              host.remote_command "vim-cmd vmsvc/unregister #{vm.vmid}"
+              id = host.remote_command "vim-cmd solo/registervm #{vmx_file}"
+              host.remote_command "vim-cmd vmsvc/power.on #{id}"
+            else
+              puts "You have to power-off the vm unregister it and register it agin."
+            end
+          end
+          puts "Done."
+        end
+      else
+        puts "No Virtual Machine found!"
+      end
+    rescue Exception => e
+      $stderr.puts "Can't connect to the host #{address}."
+      if debug?
+        $stderr.puts e.message
+      end
+      exit 1
+    end
+  end
+end
 
 class CreateVMCommand < BaseCommand
 
@@ -167,7 +298,7 @@ class CreateVMCommand < BaseCommand
 
   def execute
     begin
-      host = ESX::Host.connect address, user, password
+      host = ESX::Host.connect address, user, password, true, {:free_license=>free_license?}
     rescue Exception => e
       $stderr.puts "Can't connect to the host #{address}."
       if debug?
@@ -181,7 +312,7 @@ class CreateVMCommand < BaseCommand
     downloaded_file = nil
     if disk_file.nil?
       # if --disk-file nil? create the VM without disk
-      vm = host.create_vm :vm_name => name, 
+      vm = host.create_vm :vm_name => name,
                           :datastore => datastore, :disk_type => :flat, :memory => memory,
                           :disk_size => disk_size,
                           :guest_id => guest_id, :nics => [{:mac_address => mac_address, :network => vm_network}]
@@ -196,7 +327,7 @@ class CreateVMCommand < BaseCommand
           puts
           df = tmpfile
         rescue Exception => e
-          FileUtils.rm_f(tmpfile) 
+          FileUtils.rm_f(tmpfile)
           $stderr.puts "Error downloading file from #{downloaded_file}."
           $stderr.puts e.message if debug?
           exit 1
@@ -220,10 +351,10 @@ class CreateVMCommand < BaseCommand
 
       if not downloaded_file.nil?
         puts "Deleting tmp file #{df}" if debug?
-        FileUtils.rm_f(df) 
+        FileUtils.rm_f(df)
       end
-      vm = host.create_vm :vm_name => name, 
-                          :disk_file => "#{name}/#{name}.vmdk", 
+      vm = host.create_vm :vm_name => name,
+                          :disk_file => "#{name}/#{name}.vmdk",
                           :datastore => datastore, :disk_type => :flat, :memory => memory,
                           :guest_id => guest_id, :nics => [{mac_address => mac_address, :network => vm_network}]
     end
@@ -233,7 +364,7 @@ class CreateVMCommand < BaseCommand
   end
 
   def report_progress(progress, total, show_parts=true)
-    line_reset = "\r\e[0K" 
+    line_reset = "\r\e[0K"
     percent = (progress.to_f / total.to_f) * 100
     line = "Progress: #{percent.to_i}%"
     line << " (#{progress} / #{total})" if show_parts
@@ -284,11 +415,14 @@ class CreateVMCommand < BaseCommand
 end
 
 class DefaultCommand < Clamp::Command
-  default_subcommand "info", "Display host info", InfoCommand
+  self.default_subcommand="info"
+  subcommand "info", "Display host info", InfoCommand
   subcommand "create-vm", "Create a VM", CreateVMCommand
   subcommand "poweron-vm", "Power On a VM", PowerOnVMCommand
   subcommand "poweroff-vm", "Power Off a VM", PowerOffVMCommand
   subcommand "destroy-vm", "Destroy VM", DestroyVMCommand
+  subcommand "add-nic", "Add NIC to a VM", AddNICCommand
+  subcommand "delete-nic", "Delete NIC from a VM", DeleteNICCommand
 end
 
 begin

data/lib/esx.rb

@@ -3,11 +3,12 @@ require 'rbvmomi'
 require 'alchemist'
 require 'net/scp'
 require 'net/ssh'
+require 'erb'
 
 module ESX
 
-  VERSION = '0.4.1'
-  
+  VERSION = '0.4.2'
+
   if !defined? Log or Log.nil?
     Log = Logger.new($stdout)
     Log.formatter = proc do |severity, datetime, progname, msg|
@@ -20,7 +21,7 @@ module ESX
 
   class Host
 
-    attr_reader :address, :user, :password
+    attr_reader :address, :user, :password, :free_license
     attr_accessor :templates_dir
 
     def initialize(address, user, password, opts = {})
@@ -28,6 +29,10 @@ module ESX
       @password = password
       @user = user
       @templates_dir = opts[:templates_dir] || "/vmfs/volumes/datastore1/esx-gem/templates"
+      @free_license = opts[:free_license] || false
+      if @free_license and !@user.eql?"root"
+        raise Exception.new("Can't use Free License mode with user #{@user}. Please use 'root' user.")
+      end
     end
 
     # Connect to a ESX host
@@ -35,9 +40,9 @@ module ESX
     # Requires hostname/ip, username and password
     #
     # Host connection is insecure by default
-    def self.connect(host, user, password, insecure=true)
+   def self.connect(host, user, password,  insecure = true, opts = {})
       vim = RbVmomi::VIM.connect :host => host, :user => user, :password => password, :insecure => insecure
-      host = Host.new(host, user,password)
+      host = Host.new(host, user,password, opts)
       host.vim = vim
       host
     end
@@ -77,16 +82,16 @@ module ESX
     def power_state
       @_host.summary.runtime.powerState
     end
-    
-    # Host memory usage in bytes 
-    # 
+
+    # Host memory usage in bytes
+    #
     # returns a Fixnum
     #
     def memory_usage
       @_host.summary.quickStats.overallMemoryUsage * 1024 * 1024
     end
 
-    
+
     # Return a list of ESX::Datastore objects available in this host
     #
     def datastores
@@ -98,7 +103,7 @@ module ESX
     end
 
     # Create a Virtual Machine
-    # 
+    #
     # Requires a Hash with the following keys:
     #
     # {
@@ -112,7 +117,7 @@ module ESX
     #   :disk_type => flat, sparse (default flat)
     # }
     #
-    # supported guest_id list: 
+    # supported guest_id list:
     # http://pubs.vmware.com/vsphere-50/index.jsp?topic=/com.vmware.wssdk.apiref.doc_50/vim.vm.GuestOsDescriptor.GuestOsIdentifier.html
     #
     # Default values above.
@@ -153,7 +158,7 @@ module ESX
           }
         ]
       }
-      
+
       #Add multiple nics
       nics_count = 0
       if spec[:nics]
@@ -162,19 +167,35 @@ module ESX
             {
               :operation => :add,
               :device => RbVmomi::VIM.VirtualE1000(create_net_dev(nics_count, nic_spec))
-              
+
             }
           )
           nics_count += 1
         end
       end
       # VMDK provided, replace the empty vmdk
-      vm_cfg[:deviceChange].push(create_disk_spec(:disk_file => spec[:disk_file], 
+      vm_cfg[:deviceChange].push(create_disk_spec(:disk_file => spec[:disk_file],
                                 :disk_type => spec[:disk_type],
                                 :disk_size => spec[:disk_size],
                                 :datastore => spec[:datastore]))
 
-      VM.wrap(@_datacenter.vmFolder.CreateVM_Task(:config => vm_cfg, :pool => @_datacenter.hostFolder.children.first.resourcePool).wait_for_completion)
+      unless @free_license
+        VM.wrap(@_datacenter.vmFolder.CreateVM_Task(:config => vm_cfg, :pool => @_datacenter.hostFolder.children.first.resourcePool).wait_for_completion,self)
+      else
+        gem_root = Gem::Specification.find_by_name("esx").gem_dir
+        template_path = File.join(gem_root, 'templates', 'vmx_template.erb')
+        erb = ERB.new File.read(template_path)
+        vmx = erb.result binding
+        tmp_vmx = Tempfile.new 'vmx'
+        tmp_vmx.write vmx
+        tmp_vmx.close
+        ds = spec[:datastore]||'datastore1'
+        ds = ds.gsub('[','').gsub(']','')
+        vmx_path = "/vmfs/volumes/#{ds}/#{spec[:vm_name]}/#{spec[:vm_name]}.vmx"
+        upload_file tmp_vmx.path, vmx_path
+        remote_command "vim-cmd solo/registervm #{vmx_path}"
+        VM.wrap(@_datacenter.find_vm(spec[:vm_name]),self)
+      end
     end
 
     def create_net_dev(nic_id, spec)
@@ -199,10 +220,10 @@ module ESX
     end
 
     # Return product info as an array of strings containing
-    # 
+    #
     # fullName, apiType, apiVersion, osType, productLineId, vendor, version
-    # 
-    def host_info 
+    #
+    def host_info
       [
        @_host.summary.config.product.fullName,
        @_host.summary.config.product.apiType,
@@ -215,11 +236,11 @@ module ESX
     end
 
     # Return a list of VM available in the inventory
-    # 
+    #
     def virtual_machines
       vms = []
-      vm = @_datacenter.vmFolder.childEntity.each do |x| 
-        vms << VM.wrap(x)
+      vm = @_datacenter.vmFolder.childEntity.each do |x|
+        vms << VM.wrap(x,self)
       end
       vms
     end
@@ -283,8 +304,8 @@ module ESX
       Net::SSH.start(@address, @user, :password => @password) do |ssh|
         if (ssh.exec! "ls #{template} 2>/dev/null").nil?
           Log.error "Template #{template_disk} does not exist"
-          raise "Template does not exist" 
-        end 
+          raise "Template does not exist"
+        end
         ssh.exec!("rm -f #{template} && rm -f #{template_flat} 2>&1")
       end
     end
@@ -296,7 +317,7 @@ module ESX
       return dest_file if template_exist?(dest_file)
       Net::SSH.start(@address, @user, :password => @password) do |ssh|
         if (ssh.exec! "ls -la #{@templates_dir} 2>/dev/null").nil?
-          # Create template dir 
+          # Create template dir
           Log.debug "Creating templates dir #{@templates_dir}"
           ssh.exec "mkdir -p #{@templates_dir}"
         end
@@ -326,7 +347,7 @@ module ESX
     #
     # if params has :use_template => true, the disk is saved as a template in
     # @templates_dir and cloned from there.
-    # 
+    #
     # Destination directory must exist otherwise rises exception
     #
     def import_disk(source, destination, print_progress = false, params = {})
@@ -367,7 +388,11 @@ module ESX
         end
       end
     end
-    
+
+    def datacenter
+      @_datacenter
+    end
+
     private
     #
     # disk_file
@@ -385,7 +410,7 @@ module ESX
       datastore = params[:datastore]
       datastore = datastore + " #{disk_file}" if not disk_file.nil?
       spec = {}
-      if disk_type == :sparse 
+      if disk_type == :sparse
         spec = {
           :operation => :add,
           :device => RbVmomi::VIM.VirtualDisk(
@@ -417,52 +442,71 @@ module ESX
 
   class VM
 
-    attr_accessor :memory_size, :cpus, :ethernet_cards_number
-    attr_accessor :name, :virtual_disks_number, :vm_object
+    attr_accessor :memory_size, :cpus, :ethernet_cards_number, :vmid
+    attr_accessor :name, :virtual_disks_number, :vm_object, :host
 
     # Wraps a RbVmomi::VirtualMachine object
     #
     # **This method should never be called manually.**
     #
-    def self.wrap(vm)
+    def self.wrap(vm,host)
       _vm = VM.new
       _vm.name = vm.name
       ## HACK: for some reason vm.summary.config.memorySizeMB returns nil
       # under some conditions
       _vm.memory_size = vm.summary.config.memorySizeMB*1024*1024 rescue 0
       _vm.cpus = vm.summary.config.numCpu
-      _vm.ethernet_cards_number = vm.summary.config.numEthernetCards 
+      _vm.ethernet_cards_number = vm.summary.config.numEthernetCards
       _vm.virtual_disks_number = vm.summary.config.numVirtualDisks
       _vm.vm_object = vm
+      _vm.host = host
+      _vm.vmid = vm.to_s.scan(/\"([0-9]+)\"/).flatten.first
       _vm
     end
 
     # Returns the state of the VM as a string
     # 'poweredOff', 'poweredOn'
-    # 
+    #
     def power_state
       vm_object.summary.runtime.powerState
     end
 
     # Power On a VM
     def power_on
-      vm_object.PowerOnVM_Task.wait_for_completion
+      unless host.free_license
+        vm_object.PowerOnVM_Task.wait_for_completion
+      else
+        host.remote_command "vim-cmd vmsvc/power.on #{vmid}"
+      end
     end
 
     # Power Off a VM
     def power_off
-      vm_object.PowerOffVM_Task.wait_for_completion
+      unless host.free_license
+        vm_object.PowerOffVM_Task.wait_for_completion
+      else
+        host.remote_command "vim-cmd vmsvc/power.off #{vmid}"
+      end
     end
 
     # Destroy the VirtualMaching removing it from the inventory
     # and deleting the disk files
     def destroy
       #disks = vm_object.config.hardware.device.grep(RbVmomi::VIM::VirtualDisk)
-      vm_object.Destroy_Task.wait_for_completion
+      unless host.free_license
+        vm_object.Destroy_Task.wait_for_completion
+      else
+        host.remote_command "vim-cmd vmsvc/power.off #{vmid}"
+        host.remote_command "vim-cmd vmsvc/destroy #{vmid}"
+      end
     end
 
     def reset
-      vm_object.ResetVM_Task.wait_for_completion
+      unless host.free_license
+        vm_object.ResetVM_Task.wait_for_completion
+      else
+        host.remote_command "vim-cmd vmsvc/power.reset #{vmid}"
+      end
     end
 
     def guest_info
@@ -487,7 +531,7 @@ module ESX
   end
 
   class NetworkInterface
-    
+
     attr_accessor :_wrapped_object
 
     # Accepts VirtualEthernetCard and GuestNicInfo objects
@@ -509,7 +553,7 @@ module ESX
     end
 
     def mac
-      _wrapped_object.macAddress 
+      _wrapped_object.macAddress
     end
 
   end
@@ -527,7 +571,7 @@ module ESX
     def ip_address
       _wrapped_object.ipAddress
     end
-    
+
     def nics
       n = []
       _wrapped_object.net.each do |nic|

data/templates/vmx_template.erb

@@ -0,0 +1,27 @@
+.encoding = "UTF-8"
+config.version = "8"
+virtualHW.version = "7"
+vmci0.present = "true"
+displayName = "<%= spec[:vm_name] %>"
+numvcpus = "<%= spec[:cpus] %>"
+memsize = "<%= spec[:memory] %>"
+scsi0.present = "true"
+scsi0.sharedBus = "none"
+scsi0.virtualDev = "lsilogic"
+scsi0:0.present = "true"
+scsi0:0.fileName = "<%= spec[:disk_file].split("/").last %>"
+scsi0:0.deviceType = "scsi-hardDisk"
+guestOS = <%= spec[:guest_id] %>
+floppy0.present = "FALSE"
+<% spec[:nics].each_with_index do |nic,index| %>
+ethernet<%= index %>.present = "true"
+ethernet<%= index %>.virtualDev = "e1000"
+ethernet<%= index %>.wakeOnPcktRcv = "false"
+ethernet<%= index %>.networkName = "<%= nic[:network] %>"
+<% if nic[:mac_address] %>
+ethernet<%= index %>.addressType = "static"
+ethernet<%= index %>.address = "<%= nic[:mac_address] %>"
+<% else %>
+ethernet<%= index %>.addressType = "generated"
+<% end %>
+<% end %>

metadata

@@ -1,19 +1,84 @@
 --- !ruby/object:Gem::Specification
 name: esx
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
 - Sergio Rubio
+- Massimo Maino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-26 00:00:00.000000000 Z
+date: 2012-12-08 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: net-ssh
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: net-scp
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rbvmomi
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: alchemist
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &13782400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +86,31 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13782400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &13797440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>'
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *13797440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &13795980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +118,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13795980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &13793800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +134,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13793800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: alchemist
-  requirement: &13791580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +150,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13791580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rbvmomi
-  requirement: &13790180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +166,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13790180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: terminal-table
-  requirement: &13805300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +182,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13805300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &13803800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +198,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13803800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: net-scp
-  requirement: &13802480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +214,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13802480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: clamp
-  requirement: &13800940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +230,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13800940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Manage VMWare ESX hosts with ease
 email: rubiojr@frameos.org
 executables:
@@ -133,6 +248,7 @@ files:
 - .document
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -142,6 +258,7 @@ files:
 - spec/spec_helper.rb
 - spec/unit/host_spec.rb
 - spec/unit/vm_spec.rb
+- templates/vmx_template.erb
 homepage: http://github.com/rubiojr/esx
 licenses:
 - MIT
@@ -163,7 +280,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Simple RbVmomi wrapper library to manage VMWare ESX hosts