veewee 0.3.7 → 0.3.9

data/lib/veewee/provider/virtualbox/box/helper/console_type.rb

@@ -22,6 +22,8 @@ module Veewee
 
             keycodes=Veewee::Provider::Core::Helper::Scancode.string_to_keycode(s)
 
+            env.logger.info "Sending keycodes: #{keycodes}"
+
             # VBox seems to have issues with sending the scancodes as one big
             # .join()-ed string. It seems to get them out or order or ignore some.
             # A workaround is to send the scancodes one-by-one.
@@ -45,7 +47,7 @@ module Veewee
 
         def send_keycode(keycode)
           command= "#{@vboxcmd} controlvm \"#{name}\" keyboardputscancode #{keycode}"
-          env.logger.info "#{command}"
+          env.logger.debug "#{command}"
           sshresult=shell_exec("#{command}",{:mute => true})
           unless sshresult.stdout.index("E_ACCESSDENIED").nil?
             error= "There was an error typing the commands on the console"

data/lib/veewee/provider/virtualbox/box/helper/create.rb

@@ -9,9 +9,13 @@ module Veewee
           shell_exec("#{command}")
         end
 
-        def add_sata_controller
+        def add_sata_controller 
           #unless => "${vboxcmd} showvminfo \"${vname}\" | grep \"SATA Controller\" ";
-          command ="#{@vboxcmd} storagectl \"#{name}\" --name \"SATA Controller\" --add sata --hostiocache #{definition.hostiocache} --sataportcount 1"
+          if vbox_version >= '4.3.0'
+            command ="#{@vboxcmd} storagectl \"#{name}\" --name \"SATA Controller\" --add sata --hostiocache #{definition.hostiocache} --portcount #{definition.disk_count}"
+          else
+            command ="#{@vboxcmd} storagectl \"#{name}\" --name \"SATA Controller\" --add sata --hostiocache #{definition.hostiocache} --sataportcount #{definition.disk_count}"
+          end
           shell_exec("#{command}")
         end
 
@@ -25,9 +29,15 @@ module Veewee
         def add_ssh_nat_mapping
 
           unless definition.nil?
-            #Map SSH Ports
-            command="#{@vboxcmd} modifyvm \"#{name}\" --natpf#{self.natinterface} \"guestssh,tcp,,#{definition.ssh_host_port},,#{definition.ssh_guest_port}\""
-            shell_exec("#{command}")
+            unless definition.skip_nat_mapping == true
+              #Map SSH Ports
+              if self.running?
+                command="#{@vboxcmd} controlvm \"#{name}\" natpf#{self.natinterface} \"guestssh,tcp,,#{definition.ssh_host_port},,#{definition.ssh_guest_port}\""
+              else
+                command="#{@vboxcmd} modifyvm \"#{name}\" --natpf#{self.natinterface} \"guestssh,tcp,,#{definition.ssh_host_port},,#{definition.ssh_guest_port}\""
+              end
+              shell_exec("#{command}")
+            end
           end
         end
 
@@ -35,8 +45,14 @@ module Veewee
 
           unless definition.nil?
             #Map SSH Ports
-            command="#{@vboxcmd} modifyvm \"#{name}\" --natpf1 'guestwinrm,tcp,,#{definition.winrm_host_port},,#{definition.winrm_guest_port}'"
-            shell_exec("#{command}")
+            unless definition.skip_nat_mapping == true
+              if self.running?
+                command="#{@vboxcmd} controlvm \"#{name}\" natpf#{self.natinterface} \"guestwinrm,tcp,,#{definition.winrm_host_port},,#{definition.winrm_guest_port}\""
+              else
+                command="#{@vboxcmd} modifyvm \"#{name}\" --natpf#{self.natinterface} \"guestwinrm,tcp,,#{definition.winrm_host_port},,#{definition.winrm_guest_port}\""
+              end
+              shell_exec("#{command}")
+            end
           end
         end
 
@@ -75,25 +91,27 @@ module Veewee
 
 
         def create_disk
-            ui.info "Creating new harddrive of size #{definition.disk_size.to_i}, format #{definition.disk_format}, variant #{definition.disk_variant} "
-
-
             place=get_vbox_home
