haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2484 from andyfowler/virtualbox-parallel-import 

provider/virtualbox: virtualbox parallel box import
This commit is contained in:
Mitchell Hashimoto 2013-11-23 16:23:07 -08:00
parent efc5c39b82 2e9286b4d3
commit 2044c7445e
2 changed files with 52 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
plugins/providers/virtualbox/driver/version_4_2.rb
View File

@ -162,7 +162,29 @@ module VagrantPlugins
output = ""
total = ""
last = 0
execute("import", ovf) do |type, data|
output = execute("import", "-n", ovf)
output =~ /Suggested VM name "(.+?)"/
suggested_name = $1.to_s
specified_name = "#{suggested_name}_#{(Time.now.to_f * 1000.0).to_i}_#{rand(100000)}" #Millisecond + Random
#Build the specified name param list
name_params = Array.new
name_params << "--vsys" << "0" << "--vmname" << specified_name
#Extract the disks list and build the disk target params
disk_params = Array.new
disks = output.scan(/(\d+): Hard disk image: source image=.+, target path=(.+),/)
disks.each do |unit_num, path|
disk_params << "--vsys"
disk_params << "0" #Derive vsys num .. do we support OVF's with multiple machines?
disk_params << "--unit"
disk_params << unit_num
disk_params << "--disk"
disk_params << path.sub("/#{suggested_name}/", "/#{specified_name}/")
end
execute("import", ovf , *name_params, *disk_params) do |type, data|
if type == :stdout
# Keep track of the stdout so that we can get the VM name
output << data
@ -186,16 +208,9 @@ module VagrantPlugins
end
end
# Find the name of the VM name
if output !~ /Suggested VM name "(.+?)"/
@logger.error("Couldn't find VM name in the output.")
return nil
end
name = $1.to_s
output = execute("list", "vms")
if output =~ /^"#{Regexp.escape(name)}" \{(.+?)\}$/
if output =~ /^"#{Regexp.escape(specified_name)}" \{(.+?)\}$/
return $1.to_s
end

37
plugins/providers/virtualbox/driver/version_4_3.rb
View File

@ -162,7 +162,32 @@ module VagrantPlugins
output = ""
total = ""
last = 0
execute("import", ovf) do |type, data|
# Dry-run the import to get the suggested name & path
output = execute("import", "-n", ovf)
output =~ /Suggested VM name "(.+?)"/
suggested_name = $1.to_s
# Append millisecond + random to the path in case we're importing the same box elsewhere
specified_name = "#{suggested_name}_#{(Time.now.to_f * 1000.0).to_i}_#{rand(100000)}"
# Build the specified name param list
name_params = Array.new
name_params << "--vsys" << "0" << "--vmname" << specified_name
# Extract the disks list and build the disk target params
disk_params = Array.new
disks = output.scan(/(\d+): Hard disk image: source image=.+, target path=(.+),/)
disks.each do |unit_num, path|
disk_params << "--vsys"
disk_params << "0"
disk_params << "--unit"
disk_params << unit_num
disk_params << "--disk"
disk_params << path.sub("/#{suggested_name}/", "/#{specified_name}/")
end
execute("import", ovf , *name_params, *disk_params) do |type, data|
if type == :stdout
# Keep track of the stdout so that we can get the VM name
output << data
@ -186,16 +211,8 @@ module VagrantPlugins
end
end
# Find the name of the VM name
if output !~ /Suggested VM name "(.+?)"/
@logger.error("Couldn't find VM name in the output.")
return nil
end
name = $1.to_s
output = execute("list", "vms")
if output =~ /^"#{Regexp.escape(name)}" \{(.+?)\}$/
if output =~ /^"#{Regexp.escape(specified_name)}" \{(.+?)\}$/
return $1.to_s
end