shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-22 18:50:08 +03:00
Code Releases Wiki Activity

feature #1726: Additional tests for empty VMX data

Browse Source
This commit is contained in:
Ruben S. Montero 2013-02-08 22:36:00 +01:00
parent 3f0e3e8470
commit 2bd0088692
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/vmm_mad/remotes/vmware/vmware_driver.rb
View File

@ -334,25 +334,27 @@ class VMwareDriver
dfile_hash = Document.new(File.open(dfile).read)
metadata = XPath.first(dfile_hash, "//metadata")
if metadata
# Get the ds_id for system_ds from the first disk
metadata = metadata.text
source = XPath.first(dfile_hash, "//disk/source").attributes['file']
ds_id = source.match(/^\[(.*)\](.*)/)[1]
return deploy_id if metadata.nil?
name = XPath.first(dfile_hash, "//name").text
vm_id = name.match(/^one-(.*)/)[1]
# Get the ds_id for system_ds from the first disk
metadata = metadata.text
# Reconstruct path to vmx & add metadata
path_to_vmx = "/vmfs/volumes/#{ds_id}/#{vm_id}/disk.0/#{name}.vmx"
return deploy_id if metadata.nil? || metadata.empty?
metadata.gsub!("\\n","\n")
source = XPath.first(dfile_hash, "//disk/source").attributes['file']
ds_id = source.match(/^\[(.*)\](.*)/)[1]
sed_str = metadata.scan(/^([^ ]+) *=/).join("|")
name = XPath.first(dfile_hash, "//name").text
vm_id = name.match(/^one-(.*)/)[1]
do_ssh_action("sed -ri \"/^(#{sed_str}) *=.*$/d\" #{path_to_vmx} ; cat >> #{path_to_vmx}", metadata)
end
# Reconstruct path to vmx & add metadata
path_to_vmx = "/vmfs/volumes/#{ds_id}/#{vm_id}/disk.0/#{name}.vmx"
metadata.gsub!("\\n","\n")
sed_str = metadata.scan(/^([^ ]+) *=/).join("|")
do_ssh_action("sed -ri \"/^(#{sed_str}) *=.*$/d\" #{path_to_vmx} ; cat >> #{path_to_vmx}", metadata)
return deploy_id
end