evpn: prefix interfaces

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

diff --git a/PVE/Network/SDN/Zones/EvpnPlugin.pm b/PVE/Network/SDN/Zones/EvpnPlugin.pm
index c80408a7426f1876251c1302bebb8b3884056fbd..973e8e054b4d548393a3fe71f59dcf6a2f2fdc82 100644 (file)
--- a/PVE/Network/SDN/Zones/EvpnPlugin.pm
+++ b/PVE/Network/SDN/Zones/EvpnPlugin.pm
@@ -32,12 +32,13 @@ sub options {
         nodes => { optional => 1},
         'vrf-vxlan' => { optional => 0 },
         'controller' => { optional => 0 },
+       mtu => { optional => 1 },
     };
 }
 
 # Plugin implementation
 sub generate_sdn_config {
-    my ($class, $plugin_config, $zoneid, $vnetid, $vnet, $uplinks, $controller, $config) = @_;
+    my ($class, $plugin_config, $zoneid, $vnetid, $vnet, $controller, $interfaces_config, $config) = @_;
 
     my $tag = $vnet->{tag};
     my $alias = $vnet->{alias};
@@ -45,35 +46,35 @@ sub generate_sdn_config {
     my $ipv6 = $vnet->{ipv6};
     my $mac = $vnet->{mac};
 
-    my $vrf = $zoneid;
+    my $vrf_iface = "vrf_$zoneid";
     my $vrfvxlan = $plugin_config->{'vrf-vxlan'};
 
     die "missing vxlan tag" if !$tag;
 
     my @peers = split(',', $controller->{'peers'});
-    my ($ifaceip, $iface) = PVE::Network::SDN::Controllers::EvpnPlugin::find_local_ip_interface(\@peers);
+    my ($ifaceip, $iface) = PVE::Network::SDN::Zones::Plugin::find_local_ip_interface_peers(\@peers);
 
     my $mtu = 1450;
-    $mtu = $uplinks->{$iface}->{mtu} - 50 if $uplinks->{$iface}->{mtu};
-    $mtu = $vnet->{mtu} if $vnet->{mtu};
+    $mtu = $interfaces_config->{$iface}->{mtu} - 50 if $interfaces_config->{$iface}->{mtu};
+    $mtu = $plugin_config->{mtu} if $plugin_config->{mtu};
 
     #vxlan interface
+    my $vxlan_iface = "vxlan_$vnetid";
     my @iface_config = ();
     push @iface_config, "vxlan-id $tag";
-
     push @iface_config, "vxlan-local-tunnelip $ifaceip" if $ifaceip;
     push @iface_config, "bridge-learning off";
     push @iface_config, "bridge-arp-nd-suppress on";
 
     push @iface_config, "mtu $mtu" if $mtu;
-    push(@{$config->{"vxlan$vnetid"}}, @iface_config) if !$config->{"vxlan$vnetid"};
+    push(@{$config->{$vxlan_iface}}, @iface_config) if !$config->{$vxlan_iface};
 
     #vnet bridge
     @iface_config = ();
     push @iface_config, "address $ipv4" if $ipv4;
     push @iface_config, "address $ipv6" if $ipv6;
     push @iface_config, "hwaddress $mac" if $mac;
-    push @iface_config, "bridge_ports vxlan$vnetid";
+    push @iface_config, "bridge_ports $vxlan_iface";
     push @iface_config, "bridge_stp off";
     push @iface_config, "bridge_fd 0";
     push @iface_config, "mtu $mtu" if $mtu;
@@ -81,34 +82,34 @@ sub generate_sdn_config {
     push @iface_config, "ip-forward on" if $ipv4;
     push @iface_config, "ip6-forward on" if $ipv6;
     push @iface_config, "arp-accept on" if $ipv4||$ipv6;
-    push @iface_config, "vrf $vrf" if $vrf;
+    push @iface_config, "vrf $vrf_iface" if $vrf_iface;
     push(@{$config->{$vnetid}}, @iface_config) if !$config->{$vnetid};
 
-    if ($vrf) {
+    if ($vrf_iface) {
        #vrf interface
        @iface_config = ();
        push @iface_config, "vrf-table auto";
-       push(@{$config->{$vrf}}, @iface_config) if !$config->{$vrf};
+       push(@{$config->{$vrf_iface}}, @iface_config) if !$config->{$vrf_iface};
 
        if ($vrfvxlan) {
            #l3vni vxlan interface
-           my $iface_vxlan = "vxvrf$vrf";
+           my $iface_vrf_vxlan = "vrfvx_$zoneid";
            @iface_config = ();
            push @iface_config, "vxlan-id $vrfvxlan";
            push @iface_config, "vxlan-local-tunnelip $ifaceip" if $ifaceip;
            push @iface_config, "bridge-learning off";
            push @iface_config, "bridge-arp-nd-suppress on";
            push @iface_config, "mtu $mtu" if $mtu;
-           push(@{$config->{$iface_vxlan}}, @iface_config) if !$config->{$iface_vxlan};
+           push(@{$config->{$iface_vrf_vxlan}}, @iface_config) if !$config->{$iface_vrf_vxlan};
 
            #l3vni bridge
-           my $brvrf = "br$vrf";
+           my $brvrf = "vrfbr_$zoneid";
            @iface_config = ();
-           push @iface_config, "bridge-ports $iface_vxlan";
+           push @iface_config, "bridge-ports $iface_vrf_vxlan";
            push @iface_config, "bridge_stp off";
            push @iface_config, "bridge_fd 0";
            push @iface_config, "mtu $mtu" if $mtu;
-           push @iface_config, "vrf $vrf";
+           push @iface_config, "vrf $vrf_iface";
            push(@{$config->{$brvrf}}, @iface_config) if !$config->{$brvrf};
        }
     }