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 33E631FF17C for <inbox@lore.proxmox.com>; Wed, 2 Apr 2025 12:42:21 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C368AFA57; Wed, 2 Apr 2025 12:42:07 +0200 (CEST) Date: Wed, 02 Apr 2025 12:41:31 +0200 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= <f.gruenbichler@proxmox.com> To: Proxmox VE development discussion <pve-devel@lists.proxmox.com> References: <20250328171340.885413-1-g.goller@proxmox.com> <20250328171340.885413-37-g.goller@proxmox.com> In-Reply-To: <20250328171340.885413-37-g.goller@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.16.0 (https://github.com/astroidmail/astroid) Message-Id: <1743587368.yx57mt6cia.astroid@yuna.none> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.045 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: Re: [pve-devel] [PATCH pve-network 09/17] sdn: running: apply fabrics config 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> On March 28, 2025 6:13 pm, Gabriel Goller wrote: > From: Stefan Hanreich <s.hanreich@proxmox.com> > > Save the fabrics configuration in the running configuration, when > applying the SDN configuration. This causes the FRR configuration to > be actually generated for the openfabric and ospf plugins, since the > FRR configuration is generated from the running configuration. > > Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com> > Co-authored-by: Gabriel Goller <g.goller@proxmox.com> > Signed-off-by: Gabriel Goller <g.goller@proxmox.com> > --- > src/PVE/Network/SDN.pm | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/src/PVE/Network/SDN.pm b/src/PVE/Network/SDN.pm > index a0b61275e10b..12f0f9361389 100644 > --- a/src/PVE/Network/SDN.pm > +++ b/src/PVE/Network/SDN.pm > @@ -155,13 +155,19 @@ sub commit_config { > my $zones_cfg = PVE::Network::SDN::Zones::config(); > my $controllers_cfg = PVE::Network::SDN::Controllers::config(); > my $subnets_cfg = PVE::Network::SDN::Subnets::config(); > + my $openfabric_cfg = PVE::Network::SDN::Fabrics::config_for_protocol("openfabric") > + ->get_inner(); > + my $ospf_cfg = PVE::Network::SDN::Fabrics::config_for_protocol("ospf") > + ->get_inner(); > > my $vnets = { ids => $vnets_cfg->{ids} }; > my $zones = { ids => $zones_cfg->{ids} }; > my $controllers = { ids => $controllers_cfg->{ids} }; > my $subnets = { ids => $subnets_cfg->{ids} }; > + my $openfabric = { ids => $openfabric_cfg }; > + my $ospf = { ids => $ospf_cfg }; > > - $cfg = { version => $version, vnets => $vnets, zones => $zones, controllers => $controllers, subnets => $subnets }; > + $cfg = { version => $version, vnets => $vnets, zones => $zones, controllers => $controllers, subnets => $subnets, openfabric => $openfabric, ospf => $ospf }; wouldn't it be more in line to have fabrics => fabrics_config here? > > cfs_write_file($running_cfg, $cfg); > } > -- > 2.39.5 > > > > _______________________________________________ > pve-devel mailing listZZ > pve-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel > > > _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel