instalatron 0.1.3 → 0.1.4

data/README.md

@@ -1,4 +1,4 @@
 Requirements:
 
-VirtualBox 4.0.8
+VirtualBox >= 4.0.8
 ImageMagick >=  6.6.4

data/bin/instalatron-play

@@ -3,6 +3,7 @@ require 'fileutils'
 require 'instalatron'
 require 'yaml'
 require 'mixlib/cli'
+require 'logger'
 
 def play_session(vm_name, script, custom_seq = nil, key_press_delay = 0)
   ctrlc_gap = 0
@@ -90,7 +91,21 @@ class MyCLI
     :long => "--key-press-delay SECS",
     :description => "Delay between key presses",
     :default => 0
-
+  
+  option :nic_config,
+    :long => "--nic-config CFG",
+    :description => "VM NIC config (nic:device:mode)"
+
+  option :vm_memory,
+    :long => "--vm-memory MEM",
+    :description => "VM Memory",
+    :default => 512
+  
+  option :vm_disk_size,
+    :long => "--vm-disk-size SIZE",
+    :description => "VM Disk Size in MB",
+    :default => 10024
+  
   option :help,
     :short => "-h",
     :long => "--help",
@@ -102,6 +117,8 @@ class MyCLI
 
 end
 
+Log = Logger.new($stdout)
+
 cli = MyCLI.new
 cli.parse_options
 
@@ -125,11 +142,20 @@ if not File.exist?(iso_file)
 end
 
 # Create VBox VM first
-Instalatron.create_vm :vm_name => vm_name, :iso_file => iso_file, :headless => cli.config[:headless]
-
+  
+Log.debug "Creating VM #{vm_name}"
+Instalatron.create_vm :vm_disk_size => cli.config[:vm_disk_size], :vm_memory => cli.config[:vm_memory], :vm_name => vm_name, :iso_file => iso_file, :headless => cli.config[:headless]
+
+nic_config = cli.config[:nic_config]
+if nic_config
+  nic, device, mode = nic_config.split ':'
+  Log.debug "Setting nic mode #{nic} #{device} #{mode}"
+  Instalatron.set_nic_mode(vm_name, nic, device, mode)
+end
 puts "Playing script using VM #{vm_name}\n\n"
 play_session vm_name, script, cli.config[:custom_sequence], cli.config[:key_press_delay]
 
+
 if cli.config[:destroy_vm]
   puts "Unregistering and deleting VM #{vm_name}"
   Instalatron.destroy_vm(vm_name)

data/bin/instalatron-record

@@ -1,7 +1,9 @@
 #!/usr/bin/env ruby
+require 'rubygems'
 require 'fileutils'
 require 'instalatron'
 require 'yaml'
+require 'mixlib/cli'
 
 def record_session(vm_name, session_name = "instalatron_rec_" + Time.now.strftime("%F_%H%M"))
   puts "Recording session #{session_name}\n\n"
