From ac67df24415835248f29bcbdbf96eb6922d1c59a Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Thu, 4 Jul 2013 01:24:36 +0200 Subject: [PATCH] feature #1977: Fix pciBridge --- src/vmm/LibVirtDriverVMware.cc | 2 +- src/vmm_mad/remotes/vmware/vi_driver.rb | 13 +++++++------ src/vmm_mad/remotes/vmware/vmware_driver.rb | 20 ++++++++++---------- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/vmm/LibVirtDriverVMware.cc b/src/vmm/LibVirtDriverVMware.cc index 56ba91a1bf..285b2df66e 100644 --- a/src/vmm/LibVirtDriverVMware.cc +++ b/src/vmm/LibVirtDriverVMware.cc @@ -171,7 +171,7 @@ int LibVirtDriver::deployment_description_vmware( if ( !guestOS.empty() ) { - metadata << "" << guestOS << "" << endl; + metadata << "" << guestOS << "" << endl; } // Start writing to the file with the info we got diff --git a/src/vmm_mad/remotes/vmware/vi_driver.rb b/src/vmm_mad/remotes/vmware/vi_driver.rb index ed83cf1566..269a4ed924 100644 --- a/src/vmm_mad/remotes/vmware/vi_driver.rb +++ b/src/vmm_mad/remotes/vmware/vi_driver.rb @@ -153,14 +153,15 @@ class VIVm # Set or removes a pciBridge from VM ######################################################################## def set_pcibridge(pciBridge) + num = pciBridge.to_i - return if (pciBridge.nil? || pciBridge.empty? ) + return if (num == 0) - if pciBridge.downcase == "yes" - spec = [ :key => "pciBridge0.present", :value => "TRUE" ] - else - spec = [ :key => "pciBridge0.present", :value => "FALSE" ] - end + spec = [] + + num.times { |i| + spec << { :key => "pciBridge#{i}.present", :value => "TRUE" } + } vmspec = RbVmomi::VIM.VirtualMachineConfigSpec(:extraConfig => spec) diff --git a/src/vmm_mad/remotes/vmware/vmware_driver.rb b/src/vmm_mad/remotes/vmware/vmware_driver.rb index 76edbc1242..c0660598d3 100644 --- a/src/vmm_mad/remotes/vmware/vmware_driver.rb +++ b/src/vmm_mad/remotes/vmware/vmware_driver.rb @@ -30,7 +30,6 @@ require "scripts_common" require 'yaml' require "CommandManager" require 'rexml/document' -include REXML class VMwareDriver # -------------------------------------------------------------------------# @@ -390,24 +389,24 @@ class VMwareDriver end def handle_metadata(dfile, deploy_id) - dfile_hash = Document.new(File.open(dfile).read) + dfile_hash = REXML::Document.new(File.open(dfile).read) # Check for the known elements in metadata - guestOS = XPath.first(dfile_hash, "/domain/metadata/guestOS") - pciBridge = XPath.first(dfile_hash, "/domain/metadata/pciBridge") + guestos = REXML::XPath.first(dfile_hash, "/domain/metadata/guestos") + pcibridge = REXML::XPath.first(dfile_hash, "/domain/metadata/pcibridge") - if (guestOS || pciBridge) + if (guestos || pcibridge) VIDriver::initialize(@host, false) vivm = VIDriver::VIVm.new(deploy_id, nil) - vivm.set_guestos(guestOS.text) if guestOS + vivm.set_guestos(guestos.text) if guestos - vivm.set_pcibridge(pciBridge.text) if pciBridge + vivm.set_pcibridge(pcibridge.text) if pcibridge end # Append the raw datavmx to vmx file - metadata = XPath.first(dfile_hash, "/domain/metadata/datavmx") + metadata = REXML::XPath.first(dfile_hash, "/domain/metadata/datavmx") return if metadata.nil? return if metadata.text.nil? @@ -416,10 +415,11 @@ class VMwareDriver metadata = metadata.text # Get the ds_id for system_ds from the first disk - source = XPath.first(dfile_hash, "/domain//disk/source").attributes['file'] + disk = REXML::XPath.first(dfile_hash, "/domain//disk/source") + source = disk.attributes['file'] ds_id = source.match(/^\[(.*)\](.*)/)[1] - name = XPath.first(dfile_hash, "/domain/name").text + name = REXML::XPath.first(dfile_hash, "/domain/name").text vm_id = name.match(/^one-(.*)/)[1] # Reconstruct path to vmx & add metadata