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

feature #863: fix tests with vlan=yes

Browse Source
This commit is contained in:
Jaime Melis 2011-12-02 19:07:55 +01:00
parent 8649233487
commit 913374f022
6 changed files with 32 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/vnm_mad/remotes/OpenNebulaNetwork.rb
View File

@ -52,7 +52,7 @@ class VM
nics = Nics.new(@hypervisor)
@vm_root.elements.each("TEMPLATE/NIC[VLAN=YES]") do |nic_element|
@vm_root.elements.each("TEMPLATE/NIC[VLAN='YES']") do |nic_element|
nic = nics.new_nic
nic_element.elements.each('*') do |nic_attribute|

39
src/vnm_mad/remotes/test/OpenNebulaNetwork_spec.rb
View File

@ -39,26 +39,29 @@ describe 'networking' do
}
onevlan = OpenNebulaNetwork.new(OUTPUT[:onevm_show],"kvm")
nics_expected = [{:bridge=>"br0",
:ip=>"172.16.0.100",
:mac=>"02:00:ac:10:00:64",
:network=>"Small network",
:network_id=>"0",
:tap=>"vnet0"},
{:bridge=>"br1",
:ip=>"10.1.1.1",
:mac=>"02:00:0a:01:01:01",
:network=>"r1",
:network_id=>"1",
:tap=>"vnet1"},
{:bridge=>"br2",
:ip=>"10.1.2.1",
:mac=>"02:00:0a:01:02:01",
:network=>"r2",
:network_id=>"2",
:tap=>"vnet2"}]
:ip=>"172.16.0.100",
:mac=>"02:00:ac:10:00:64",
:network=>"Small network",
:network_id=>"0",
:vlan=>"YES",
:tap=>"vnet0"},
{:bridge=>"br1",
:ip=>"10.1.1.1",
:mac=>"02:00:0a:01:01:01",
:network=>"r1",
:network_id=>"1",
:vlan=>"YES",
:tap=>"vnet1"},
{:bridge=>"br2",
:ip=>"10.1.2.1",
:mac=>"02:00:0a:01:02:01",
:network=>"r2",
:network_id=>"2",
:vlan=>"YES",
:tap=>"vnet2"}]
onevlan.vm.nics.should == nics_expected
end
end
describe 'ebtables' do

3
src/vnm_mad/remotes/test/output/onevm_show
View File

@ -37,6 +37,7 @@
<MAC><![CDATA[02:00:ac:10:00:64]]></MAC>
<NETWORK><![CDATA[Small network]]></NETWORK>
<NETWORK_ID><![CDATA[0]]></NETWORK_ID>
<VLAN><![CDATA[YES]]></VLAN>
</NIC>
<NIC>
<BRIDGE><![CDATA[br1]]></BRIDGE>
@ -44,6 +45,7 @@
<MAC><![CDATA[02:00:0a:01:01:01]]></MAC>
<NETWORK><![CDATA[r1]]></NETWORK>
<NETWORK_ID><![CDATA[1]]></NETWORK_ID>
<VLAN><![CDATA[YES]]></VLAN>
</NIC>
<NIC>
<BRIDGE><![CDATA[br2]]></BRIDGE>
@ -51,6 +53,7 @@
<MAC><![CDATA[02:00:0a:01:02:01]]></MAC>
<NETWORK><![CDATA[r2]]></NETWORK>
<NETWORK_ID><![CDATA[2]]></NETWORK_ID>
<VLAN><![CDATA[YES]]></VLAN>
</NIC>
<VMID><![CDATA[2]]></VMID>
</TEMPLATE>

2
src/vnm_mad/remotes/test/output/onevm_show_phydev_kvm
View File

@ -37,6 +37,7 @@
<MAC><![CDATA[02:00:c0:a8:00:65]]></MAC>
<NETWORK><![CDATA[ursa-dev]]></NETWORK>
<NETWORK_ID><![CDATA[4]]></NETWORK_ID>
<VLAN><![CDATA[YES]]></VLAN>
</NIC>
<NIC>
<BRIDGE><![CDATA[onebr6]]></BRIDGE>
@ -45,6 +46,7 @@
<NETWORK><![CDATA[vlan-dev]]></NETWORK>
<NETWORK_ID><![CDATA[6]]></NETWORK_ID>
<PHYDEV><![CDATA[eth0]]></PHYDEV>
<VLAN><![CDATA[YES]]></VLAN>
</NIC>
<VMID><![CDATA[9]]></VMID>
</TEMPLATE>

3
src/vnm_mad/remotes/test/output/onevm_show_vlan_id_kvm
View File

@ -37,6 +37,7 @@
<MAC><![CDATA[02:00:c0:a8:00:67]]></MAC>
<NETWORK><![CDATA[ursa-dev]]></NETWORK>
<NETWORK_ID><![CDATA[4]]></NETWORK_ID>
<VLAN><![CDATA[YES]]></VLAN>
</NIC>
<NIC>
<BRIDGE><![CDATA[onebr10]]></BRIDGE>
@ -45,6 +46,7 @@
<NETWORK><![CDATA[vlan50]]></NETWORK>
<NETWORK_ID><![CDATA[10]]></NETWORK_ID>
<PHYDEV><![CDATA[eth0]]></PHYDEV>
<VLAN><![CDATA[YES]]></VLAN>
<VLAN_ID><![CDATA[50]]></VLAN_ID>
</NIC>
<NIC>
@ -54,6 +56,7 @@
<NETWORK><![CDATA[vlan51]]></NETWORK>
<NETWORK_ID><![CDATA[11]]></NETWORK_ID>
<PHYDEV><![CDATA[eth0]]></PHYDEV>
<VLAN><![CDATA[YES]]></VLAN>
<VLAN_ID><![CDATA[51]]></VLAN_ID>
</NIC>
<VMID><![CDATA[22]]></VMID>

2
src/vnm_mad/remotes/test/output/onevm_show_xen
View File

@ -33,6 +33,7 @@
<MAC><![CDATA[02:00:ac:10:00:cb]]></MAC>
<NETWORK><![CDATA[virt-net]]></NETWORK>
<NETWORK_ID><![CDATA[3]]></NETWORK_ID>
<VLAN><![CDATA[YES]]></VLAN>
<WHITE_PORTS_TCP><![CDATA[22,80]]></WHITE_PORTS_TCP>
</NIC>
<NIC>
@ -42,6 +43,7 @@
<NETWORK><![CDATA[phy]]></NETWORK>
<NETWORK_ID><![CDATA[2]]></NETWORK_ID>
<PHYDEV><![CDATA[eth0]]></PHYDEV>
<VLAN><![CDATA[YES]]></VLAN>
</NIC>
<OS>
<INITRD><![CDATA[/srv/cloud/one/ttylinux-xen/initrd.gz]]></INITRD>