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 @@
+
@@ -44,6 +45,7 @@
+
@@ -51,6 +53,7 @@
+
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 @@
+
@@ -45,6 +46,7 @@
+
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 @@
+
@@ -45,6 +46,7 @@
+
@@ -54,6 +56,7 @@
+
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 @@
+
@@ -42,6 +43,7 @@
+