From fc8b4093b2660a4267c754e043429adc16a8ce94 Mon Sep 17 00:00:00 2001
From: Jaime Melis <j.melis@fdi.ucm.es>
Date: Fri, 8 Jul 2011 12:42:47 +0200
Subject: [PATCH] feature #476: set bridge as UP after creating it

---
 src/vnm_mad/HostManaged.rb                 | 5 ++++-
 src/vnm_mad/test/OpenNebulaNetwork_spec.rb | 9 ++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/vnm_mad/HostManaged.rb b/src/vnm_mad/HostManaged.rb
index b43c7d483a..bda6286ef1 100644
--- a/src/vnm_mad/HostManaged.rb
+++ b/src/vnm_mad/HostManaged.rb
@@ -33,7 +33,10 @@ class OpenNebulaHM < OpenNebulaNetwork
                     vlan = CONF[:start_vlan] + nic[:network_id].to_i
                 end
 
-                create_bridge bridge if !bridge_exists? bridge
+                if !bridge_exists? bridge
+                    create_bridge bridge
+                    ifup bridge
+                end
 
                 if !device_exists?(dev, vlan)
                     create_dev_vlan(dev, vlan)
diff --git a/src/vnm_mad/test/OpenNebulaNetwork_spec.rb b/src/vnm_mad/test/OpenNebulaNetwork_spec.rb
index 660baccad0..c8e7c14ccd 100644
--- a/src/vnm_mad/test/OpenNebulaNetwork_spec.rb
+++ b/src/vnm_mad/test/OpenNebulaNetwork_spec.rb
@@ -163,6 +163,7 @@ describe 'host-managed' do
         hm.activate
 
         hm_activate_rules = ["sudo /usr/sbin/brctl addbr onebr6",
+                             "sudo /sbin/ip link set onebr6 up",
                              "sudo /sbin/ip link show eth0.8",
                              "sudo /sbin/vconfig add eth0 8",
                              "sudo /sbin/ip link set eth0.8 up",
@@ -174,19 +175,21 @@ describe 'host-managed' do
         $capture_commands = {
             /virsh.*dumpxml/ => OUTPUT[:virsh_dumpxml_vlan_id],
             /brctl show/     => OUTPUT[:brctl_show],
-	    /brctl add/    => nil,
-	    /vconfig/        => nil,
-	    /ip link/        => nil
+            /brctl add/      => nil,
+            /vconfig/        => nil,
+            /ip link/        => nil
         }
         hm = OpenNebulaHM.new(OUTPUT[:onevm_show_vlan_id_kvm],"kvm")
         hm.activate
 
         hm_vlan_id = ["sudo /usr/sbin/brctl addbr onebr10",
+                      "sudo /sbin/ip link set onebr10 up",
                       "sudo /sbin/ip link show eth0.50",
                       "sudo /sbin/vconfig add eth0 50",
                       "sudo /sbin/ip link set eth0.50 up",
                       "sudo /usr/sbin/brctl addif onebr10 eth0.50",
                       "sudo /usr/sbin/brctl addbr specialbr",
+                      "sudo /sbin/ip link set specialbr up",
                       "sudo /sbin/ip link show eth0.51",
                       "sudo /sbin/vconfig add eth0 51",
                       "sudo /sbin/ip link set eth0.51 up",