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

M #-: Improve bridge delete condition

Browse Source
This commit is contained in:
Ruben S. Montero 2021-04-14 16:46:07 +02:00
parent de44bf570d
commit f4562df95d
No known key found for this signature in database
GPG Key ID: A0CEA6FA880A1D87
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/vnm_mad/remotes/lib/no_vlan.rb
View File

@ -43,7 +43,7 @@ module VNMMAD
# Add phydev device to the bridge.
OpenNebula.exec_and_log("#{command(:ip)} link set " \
"#{@nic[:phydev]} master #{@nic[:bridge]}")
"#{@nic[:phydev]} master #{@nic[:bridge]}")
@bridges[@nic[:bridge]] << @nic[:phydev]
end
@ -78,9 +78,16 @@ module VNMMAD
next if @nic[:conf][:keep_empty_bridge]
# Return if the phydev device is not the only left device in
# the bridge.
next if (@bridges[@nic[:bridge]].length > 1) ||
# the bridge.A
if @nic[:phydev].nil?
keep = !@bridges[@nic[:bridge]].empty?
else
keep = @bridges[@nic[:bridge]].length > 1 ||
!@bridges[@nic[:bridge]].include?(@nic[:phydev])
end
next if keep
# Delete the bridge.
OpenNebula.exec_and_log("#{command(:ip)} link delete"\