evpn: remove uplink-id

[pve-network.git] / PVE / Network / SDN / Zones / QinQPlugin.pm

diff --git a/PVE/Network/SDN/Zones/QinQPlugin.pm b/PVE/Network/SDN/Zones/QinQPlugin.pm
index d90382c84e621307cbc9033945612538888d14c6..42b0decb86d5e9aa56a1f7c607f7ad57c134f005 100644 (file)
--- a/PVE/Network/SDN/Zones/QinQPlugin.pm
+++ b/PVE/Network/SDN/Zones/QinQPlugin.pm
@@ -29,31 +29,30 @@ sub properties {
 sub options {
 
     return {
+        nodes => { optional => 1},
        'uplink-id' => { optional => 0 },
        'tag' => { optional => 0 },
-        'vlan-allowed' => { optional => 1 },
        'vlan-protocol' => { optional => 1 },
     };
 }
 
 # Plugin implementation
 sub generate_sdn_config {
-    my ($class, $plugin_config, $zoneid, $vnetid, $vnet, $uplinks, $config) = @_;
+    my ($class, $plugin_config, $zoneid, $vnetid, $vnet, $uplinks, $controller, $config) = @_;
 
     my $tag = $vnet->{tag};
-    my $transport_tag = $plugin_config->{tag};
+    my $zone_tag = $plugin_config->{tag};
     my $mtu = $vnet->{mtu};
     my $alias = $vnet->{alias};
     my $vlanprotocol = $plugin_config->{'vlan-protocol'};
     my $uplink = $plugin_config->{'uplink-id'};
-    my $vlanallowed = $plugin_config->{'vlan-allowed'};
 
     die "missing vlan tag" if !$tag;
-    die "missing transport vlan tag" if !$transport_tag;
+    die "missing zone vlan tag" if !$zone_tag;
 
     my $iface = $uplinks->{$uplink}->{name};
     $iface = "uplink${uplink}" if !$iface;
-    $iface .= ".$transport_tag";
+    $iface .= ".$zone_tag";
 
     #tagged interface
     my @iface_config = ();