@@ -47,19 +49,75 @@ def record_session(vm_name, session_name = "instalatron_rec_" + Time.now.strftim
   end
 end
 
-vm_name = ARGV[0]
-running_vms = []
-`VBoxManage list runningvms`.each_line do |l|
-  vm = l.split[0].gsub('"', '')
-  running_vms << vm
+class MyCLI
+  include Mixlib::CLI
+
+  option :vm_name,
+    :short => "-n NAME",
+    :long => "--vm-name NAME",
+    :description => "Virtual Machine Name",
+    :default => "instalatron_#{Time.now.strftime('%s')}"
+ 
+  option :iso_file,
+    :short => "-i ISO",
+    :long => "--iso-file ISO",
+    :description => "ISO file to boot the VM with"
+  
+  option :destroy_vm,
+    :long => "--destroy-vm",
+    :description => "Destroy the VM after running the tests"
+
+  option :vm_memory,
+    :long => "--vm-memory MEM",
+    :description => "VM Memory",
+    :default => 512
+  
+  option :version,
+    :long => "--version",
+    :short => "-v",
+    :description => "Instalatron Version",
+    :proc => Proc.new { puts Instalatron::VERSION; exit 0 }
+
+  option :help,
+    :short => "-h",
+    :long => "--help",
+    :description => "Show this message",
+    :on => :tail,
+    :boolean => true,
+    :show_options => true,
+    :exit => 0
+
 end
-if not running_vms.include?(vm_name)
-  $stderr.puts "Running VM #{vm_name} not found.\n\n"
 
-  $stderr.puts "Usage: instalatron-record <vm_name> [session_name]"
+def usage(cli)
+  $stderr.puts cli.opt_parser.help
   exit 1
 end
 
-session_name = ARGV[1] || "instalatron_rec_" + Time.now.strftime("%F_%H%M")
+def required_option(cli, opt)
+  if cli.config[opt].nil?
+    $stderr.puts "\n#{opt.to_s} argument requied.\n\n"
+    $stderr.puts cli.opt_parser.help
+    exit 1
+  end
+  return cli.config[opt]
+end
+
+cli = MyCLI.new
+cli.parse_options
+
+vm_name = cli.config[:vm_name]
+
+iso_file = required_option(cli, :iso_file)
+if not File.exist?(iso_file)
+  $stderr.puts "Invalid ISO file.\n\n"
+  usage(cli)
+end
+
+session_name = "instalatron_rec_" + Time.now.strftime("%F_%H%M")
+
+# Create VBox VM first
+$stdout.puts "Creating VM #{vm_name}..."
+Instalatron.create_vm :vm_memory => cli.config[:vm_memory], :vm_name => vm_name, :iso_file => iso_file
 
 record_session  vm_name, session_name

data/lib/instalatron.rb

@@ -4,7 +4,29 @@ require 'virtualbox'
 
 module Instalatron
   
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
+
+  #
+  # NIC is nic1, nic2, etc
+  # device is eth0, eth1, etc
+  # mode is either :nat, :bridged, :hostonly
+  #
+  def self.set_nic_mode(vm_name, nic, device, mode)
+    err = `VBoxManage controlvm #{vm_name} #{nic} #{mode.to_s} #{device} 2>&1`
+    puts err
+    raise Exception.new(err) if $? != 0
+  end
+
+  def self.add_ssh_nat_mapping(vm_name, guest_port, host_port)
+    vm=VirtualBox::VM.find(vm_name)
+    port = VirtualBox::NATForwardedPort.new
+    port.name = "guestssh"
+    port.guestport = guest_port
+    port.hostport = host_port
+    vm.network_adapters[0].nat_driver.forwarded_ports << port
+    port.save
+    vm.save  
+  end
 
   def self.destroy_vm(vm_name)
     `VBoxManage controlvm '#{vm_name}' poweroff > /dev/null 2>&1`
@@ -23,6 +45,7 @@ module Instalatron
     vboxcmd = params[:vboxcmd] || 'VBoxManage'
     vm_memory = params[:vm_memory] || 512
     vm_cpus = params[:vm_cpus] || 1
+    vm_disk_size = params[:vm_disk_size].to_i || 8192
     if params[:headless].nil?
       params[:headless] = false
     end
@@ -44,7 +67,7 @@ module Instalatron
     end
     
     vm=VirtualBox::VM.find(vm_name)
-    vm.memory_size= vm_memory
+    vm.memory_size = vm_memory.to_i
     vm.os_type_id = os_type
     vm.cpu_count  = vm_cpus
     vm.name = vm_name
@@ -60,7 +83,7 @@ module Instalatron
     place = `#{vboxcmd}  list  systemproperties|grep '^Default machine'|cut -d ':' -f 2|sed -e 's/^[ ]*//'`.strip.chomp 
     disk_file = "#{place}/#{vm_name}/#{vm_name}.vdi"
     
-    `#{vboxcmd} createhd --filename '#{disk_file}' --size 8192 --format VDI >/dev/null 2>&1`
+    `#{vboxcmd} createhd --filename '#{disk_file}' --size #{vm_disk_size} --format VDI >/dev/null 2>&1`
     
     # Add IDE/Sata Controllers
     `#{vboxcmd} storagectl '#{vm_name}' --name 'SATA Controller' --add sata --hostiocache off >/dev/null 2>&1`
@@ -83,7 +106,7 @@ module Instalatron
       keycodes.split.each do |k|
         `VBoxManage controlvm #{vm_name} keyboardputscancode '#{k}' >/dev/null 2>&1`
       end
-      sleep key_press_delay.to_i
+      sleep key_press_delay.to_f
     end
   end
 
@@ -94,7 +117,7 @@ module Instalatron
     `VBoxManage controlvm #{vm_name} screenshotpng #{dest_file} >/dev/null 2>&1`
   end
 
-  def self.same_image?(ref_image, new_img, threshold = 1500)
+  def self.same_image?(ref_image, new_img, threshold = 2000)
     `file #{ref_image}` =~ /(\d+\sx\s\d+)/ 
     geom1 = $1
     `file #{new_img}` =~ /(\d+\sx\s\d+)/ 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: instalatron
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Sergio Rubio
@@ -15,10 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-15 00:00:00 Z
+date: 2011-07-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -29,12 +29,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  version_requirements: *id001
-  name: bundler
-  prerelease: false
   type: :development
+  requirement: *id001
+  prerelease: false
+  name: bundler
 - !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -45,12 +45,12 @@ dependencies:
         - 5
         - 2
         version: 1.5.2
-  version_requirements: *id002
-  name: jeweler
-  prerelease: false
   type: :development
+  requirement: *id002
+  prerelease: false
+  name: jeweler
 - !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -60,12 +60,12 @@ dependencies:
         - 1
         - 2
         version: "1.2"
-  version_requirements: *id003
-  name: mixlib-cli
-  prerelease: false
   type: :runtime
+  requirement: *id003
+  prerelease: false
+  name: mixlib-cli
 - !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -75,12 +75,12 @@ dependencies:
         - 1
         - 2
         version: "1.2"
-  version_requirements: *id004
-  name: mixlib-cli
-  prerelease: false
   type: :runtime
+  requirement: *id004
+  prerelease: false
+  name: mixlib-cli
 - !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -90,10 +90,10 @@ dependencies:
         - 0
         - 8
         version: "0.8"
-  version_requirements: *id005
-  name: virtualbox
-  prerelease: false
   type: :runtime
+  requirement: *id005
+  prerelease: false
+  name: virtualbox
 description: Tests graphical installers using VirtualBox, keyboard driven input and image recognition technics
 email: srubio@abiquo.com
 executables: 
@@ -148,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Abiquo Installer Testing Framework