From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 67B6163D4D for ; Mon, 5 Oct 2020 17:09:59 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2134A1CA6B for ; Mon, 5 Oct 2020 17:09:27 +0200 (CEST) Received: from kvmformation1.odiso.net (globalOdiso.M6Lille.odiso.net [89.248.211.242]) by firstgate.proxmox.com (Proxmox) with ESMTP id F24331C6EE for ; Mon, 5 Oct 2020 17:09:13 +0200 (CEST) Received: by kvmformation1.odiso.net (Postfix, from userid 0) id C600AE89A0; Mon, 5 Oct 2020 17:09:13 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Mon, 5 Oct 2020 17:08:41 +0200 Message-Id: <20201005150912.463000-5-aderumier@odiso.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201005150912.463000-1-aderumier@odiso.com> References: <20201005150912.463000-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 1 AWL -0.436 Adjusted score from AWL reputation of From: address HEADER_FROM_DIFFERENT_DOMAINS 0.248 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods KHOP_HELO_FCRDNS 0.398 Relay HELO differs from its IP's reverse DNS NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record Subject: [pve-devel] [PATCH v10 pve-network 04/35] zones: simple|evpn: add gateway ip from subnets to vnet X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Oct 2020 15:09:59 -0000 Signed-off-by: Alexandre Derumier --- PVE/Network/SDN/Zones.pm | 4 +++- PVE/Network/SDN/Zones/EvpnPlugin.pm | 11 ++++++++--- PVE/Network/SDN/Zones/Plugin.pm | 2 +- PVE/Network/SDN/Zones/QinQPlugin.pm | 2 +- PVE/Network/SDN/Zones/SimplePlugin.pm | 11 ++++++++--- PVE/Network/SDN/Zones/VlanPlugin.pm | 2 +- PVE/Network/SDN/Zones/VxlanPlugin.pm | 8 +------- 7 files changed, 23 insertions(+), 17 deletions(-) diff --git a/PVE/Network/SDN/Zones.pm b/PVE/Network/SDN/Zones.pm index 143d6e5..25af088 100644 --- a/PVE/Network/SDN/Zones.pm +++ b/PVE/Network/SDN/Zones.pm @@ -11,6 +11,7 @@ use PVE::Cluster qw(cfs_read_file cfs_write_file cfs_lock_file); use PVE::Network; use PVE::Network::SDN::Vnets; +use PVE::Network::SDN::Subnets; use PVE::Network::SDN::Zones::VlanPlugin; use PVE::Network::SDN::Zones::QinQPlugin; use PVE::Network::SDN::Zones::VxlanPlugin; @@ -78,6 +79,7 @@ sub generate_etc_network_config { my $version = PVE::Cluster::cfs_read_file('sdn/.version'); my $vnet_cfg = PVE::Cluster::cfs_read_file('sdn/vnets.cfg'); my $zone_cfg = PVE::Cluster::cfs_read_file('sdn/zones.cfg'); + my $subnet_cfg = PVE::Network::SDN::Subnets::config(); my $controller_cfg = PVE::Cluster::cfs_read_file('sdn/controllers.cfg'); return if !$vnet_cfg && !$zone_cfg; @@ -112,7 +114,7 @@ sub generate_etc_network_config { my $plugin = PVE::Network::SDN::Zones::Plugin->lookup($plugin_config->{type}); eval { - $plugin->generate_sdn_config($plugin_config, $zone, $id, $vnet, $controller, $interfaces_config, $config); + $plugin->generate_sdn_config($plugin_config, $zone, $id, $vnet, $controller, $subnet_cfg, $interfaces_config, $config); }; if (my $err = $@) { warn "zone $zone : vnet $id : $err\n"; diff --git a/PVE/Network/SDN/Zones/EvpnPlugin.pm b/PVE/Network/SDN/Zones/EvpnPlugin.pm index a916579..83ceb3a 100644 --- a/PVE/Network/SDN/Zones/EvpnPlugin.pm +++ b/PVE/Network/SDN/Zones/EvpnPlugin.pm @@ -38,7 +38,7 @@ sub options { # Plugin implementation sub generate_sdn_config { - my ($class, $plugin_config, $zoneid, $vnetid, $vnet, $controller, $interfaces_config, $config) = @_; + my ($class, $plugin_config, $zoneid, $vnetid, $vnet, $controller, $subnet_cfg, $interfaces_config, $config) = @_; my $tag = $vnet->{tag}; my $alias = $vnet->{alias}; @@ -72,8 +72,13 @@ sub generate_sdn_config { #vnet bridge @iface_config = (); - push @iface_config, "address $ipv4" if $ipv4; - push @iface_config, "address $ipv6" if $ipv6; + + my @subnets = PVE::Tools::split_list($vnet->{subnets}) if $vnet->{subnets}; + foreach my $subnet (@subnets) { + next if !defined($subnet_cfg->{ids}->{$subnet}); + push @iface_config, "address $subnet_cfg->{ids}->{$subnet}->{gateway}" if $subnet_cfg->{ids}->{$subnet}->{gateway}; + } + push @iface_config, "hwaddress $mac" if $mac; push @iface_config, "bridge_ports $vxlan_iface"; push @iface_config, "bridge_stp off"; diff --git a/PVE/Network/SDN/Zones/Plugin.pm b/PVE/Network/SDN/Zones/Plugin.pm index d96e069..451699f 100644 --- a/PVE/Network/SDN/Zones/Plugin.pm +++ b/PVE/Network/SDN/Zones/Plugin.pm @@ -94,7 +94,7 @@ sub parse_section_header { } sub generate_sdn_config { - my ($class, $plugin_config, $zoneid, $vnetid, $vnet, $controller, $interfaces_config, $config) = @_; + my ($class, $plugin_config, $zoneid, $vnetid, $vnet, $controller, $subnet_cfg, $interfaces_config, $config) = @_; die "please implement inside plugin"; } diff --git a/PVE/Network/SDN/Zones/QinQPlugin.pm b/PVE/Network/SDN/Zones/QinQPlugin.pm index b39732a..5fffd15 100644 --- a/PVE/Network/SDN/Zones/QinQPlugin.pm +++ b/PVE/Network/SDN/Zones/QinQPlugin.pm @@ -45,7 +45,7 @@ sub options { # Plugin implementation sub generate_sdn_config { - my ($class, $plugin_config, $zoneid, $vnetid, $vnet, $controller, $interfaces_config, $config) = @_; + my ($class, $plugin_config, $zoneid, $vnetid, $vnet, $controller, $subnet_cfg, $interfaces_config, $config) = @_; my $stag = $plugin_config->{tag}; my $mtu = $plugin_config->{mtu}; diff --git a/PVE/Network/SDN/Zones/SimplePlugin.pm b/PVE/Network/SDN/Zones/SimplePlugin.pm index 6137062..312dcbf 100644 --- a/PVE/Network/SDN/Zones/SimplePlugin.pm +++ b/PVE/Network/SDN/Zones/SimplePlugin.pm @@ -20,7 +20,7 @@ sub options { # Plugin implementation sub generate_sdn_config { - my ($class, $plugin_config, $zoneid, $vnetid, $vnet, $controller, $interfaces_config, $config) = @_; + my ($class, $plugin_config, $zoneid, $vnetid, $vnet, $controller, $subnet_cfg, $interfaces_config, $config) = @_; return $config if$config->{$vnetid}; # nothing to do @@ -32,8 +32,13 @@ sub generate_sdn_config { # vnet bridge my @iface_config = (); - push @iface_config, "address $ipv4" if $ipv4; - push @iface_config, "address $ipv6" if $ipv6; + + my @subnets = PVE::Tools::split_list($vnet->{subnets}) if $vnet->{subnets}; + foreach my $subnet (@subnets) { + next if !defined($subnet_cfg->{ids}->{$subnet}); + push @iface_config, "address $subnet_cfg->{ids}->{$subnet}->{gateway}" if $subnet_cfg->{ids}->{$subnet}->{gateway}; + } + push @iface_config, "hwaddress $mac" if $mac; push @iface_config, "bridge_ports none"; push @iface_config, "bridge_stp off"; diff --git a/PVE/Network/SDN/Zones/VlanPlugin.pm b/PVE/Network/SDN/Zones/VlanPlugin.pm index db719a0..8485ae1 100644 --- a/PVE/Network/SDN/Zones/VlanPlugin.pm +++ b/PVE/Network/SDN/Zones/VlanPlugin.pm @@ -39,7 +39,7 @@ sub options { # Plugin implementation sub generate_sdn_config { - my ($class, $plugin_config, $zoneid, $vnetid, $vnet, $controller, $interfaces_config, $config) = @_; + my ($class, $plugin_config, $zoneid, $vnetid, $vnet, $controller, $subnet_cfg, $interfaces_config, $config) = @_; my $bridge = $plugin_config->{bridge}; die "can't find bridge $bridge" if !-d "/sys/class/net/$bridge"; diff --git a/PVE/Network/SDN/Zones/VxlanPlugin.pm b/PVE/Network/SDN/Zones/VxlanPlugin.pm index a256268..8386c43 100644 --- a/PVE/Network/SDN/Zones/VxlanPlugin.pm +++ b/PVE/Network/SDN/Zones/VxlanPlugin.pm @@ -43,13 +43,10 @@ sub options { # Plugin implementation sub generate_sdn_config { - my ($class, $plugin_config, $zoneid, $vnetid, $vnet, $controller, $interfaces_config, $config) = @_; + my ($class, $plugin_config, $zoneid, $vnetid, $vnet, $controller, $subnet_cfg, $interfaces_config, $config) = @_; my $tag = $vnet->{tag}; my $alias = $vnet->{alias}; - my $ipv4 = $vnet->{ipv4}; - my $ipv6 = $vnet->{ipv6}; - my $mac = $vnet->{mac}; my $multicastaddress = $plugin_config->{'multicast-address'}; my @peers; @peers = PVE::Tools::split_list($plugin_config->{'peers'}) if $plugin_config->{'peers'}; @@ -78,9 +75,6 @@ sub generate_sdn_config { #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_iface"; push @iface_config, "bridge_stp off"; push @iface_config, "bridge_fd 0"; -- 2.20.1