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

Bug #3632: Avoid failure if vlan not present in Distributed vSwitch

Browse Source
This commit is contained in:
Tino Vazquez 2015-02-24 17:15:45 +01:00
parent a00e2947ef
commit 11e4b4a12e
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/vmm_mad/remotes/vcenter/vcenter_driver.rb
View File

@ -376,17 +376,29 @@ class VIClient
"BRIDGE = \"#{n[:name]}\"\n" \
"VCENTER_TYPE = \"Distributed Port Group\""
vlan = n.config.defaultPortConfig.vlan.vlanId
vlan_str = ""
if vlan != 0
if vlan.is_a? Array
vlan.each{|v|
vlan_str += v.start.to_s + ".." + v.end.to_s + ","
}
vlan_str.chop!
else
vlan_str = vlan.to_s
default_pc = n.config.defaultPortConfig
has_vlan = false
if default_pc.methods.include? :vlan
has_vlan = default_pc.vlan.methods.include? :vlanId
end
if has_vlan
vlan = n.config.defaultPortConfig.vlan.vlanId
vlan_str = ""
if vlan != 0
if vlan.is_a? Array
vlan.each{|v|
vlan_str += v.start.to_s + ".." +
v.end.to_s + ","
}
vlan_str.chop!
else
vlan_str = vlan.to_s
end
end
end