zones: qinq: vlanaware bridge: add tests with multiple vnets/zones

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>

diff --git a/test/zones/qinq/bridge_vlanaware/expected_sdn_interfaces b/test/zones/qinq/bridge_vlanaware/expected_sdn_interfaces
index a9ed9915d9e0eea8830fb5a92e3d100b1e77b635..7eefce154f0ba491763300446a77fb355cf24488 100644 (file)
--- a/test/zones/qinq/bridge_vlanaware/expected_sdn_interfaces
+++ b/test/zones/qinq/bridge_vlanaware/expected_sdn_interfaces
@@ -6,6 +6,18 @@ iface myvnet
        bridge_stp off
        bridge_fd 0
 
+auto myvnet2
+iface myvnet2
+       bridge_ports z_myzone.101
+       bridge_stp off
+       bridge_fd 0
+
+auto myvnet3
+iface myvnet3
+       bridge_ports z_myzone2.100
+       bridge_stp off
+       bridge_fd 0
+
 auto z_myzone
 iface z_myzone
        bridge-stp off
@@ -13,3 +25,11 @@ iface z_myzone
        bridge-fd 0
        bridge-vlan-aware yes
        bridge-vids 2-4094
+
+auto z_myzone2
+iface z_myzone2
+       bridge-stp off
+       bridge-ports vmbr0.20
+       bridge-fd 0
+       bridge-vlan-aware yes
+       bridge-vids 2-4094

diff --git a/test/zones/qinq/bridge_vlanaware/sdn_config b/test/zones/qinq/bridge_vlanaware/sdn_config
index 1708d4cf005b8fbf1b053e997fb8762a0cba67bf..63216031ebbbf7ff6ca778e747ed797a64c5fc4b 100644 (file)
--- a/test/zones/qinq/bridge_vlanaware/sdn_config
+++ b/test/zones/qinq/bridge_vlanaware/sdn_config
@@ -3,9 +3,14 @@
   vnets   => {
                ids => {
                         myvnet => { tag => 100, type => "vnet", zone => "myzone" },
+                        myvnet2 => { tag => 101, type => "vnet", zone => "myzone" },
+                        myvnet3 => { tag => 100, type => "vnet", zone => "myzone2" },
                       },
              },
   zones   => {
-               ids => { myzone => { bridge => "vmbr0", tag => 10, ipam => "pve", type => "qinq" } },
+               ids => { 
+                       myzone => { bridge => "vmbr0", tag => 10, ipam => "pve", type => "qinq" },
+                       myzone2 => { bridge => "vmbr0", tag => 20, ipam => "pve", type => "qinq" },
+                     },
              },
 }