-            command ="#{@vboxcmd} createhd --filename \"#{File.join(place,name,name+"."+definition.disk_format.downcase)}\" --size \"#{definition.disk_size.to_i}\" --format #{definition.disk_format.downcase} --variant #{definition.disk_variant.downcase}"
-            shell_exec("#{command}")
-
+            1.upto(definition.disk_count.to_i) do |f|
+              ui.info "Creating new harddrive of size #{definition.disk_size.to_i}, format #{definition.disk_format}, variant #{definition.disk_variant} "
+              command ="#{@vboxcmd} createhd --filename \"#{File.join(place,name,name+"#{f}."+definition.disk_format.downcase)}\" --size \"#{definition.disk_size.to_i}\" --format #{definition.disk_format.downcase} --variant #{definition.disk_variant.downcase}"
+              shell_exec("#{command}")
+            end
         end
 
         def attach_disk_common(storagectl, device_number)
           place=get_vbox_home
-          location=name+"."+definition.disk_format.downcase
-
-          location="#{File.join(place,name,location)}"
-          ui.info "Attaching disk: #{location}"
-
-          #command => "${vboxcmd} storageattach \"${vname}\" --storagectl \"SATA Controller\" --port 0 --device 0 --type hdd --medium \"${vname}.vdi\"",
-          command ="#{@vboxcmd} storageattach \"#{name}\" --storagectl \"#{storagectl}\" --port 0 --device #{device_number} --type hdd --medium \"#{location}\""
-          shell_exec("#{command}")
+          
+          1.upto(definition.disk_count.to_i) do |f|
+            location=name+"#{f}."+definition.disk_format.downcase
+  
+            location="#{File.join(place,name,location)}"
+            ui.info "Attaching disk: #{location}"
+  
+            #command => "${vboxcmd} storageattach \"${vname}\" --storagectl \"SATA Controller\" --port 0 --device 0 --type hdd --medium \"${vname}.vdi\"",
+            command ="#{@vboxcmd} storageattach \"#{name}\" --storagectl \"#{storagectl}\" --port #{f-1} --device #{device_number} --type hdd --medium \"#{location}\""
+            shell_exec("#{command}")
+          end
         end
 
         def attach_disk_ide(device_number=0)
@@ -165,7 +183,7 @@ module Veewee
           #setting video memory size
           command="#{@vboxcmd} modifyvm \"#{name}\" --vram #{definition.video_memory_size}"
           shell_exec("#{command}")
-          
+
           #setting bootorder
           command="#{@vboxcmd} modifyvm \"#{name}\" --boot1 disk --boot2 dvd --boot3 none --boot4 none"
           shell_exec("#{command}")
@@ -173,6 +191,13 @@ module Veewee
           # Modify the vm to enable or disable hw virtualization extensions
           vm_flags=%w{pagefusion acpi ioapic pae hpet hwvirtex hwvirtexcl nestedpaging largepages vtxvpid synthxcpu rtcuseutc}
 
+	  #setextradata
+          unless definition.virtualbox[:extradata].nil?
+              command="#{@vboxcmd} setextradata \"#{name}\" #{definition.virtualbox[:extradata]}"
+              puts "Setting extra data with #{command}"
+              shell_exec("#{command}")
+          end
+
           vm_flags.each do |vm_flag|
             if definition.instance_variable_defined?("@#{vm_flag}")
               vm_flag_value=definition.instance_variable_get("@#{vm_flag}")
@@ -183,7 +208,7 @@ module Veewee
             end
           end
 
-          unless definition.virtualbox[:vm_options][0].nil?
+          unless definition.virtualbox[:vm_options].nil? || definition.virtualbox[:vm_options][0].nil?
             definition.virtualbox[:vm_options][0].each do |vm_flag,vm_flag_value|
               ui.info "Setting VM Flag #{vm_flag} to #{vm_flag_value}"
               command="#{@vboxcmd} modifyvm #{name} --#{vm_flag.to_s} #{vm_flag_value}"

data/lib/veewee/provider/virtualbox/box/helper/forwarding.rb

@@ -28,7 +28,11 @@ module Veewee
 
         def delete_forwarding(name)
           forward=self.forwarding(name)
-          command="#{@vboxcmd} controlvm \"#{self.name}\" natpf#{self.natinterface} delete #{name}"
+          if self.running?
+            command="#{@vboxcmd} controlvm \"#{self.name}\" natpf#{self.natinterface} delete \"#{name}\""
+          else
+            command="#{@vboxcmd} modifyvm \"#{self.name}\" --natpf#{self.natinterface} delete \"#{name}\""
+          end
           shell_results=shell_exec("#{command}")
         end
 

data/lib/veewee/provider/virtualbox/box/helper/version.rb

@@ -8,7 +8,10 @@ module Veewee
         # For example: 4.1.8_Debianr75467 -> 4.1.8
         def vbox_version
           command="#{@vboxcmd} --version"
