feature #700: add tests for the VLAN_ID attr in the Open vSwitch and Host-Managed hooks

src/vnm_mad/test/OpenNebulaNetwork_spec.rb

@@ -108,6 +108,21 @@ describe 'openvswitch' do
 
         $collector[:system].should == openvswitch_tags
     end
+
+    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]
+        }
+        onevlan = OpenvSwitchVLAN.new(OUTPUT[:onevm_show_vlan_id_kvm],"kvm")
+        onevlan.activate
+        
+        onevlan_rules = ["sudo /usr/local/bin/ovs-vsctl set Port vnet0 tag=6",
+                         "sudo /usr/local/bin/ovs-vsctl set Port vnet1 tag=50",
+                         "sudo /usr/local/bin/ovs-vsctl set Port vnet1 tag=51"]
+
+        $collector[:system].should == onevlan_rules
+    end
 end
 
 describe 'firewall' do
@@ -149,4 +164,26 @@ describe 'host-managed' do
                              "sudo /usr/sbin/brctl addif onebr6 eth0.8"]
         $collector[:system].should == hm_activate_rules
     end
+
+    it "force VLAN_ID for vlans in kvm" do
+        $capture_commands = {
+            /virsh.*dumpxml/ => OUTPUT[:virsh_dumpxml_vlan_id],
+            /brctl show/     => OUTPUT[:brctl_show]
+        }
+        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 show eth0.50",
+                      "sudo /sbin/vconfig add eth0 50",
+                      "sudo /sbin/ip 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 /usr/sbin/brctl addif specialbr eth0.51"]
+
+        $collector[:system].should == hm_vlan_id
+    end
 end

src/vnm_mad/test/output/brctl_show

@@ -1,4 +1,3 @@
 bridge name     bridge id               STP enabled     interfaces
 bpriv           8000.00238bcea87c       no              eth0
-                                                        vnet0
 bpub            8000.00238bcea87d       no              eth1

src/vnm_mad/test/output/virsh_dumpxml_vlan_id

@@ -0,0 +1,43 @@
+<domain type='kvm' id='10'>
+  <name>one-22</name>
+  <uuid>37dba4a5-c14a-fd4d-cc91-77247144fe7b</uuid>
+  <memory>65536</memory>
+  <currentMemory>65536</currentMemory>
+  <vcpu>1</vcpu>
+  <os>
+    <type arch='i686' machine='pc-0.12'>hvm</type>
+    <boot dev='hd'/>
+  </os>
+  <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/kvm</emulator>
+    <disk type='file' device='disk'>
+      <driver name='qemu' type='raw'/>
+      <source file='/srv/cloud/images/playground/jaime/22/images/disk.0'/>
+      <target dev='hda' bus='ide'/>
+    </disk>
+    <interface type='bridge'>
+      <mac address='02:00:c0:a8:00:67'/>
+      <source bridge='bpriv'/>
+      <target dev='vnet0'/>
+    </interface>
+    <interface type='bridge'>
+      <mac address='02:00:0a:00:00:fb'/>
+      <source bridge='onebr10'/>
+      <target dev='vnet1'/>
+    </interface>
+    <interface type='bridge'>
+      <mac address='02:00:0a:00:00:fb'/>
+      <source bridge='specialbr'/>
+      <target dev='vnet2'/>
+    </interface>
+  </devices>
+  <seclabel type='dynamic' model='apparmor'>
+    <label>libvirt-37dba4a5-c14a-fd4d-cc91-77247144fe7b</label>
+    <imagelabel>libvirt-37dba4a5-c14a-fd4d-cc91-77247144fe7b</imagelabel>
+  </seclabel>
+</domain>
+