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

Fix model problems with vcenter

Browse Source
This commit is contained in:
joseangelgm 2018-12-20 17:29:03 +01:00 committed by Tino Vázquez
parent 96d58c1773
commit 3c8de8a6f2
1 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb
View File

@ -1147,6 +1147,27 @@ class VirtualMachine < VCenterDriver::Template
end
end
def nic_model_class(nicmodel)
case nicmodel
when 'virtuale1000', 'e1000'
return RbVmomi::VIM::VirtualE1000
when 'virtuale1000e', 'e1000e'
return RbVmomi::VIM::VirtualE1000e
when 'virtualpcnet32', 'pcnet32'
return RbVmomi::VIM::VirtualPCNet32
when 'virtualsriovethernetcard', 'sriovethernetcard'
return RbVmomi::VIM::VirtualSriovEthernetCard
when 'virtualvmxnetm', 'vmxnetm'
return RbVmomi::VIM::VirtualVmxnetm
when 'virtualvmxnet2', 'vmnet2'
return RbVmomi::VIM::VirtualVmxnet2
when 'virtualvmxnet3', 'vmxnet3'
return RbVmomi::VIM::VirtualVmxnet3
else # If none matches, use VirtualE1000
return RbVmomi::VIM::VirtualE1000
end
end
def reference_unmanaged_devices(template_ref, execute = true)
extraconfig = []
device_change = []
@ -1211,9 +1232,21 @@ class VirtualMachine < VCenterDriver::Template
unmanaged_nics.each do |unic|
vnic = select.call(unic['BRIDGE'])
vnic.macAddress = unic['MAC']
device_change << { :device => vnic, :operation => :edit }
if unic['MODEL'] && !unic['MODEL'].empty? && !unic['MODEL'].nil?
vcenter_nic_class = vnic.class
opennebula_nic_class = nic_model_class(unic['MODEL'])
if vcenter_nic_class != opennebula_nic_class
# delete actual nic and update the new one.
device_change << { :device => vnic, :operation => :remove }
device_change << calculate_add_nic_spec(unic)
else
vnic.macAddress = unic['MAC']
device_change << { :device => vnic, :operation => :edit }
end
else
vnic.macAddress = unic['MAC']
device_change << { :device => vnic, :operation => :edit }
end
end
end
rescue Exception => e
@ -1432,7 +1465,7 @@ class VirtualMachine < VCenterDriver::Template
def extraconfig_vnc
if one_item["TEMPLATE/GRAPHICS"]
vnc_port = one_item["TEMPLATE/GRAPHICS/PORT"]
vnc_port = one_item["TEMPLATE/GRAPHICS/PORT"] || ''
vnc_listen = one_item["TEMPLATE/GRAPHICS/LISTEN"] || "0.0.0.0"
vnc_keymap = one_item["TEMPLATE/GRAPHICS/KEYMAP"]