-          shell_results=shell_exec("#{command}",{:mute => true})
+          stderr = "/dev/null"
+          is_windows = (RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/)
+          stderr = "nul" if is_windows
+          shell_results=shell_exec("#{command}",{:mute => true, :stderr => stderr})
           version=shell_results.stdout.strip.split(/[^0-9\.]/)[0]
           return version
         end

data/lib/veewee/provider/virtualbox/box/up.rb

@@ -6,7 +6,7 @@ module Veewee
         def up(options={})
 
           unless self.exists?
-            raise Veewee::Error, "Error:: You tried to up a non-existing box '#{name}'"
+            raise Veewee::Error, "Error:: You tried to up a non-existing box '#{name}'. Please run 'veewee vbox build #{name}' first."
           end
 
           gui_enabled=options['nogui']==true ? false : true
@@ -20,10 +20,10 @@ module Veewee
             definition.winrm_host_port=guessed_port.to_s
             
             unless forward.nil?
-              if guessed_port!=forward[:guest_port]
+              if guessed_port!=forward[:host_port]
                 # Remove the existing one
                 self.delete_forwarding("guestwinrm")
-                env.ui.warn "Changing winrm port on UP from #{forward[:guest_port]} to #{guessed_port}"
+                env.ui.warn "Changing winrm port on UP from #{forward[:host_port]} to #{guessed_port}"
               self.add_winrm_nat_mapping
               end
             else
@@ -34,14 +34,14 @@ module Veewee
 
             # Before we start,correct the ssh port if needed
             forward=self.forwarding("guestssh")
-            guessed_port=guess_free_port(definition.ssh_host_port.to_i,definition.ssh_host_port.to_i+40).to_s
+            guessed_port=guess_free_ssh_port(definition.ssh_host_port.to_i,definition.ssh_host_port.to_i+40).to_s
             definition.ssh_host_port=guessed_port.to_s
             
             unless forward.nil?
-              if guessed_port!=forward[:guest_port]
+              if guessed_port!=forward[:host_port]
                 # Remove the existing one
                 self.delete_forwarding("guestssh")
-                env.ui.warn "Changing ssh port from #{forward[:guest_port]} to #{guessed_port}"
+                env.ui.warn "Changing ssh port from #{forward[:host_port]} to #{guessed_port}"
               self.add_ssh_nat_mapping
               end
             else

data/lib/veewee/provider/virtualbox/provider.rb

@@ -1,4 +1,5 @@
 require 'veewee/provider/core/provider'
+require 'veewee/provider/virtualbox/box'
 
 module Veewee
   module Provider
@@ -8,7 +9,8 @@ module Veewee
 #        include ::Veewee::Provider::Virtualbox::ProviderCommand
 
         def check_requirements
-          unless self.shell_exec("VBoxManage -v").status == 0
+          command = Box.determine_vboxcmd
+          unless self.shell_exec("#{command} -v").status == 0
             raise Veewee::Error,"Could not execute VBoxManage command. Please install Virtualbox or make sure VBoxManage is in the Path"
           end
         end

data/lib/veewee/provider/vmfusion/box.rb

@@ -19,7 +19,7 @@ require 'veewee/provider/vmfusion/box/destroy'
 require 'veewee/provider/vmfusion/box/ssh'
 require 'veewee/provider/vmfusion/box/template'
 require 'veewee/provider/vmfusion/box/validate_vmfusion'
-require 'veewee/provider/vmfusion/box/export_ova'
+require 'veewee/provider/vmfusion/box/export'
 require 'veewee/provider/vmfusion/box/add_share'
 
 

data/lib/veewee/provider/vmfusion/box/export.rb

