From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <pve-devel-bounces@lists.proxmox.com> Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id BDC841FF164 for <inbox@lore.proxmox.com>; Fri, 14 Feb 2025 14:41:07 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 760361AF53; Fri, 14 Feb 2025 14:40:31 +0100 (CET) From: Gabriel Goller <g.goller@proxmox.com> To: pve-devel@lists.proxmox.com Date: Fri, 14 Feb 2025 14:39:47 +0100 Message-Id: <20250214133951.344500-8-g.goller@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250214133951.344500-1-g.goller@proxmox.com> References: <20250214133951.344500-1-g.goller@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.031 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH pve-network 07/11] merge the frr config with the fabrics frr config on apply X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/> List-Post: <mailto:pve-devel@lists.proxmox.com> List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe> Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com> Get the config directly from the file and convert it to the Perl-Representation (the Frr-Representation), then generate the config with the existing functions. Signed-off-by: Gabriel Goller <g.goller@proxmox.com> --- src/PVE/Network/SDN/Controllers.pm | 1 - src/PVE/Network/SDN/Controllers/EvpnPlugin.pm | 3 --- src/PVE/Network/SDN/Controllers/Frr.pm | 13 +++++++++++++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/PVE/Network/SDN/Controllers.pm b/src/PVE/Network/SDN/Controllers.pm index 43f154b7338e..da3c957fe44d 100644 --- a/src/PVE/Network/SDN/Controllers.pm +++ b/src/PVE/Network/SDN/Controllers.pm @@ -143,7 +143,6 @@ sub generate_controller_config { sub reload_controller { - my $cfg = PVE::Network::SDN::running_config(); my $controller_cfg = $cfg->{controllers}; diff --git a/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm b/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm index 6f875cb5dbf9..4b7120091b4b 100644 --- a/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm +++ b/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm @@ -359,14 +359,11 @@ sub find_isis_controller { sub generate_controller_rawconfig { my ($class, $plugin_config, $config) = @_; - #return PVE::Network::SDN::Controllers::Frr::generate_controller_rawconfig($class, $plugin_config, $config); die "implemented in the Frr helper"; } sub write_controller_config { my ($class, $plugin_config, $config) = @_; - - #return PVE::Network::SDN::Controllers::Frr::write_controller_config($class, $plugin_config, $config); die "implemented in the Frr helper"; } diff --git a/src/PVE/Network/SDN/Controllers/Frr.pm b/src/PVE/Network/SDN/Controllers/Frr.pm index 386dcae543e8..e9546f4d5e82 100644 --- a/src/PVE/Network/SDN/Controllers/Frr.pm +++ b/src/PVE/Network/SDN/Controllers/Frr.pm @@ -67,6 +67,19 @@ sub generate_controller_rawconfig { generate_frr_routemap($final_config, $config->{frr_routemap}); generate_frr_simple_list($final_config, $config->{frr_ip_protocol}); + # fabric config + # openfabric + my $openfabric_config = PVE::Network::SDN::Fabrics::get_config("openfabric"); + my $openfabric_frr = $openfabric_config->get_perl_frr_repr($nodename); + generate_frr_interfaces($final_config, $openfabric_frr->{frr_interface}); + generate_frr_recurse($final_config, $openfabric_frr->{frr}, undef, 0); + + # ospf + my $ospf_config = PVE::Network::SDN::Fabrics::get_config("ospf"); + my $ospf_frr = $ospf_config->get_perl_frr_repr($nodename); + generate_frr_interfaces($final_config, $ospf_frr->{frr_interface}); + generate_frr_recurse($final_config, $ospf_frr->{frr}, undef, 0); + push @{$final_config}, "!"; push @{$final_config}, "line vty"; push @{$final_config}, "!"; -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel