OpenNebula#3058: Patch nic detach

dann1 · Mar 19, 2019 · 8abe2b0 · 8abe2b0
1 parent c4c97b2
commit 8abe2b0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/vmm_mad/remotes/lib/lxd/container.rb b/src/vmm_mad/remotes/lib/lxd/container.rb
@@ -181,7 +181,7 @@ def stop(options = { :timeout => 120 })
         # Remove nic from ovs-switch if needed
         @one.get_nics.each do |nic|
             del_bridge_port(nic) # network driver matching implemented here
-    end
+        end
     end
 
     def restart(options = {})
@@ -218,7 +218,8 @@ def detach_nic(mac)
             device.include?('eth') && config['hwaddr'] == mac
         end
 
-        update
+        # Removes nic from ovs-switch if needed
+        update if del_bridge_port(@one.get_nic_by_mac(mac))
     end
 
     #---------------------------------------------------------------------------

diff --git a/src/vmm_mad/remotes/lxd/reboot b/src/vmm_mad/remotes/lxd/reboot
@@ -23,7 +23,7 @@ require 'container'
 require_relative '../../scripts_common'
 
 # ------------------------------------------------------------------------------
-# Action Arguments, STDIN includes XML description of the OpenNebula VM
+# Action Arguments, STDIN doesn't include XML description of the OpenNebula VM
 # ------------------------------------------------------------------------------
 vm_name = ARGV[0]