@@ -0,0 +1,125 @@
+require 'tempfile'
+
+module Veewee
+  module Provider
+    module Vmfusion
+      module BoxCommand
+        # This function 'exports' the box based on the definition
+        def export_vmfusion(options)
+          case options["export_type"]
+          when "ova"
+            debug="--X:logToConsole=true --X:logLevel=\"verbose\""
+            debug=""
+            flags="--compress=9"
+
+            if File.exists?("#{name}.ova")
+              if options["force"]
+                env.logger.debug("#{name}.ova exists, but --force was provided")
+                env.logger.debug("removing #{name}.ova first")
+                FileUtils.rm("#{name}.ova")
+                env.logger.debug("#{name}.ova removed")
+              else
+                raise Veewee::Error, "export file #{name}.ova already exists. Use --force option to overwrite."
+              end
+            end
+
+            # before exporting the system needs to be shut down
+            ensure_vm_stopped(options)
+
+            # otherwise the debug log will show - The specified virtual disk needs repair
+            env.ui.info "Exporting VM to #{options["export_type"]}"
+            shell_exec("#{File.dirname(vmrun_cmd).shellescape}#{"/VMware OVF Tool/ovftool".shellescape} #{debug} #{flags} #{vmx_file_path.shellescape} #{name}.ova")
+          when "vagrant"
+            debug=""
+            flags="-tt=OVF"
+
+            ensure_vm_stopped(options)
+
+            optimize_disk
+
+            # get a temp dir
+            Dir.mktmpdir do |tmpdir|
+              env.ui.info "Exporting VM to #{options["export_type"]} box"
+              FileUtils.cp_r(Dir["#{vm_path}/*"],tmpdir)
+
+              # Inject a Vagrantfile unless one is provided
+              if options['vagrantfile']
+                FileUtils.cp(options['vagrantfile'], File.join(tmpdir, 'Vagrantfile'))
+              else
+                File.open(File.join(tmpdir, 'Vagrantfile'), 'w') {|f| f.write(template_vagrantfile()) }
+              end
+              #Inject a metadata.json file
+              File.open(File.join(tmpdir, 'metadata.json'), 'w') {|f| f.write(template_metadatafile()) }
+
+              # Tar it up into the destination
+              pwd = Dir.pwd
+              shell_exec("cd #{tmpdir} && tar -czf #{File.join(pwd, name)}.box *")
+            end
+          end
+
+
+
+        end
+
+        protected
+
+        def ensure_vm_stopped(options={})
+          # Need to check binary first
+          if self.running?.data
+            # Wait for the shutdown to complete
+            begin
+              Timeout::timeout(60) do
+                self.halt(options)
+                loop do
+                  sleep 4
+                  break unless self.running?.data
+                end
+              end
+            rescue TimeoutError => ex
+              raise Veewee::Error,ex
+            end
+          end
+        end
+        
+        def template_metadatafile
+          %Q({"provider": "vmware_fusion"}\n)
+        end
+
+        def template_vagrantfile
+          <<EOF
+Vagrant::Config.run do |config|
+  # This Vagrantfile is auto-generated by `vagrant package` to contain
+  # the MAC address of the box. Custom configuration should be placed in
+  # the actual `Vagrantfile` in this box.
+  config.vm.base_mac = "080027AC6969"
+end
+
+# Load include vagrant file if it exists after the auto-generated
+# so it can override any of the settings
+include_vagrantfile = File.expand_path("../include/_Vagrantfile", __FILE__)
+load include_vagrantfile if File.exist?(include_vagrantfile)
+EOF
+        end
+
+        def optimize_disk
+          current_dir=Dir.pwd
+          FileUtils.chdir(vm_path)
+          env.ui.info "Optimizing Disk"
+          shell_exec("#{File.dirname(vmrun_cmd).shellescape}#{"/vmware-vdiskmanager".shellescape} -d #{name}.vmdk")
+          shell_exec("#{File.dirname(vmrun_cmd).shellescape}#{"/vmware-vdiskmanager".shellescape} -k #{name}.vmdk")
+
+          [name,
+           "#{name}.plist",
+           "quicklook-cache.png"
+          ].each do |file|
+            File.delete(file) if File.exist?(file)
+          end
+
+          Dir.glob("*.log").map { |f| File.delete(f) }
+          FileUtils.chdir(current_dir)
+        end
+
+      end
+    end
+  end
+end

data/lib/veewee/provider/vmfusion/box/helper/buildinfo.rb

@@ -37,10 +37,14 @@ module Veewee
         def transfer_buildinfo(options)
           super(options)
 
+          # Initialize download_tools to true if null
+          if definition.vmfusion[:vm_options]['download_tools'].nil?
+            definition.vmfusion[:vm_options]['download_tools'] = true 
+          end
+
           # When we get here, ssh is available and no postinstall scripts have been executed yet
           # So we begin by transferring the ISO file of the vmware tools
-
-          if not (definition.winrm_user && definition.winrm_password)
+          if !(definition.winrm_user && definition.winrm_password) && definition.vmfusion[:vm_options]['download_tools']
             # with windows, we just use the mounted volume
             env.logger.info "About to transfer vmware tools iso buildinfo to the box #{name} - #{ip_address} - #{ssh_options}"
             iso_image=guest_iso_path

data/lib/veewee/provider/vmfusion/box/helper/ip.rb

@@ -23,7 +23,12 @@ module Veewee
           # Does not work for now as the vmx path is not escape correctly by fission 0.4.0
           #return raw.network_info.data.first['ip_address']
           raise ::Fission::Error,"VM #{name} does not exist" unless self.exists?
