From 913374f022a811dda9f2bcf9a12ab6d3974c46b4 Mon Sep 17 00:00:00 2001
From: Jaime Melis <j.melis@fdi.ucm.es>
Date: Fri, 2 Dec 2011 19:07:55 +0100
Subject: [PATCH] feature #863: fix tests with vlan=yes

---
 src/vnm_mad/remotes/OpenNebulaNetwork.rb      |  2 +-
 .../remotes/test/OpenNebulaNetwork_spec.rb    | 39 ++++++++++---------
 src/vnm_mad/remotes/test/output/onevm_show    |  3 ++
 .../remotes/test/output/onevm_show_phydev_kvm |  2 +
 .../test/output/onevm_show_vlan_id_kvm        |  3 ++
 .../remotes/test/output/onevm_show_xen        |  2 +
 6 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/src/vnm_mad/remotes/OpenNebulaNetwork.rb b/src/vnm_mad/remotes/OpenNebulaNetwork.rb
index a6cb14ca55..a944adeb8d 100644
--- a/src/vnm_mad/remotes/OpenNebulaNetwork.rb
+++ b/src/vnm_mad/remotes/OpenNebulaNetwork.rb
@@ -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|
diff --git a/src/vnm_mad/remotes/test/OpenNebulaNetwork_spec.rb b/src/vnm_mad/remotes/test/OpenNebulaNetwork_spec.rb
index 3875bd403f..ad1dc18932 100644
--- a/src/vnm_mad/remotes/test/OpenNebulaNetwork_spec.rb
+++ b/src/vnm_mad/remotes/test/OpenNebulaNetwork_spec.rb
@@ -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
diff --git a/src/vnm_mad/remotes/test/output/onevm_show b/src/vnm_mad/remotes/test/output/onevm_show
index ec56cbf225..28b962f202 100644
--- a/src/vnm_mad/remotes/test/output/onevm_show
+++ b/src/vnm_mad/remotes/test/output/onevm_show
@@ -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>
diff --git a/src/vnm_mad/remotes/test/output/onevm_show_phydev_kvm b/src/vnm_mad/remotes/test/output/onevm_show_phydev_kvm
index 610bcb9d74..5a7541662f 100644
--- a/src/vnm_mad/remotes/test/output/onevm_show_phydev_kvm
+++ b/src/vnm_mad/remotes/test/output/onevm_show_phydev_kvm
@@ -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>
diff --git a/src/vnm_mad/remotes/test/output/onevm_show_vlan_id_kvm b/src/vnm_mad/remotes/test/output/onevm_show_vlan_id_kvm
index e70880289d..637838f3b5 100644
--- a/src/vnm_mad/remotes/test/output/onevm_show_vlan_id_kvm
+++ b/src/vnm_mad/remotes/test/output/onevm_show_vlan_id_kvm
@@ -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>
diff --git a/src/vnm_mad/remotes/test/output/onevm_show_xen b/src/vnm_mad/remotes/test/output/onevm_show_xen
index bff85d160a..9f0685ad44 100644
--- a/src/vnm_mad/remotes/test/output/onevm_show_xen
+++ b/src/vnm_mad/remotes/test/output/onevm_show_xen
@@ -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>