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

feature #476: set bridge as UP after creating it

Browse Source
This commit is contained in:
Jaime Melis 2011-07-08 12:42:47 +02:00
parent 03c4b69a1d
commit fc8b4093b2
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/vnm_mad/HostManaged.rb
View File

@ -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)

9
src/vnm_mad/test/OpenNebulaNetwork_spec.rb
View File

@ -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",