-
+          
+          # Use alternate method to retrieve the IP address using vmrun readVariable
+          
+          ip_address = shell_exec("#{vmrun_cmd.shellescape} readVariable \"#{vmx_file_path}\" guestVar ip", { :mute => true}).stdout.strip
+          return ip_address unless ip_address.empty?
+        
           unless mac_address.nil?
             lease = Fission::Lease.find_by_mac_address(mac_address).data
             return lease.ip_address unless lease.nil?

data/lib/veewee/provider/vmfusion/box/poweroff.rb

@@ -4,7 +4,7 @@ module Veewee
       module BoxCommand
 
         def poweroff(options={})
-          raw.halt unless raw.nil?
+          raw.stop(:hard => true) unless raw.nil?
         end
 
       end

data/lib/veewee/provider/vmfusion/box/ssh.rb

@@ -3,7 +3,7 @@ module Veewee
     module Vmfusion
       module BoxCommand
 
-        def ssh(command,options)
+        def ssh(command,options={})
           super(command,options)
         end
       end

data/lib/veewee/provider/vmfusion/box/template.rb

@@ -18,8 +18,14 @@ module Veewee
           floppy_path=File.join(definition.path,'virtualfloppy.img')
         end
         
+        # Property to support enabling hypervisor support in a VM
+        enable_hypervisor_support = definition.vmfusion[:vm_options]['enable_hypervisor_support']
+        
         # Depending on the fusion version, we need to update the virtualhw version
-        if @provider.fusion_version.start_with?('5.')
+        fusion_version = @provider.fusion_version
+        if fusion_version.start_with?('6.')
+          virtualhw_version = 10
+        elsif fusion_version.start_with?('5.')
           virtualhw_version = 9
         else
           virtualhw_version = 7
@@ -38,8 +44,9 @@ module Veewee
           :iso_file => "#{File.join(env.config.veewee.iso_dir,definition.iso_file)}",
           :box_name => name,
           :vnc_port => guess_vnc_port,
-          :fusion_version => @provider.fusion_version,
-          :vmdk_file => vmdk_file
+          :fusion_version => fusion_version,
+          :vmdk_file => vmdk_file,
+          :enable_hypervisor_support => enable_hypervisor_support
         }
 
         vars = ErbBinding.new(data)

data/lib/veewee/provider/vmfusion/box/template.vmx.erb

@@ -1,15 +1,28 @@
 .encoding = "UTF-8"
 config.version = "8"
-virtualHW.version = <%= virtualhw_version %>
+<% if fusion_os_type.start_with?("darwin") %>firmware = "efi"
+keyboardAndMouseProfile = "macProfile"
+smc.present = "TRUE"
+hpet0.present = "TRUE"
+ich7m.present = "TRUE"
+scsi1.present = "TRUE"
+scsi1.virtualDev = "<%= controller_type %>"
+scsi1:0.fileName = "<%= iso_file %>"
+scsi1:0.present = "TRUE"
+scsi1:0.deviceType = "cdrom-image"
+scsi1:0.startConnected = "TRUE"
+scsi1.pciSlotNumber = "36"<% else %>
+ide1:0.present = "TRUE"
+ide1:0.fileName = "<%= iso_file %>"
+ide1:0.deviceType = "cdrom-image"
+<% end %>
+virtualHW.version = "<%= virtualhw_version %>"
 numvcpus = "<%= cpu_count %>"
 scsi0.present = "TRUE"
 scsi0.virtualDev = "<%= controller_type %>"
 memsize = "<%= memory_size %>"
 scsi0:0.present = "TRUE"
 scsi0:0.fileName = "<%= box_name %>.vmdk"
-ide1:0.present = "TRUE"
-ide1:0.fileName = "<%= iso_file %>"
-ide1:0.deviceType = "cdrom-image"
 usb.present = "TRUE"
 ehci.present = "TRUE"
 pciBridge0.present = "TRUE"
@@ -82,9 +95,10 @@ ethernet0.displayName = "Ethernet"
 sound.startConnected = "FALSE"
 RemoteDisplay.vnc.enabled = "TRUE"
 RemoteDisplay.vnc.port = "<%= vnc_port %>"
+<% if enable_hypervisor_support == true %>vhv.enable = "TRUE"<% end %>
 <% if fusion_version.start_with?('5.') %>bios.bootOrder = "hdd,CDROM"<% end %>
 <% unless vmdk_file.nil? %>
 scsi0:2.present = "TRUE"
 scsi0:2.fileName = "<%= vmdk_file %>"
 scsi0:2.redo = ""
-<% end %>
+<% end %>