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

feature #476: capture more commands during testing

Browse Source
This commit is contained in:
Jaime Melis 2011-07-05 15:59:47 +02:00
parent f87e747ad5
commit 08024d57f2
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,7 +112,8 @@ describe 'openvswitch' do
it "force VLAN_ID for Open vSwitch vlans in kvm" do
$capture_commands = {
/virsh.*dumpxml/ => OUTPUT[:virsh_dumpxml_vlan_id],
/brctl show/ => OUTPUT[:brctl_show]
/brctl show/ => OUTPUT[:brctl_show],
/ovs-vsctl/ => nil
}
onevlan = OpenvSwitchVLAN.new(OUTPUT[:onevm_show_vlan_id_kvm],"kvm")
onevlan.activate
@ -153,7 +154,10 @@ describe 'host-managed' do
it "tag tun/tap devices with vlans in kvm" do
$capture_commands = {
/virsh.*dumpxml/ => OUTPUT[:virsh_dumpxml_phydev],
/brctl show/ => OUTPUT[:brctl_show]
/brctl show/ => OUTPUT[:brctl_show],
/brctl add/ => nil,
/vconfig/ => nil,
/ip link/ => nil
}
hm = OpenNebulaHM.new(OUTPUT[:onevm_show_phydev_kvm],"kvm")
hm.activate
@ -161,7 +165,7 @@ describe 'host-managed' do
hm_activate_rules = ["sudo /usr/sbin/brctl addbr onebr6",
"sudo /sbin/ip link show eth0.8",
"sudo /sbin/vconfig add eth0 8",
"sudo /sbin/ip set eth0.8 up",
"sudo /sbin/ip link set eth0.8 up",
"sudo /usr/sbin/brctl addif onebr6 eth0.8"]
$collector[:system].should == hm_activate_rules
end
@ -169,7 +173,10 @@ describe 'host-managed' do
it "force VLAN_ID for vlans in kvm" do
$capture_commands = {
/virsh.*dumpxml/ => OUTPUT[:virsh_dumpxml_vlan_id],
/brctl show/ => OUTPUT[:brctl_show]
/brctl show/ => OUTPUT[:brctl_show],
/brctl add/ => nil,
/vconfig/ => nil,
/ip link/ => nil
}
hm = OpenNebulaHM.new(OUTPUT[:onevm_show_vlan_id_kvm],"kvm")
hm.activate
@ -177,12 +184,12 @@ describe 'host-managed' do
hm_vlan_id = ["sudo /usr/sbin/brctl addbr onebr10",
"sudo /sbin/ip link show eth0.50",
"sudo /sbin/vconfig add eth0 50",
"sudo /sbin/ip set eth0.50 up",
"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 show eth0.51",
"sudo /sbin/vconfig add eth0 51",
"sudo /sbin/ip set eth0.51 up",
"sudo /sbin/ip link set eth0.51 up",
"sudo /usr/sbin/brctl addif specialbr eth0.51"]
$collector[:system].should == hm_vlan_id