zones: qinq: classic bridge: fix bridge zone name with multiple zones/vnets

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

diff --git a/PVE/Network/SDN/Zones/QinQPlugin.pm b/PVE/Network/SDN/Zones/QinQPlugin.pm
index 1543fc16e02b427b25065c710acdfa0b3c86369e..c5016f55d56e06e11aa6a20842e523156f1edd14 100644 (file)
--- a/PVE/Network/SDN/Zones/QinQPlugin.pm
+++ b/PVE/Network/SDN/Zones/QinQPlugin.pm
@@ -132,7 +132,7 @@ sub generate_sdn_config {
        foreach my $bridge_iface (@bridge_ifaces) {
 
            # use named vlan interface to avoid too long names
-           my $svlan_iface = "sv_$vnetid";
+           my $svlan_iface = "sv_$zoneid";
            my $cvlan_iface = "cv_$vnetid";
 
            #svlan

diff --git a/test/zones/qinq/bridge/expected_sdn_interfaces b/test/zones/qinq/bridge/expected_sdn_interfaces
index 73db5b30528bba87fa1e94993b72a520490e6de5..91ef667f679146c836ca6c9937aad99f4b476ae1 100644 (file)
--- a/test/zones/qinq/bridge/expected_sdn_interfaces
+++ b/test/zones/qinq/bridge/expected_sdn_interfaces
@@ -2,7 +2,17 @@
 
 auto cv_myvnet
 iface cv_myvnet
-       vlan-raw-device sv_myvnet
+       vlan-raw-device sv_myzone
+       vlan-id 100
+
+auto cv_myvnet2
+iface cv_myvnet2
+       vlan-raw-device sv_myzone
+       vlan-id 101
+
+auto cv_myvnet3
+iface cv_myvnet3
+       vlan-raw-device sv_myzone2
        vlan-id 100
 
 auto myvnet
@@ -11,7 +21,24 @@ iface myvnet
        bridge_stp off
        bridge_fd 0
 
-auto sv_myvnet
-iface sv_myvnet
+auto myvnet2
+iface myvnet2
+       bridge_ports  cv_myvnet2
+       bridge_stp off
+       bridge_fd 0
+
+auto myvnet3
+iface myvnet3
+       bridge_ports  cv_myvnet3
+       bridge_stp off
+       bridge_fd 0
+
+auto sv_myzone
+iface sv_myzone
        vlan-raw-device eth0
        vlan-id 10
+
+auto sv_myzone2
+iface sv_myzone2
+       vlan-raw-device eth0
+       vlan-id 20

diff --git a/test/zones/qinq/bridge/sdn_config b/test/zones/qinq/bridge/sdn_config
index 1708d4cf005b8fbf1b053e997fb8762a0cba67bf..63216031ebbbf7ff6ca778e747ed797a64c5fc4b 100644 (file)
--- a/test/zones/qinq/bridge/sdn_config
+++ b/test/zones/qinq/bridge/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" },
+                     },
              },
 }

diff --git a/test/zones/qinq/bridge_vlanawarevnet/expected_sdn_interfaces b/test/zones/qinq/bridge_vlanawarevnet/expected_sdn_interfaces
index ab7572e6aa81f1c3b1bb32cd9f10dd931e1f3b68..59265fde1071cd4bc7e1d94262723b666fa2e3ba 100644 (file)
--- a/test/zones/qinq/bridge_vlanawarevnet/expected_sdn_interfaces
+++ b/test/zones/qinq/bridge_vlanawarevnet/expected_sdn_interfaces
@@ -2,7 +2,7 @@
 
 auto cv_myvnet
 iface cv_myvnet
-       vlan-raw-device sv_myvnet
+       vlan-raw-device sv_myzone
        vlan-id 100
 
 auto myvnet
@@ -13,7 +13,7 @@ iface myvnet
        bridge-vlan-aware yes
        bridge-vids 2-4094
 
-auto sv_myvnet
-iface sv_myvnet
+auto sv_myzone
+iface sv_myzone
        vlan-raw-device eth0
        vlan-id 10

diff --git a/test/zones/qinq/bridge_vlanprotocol/expected_sdn_interfaces b/test/zones/qinq/bridge_vlanprotocol/expected_sdn_interfaces
index 460f1a50da1b4cdddb45500f252da77e0e701f91..528ceaa12d066109f095f4b33db3397df0c8be5a 100644 (file)
--- a/test/zones/qinq/bridge_vlanprotocol/expected_sdn_interfaces
+++ b/test/zones/qinq/bridge_vlanprotocol/expected_sdn_interfaces
@@ -2,7 +2,7 @@
 
 auto cv_myvnet
 iface cv_myvnet
-       vlan-raw-device sv_myvnet
+       vlan-raw-device sv_myzone
        vlan-id 100
 
 auto myvnet
@@ -11,8 +11,8 @@ iface myvnet
        bridge_stp off
        bridge_fd 0
 
-auto sv_myvnet
-iface sv_myvnet
+auto sv_myzone
+iface sv_myzone
        vlan-raw-device eth0
        vlan-id 10
        vlan-protocol 802.1ad