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 ACA2E618F6 for ; Mon, 28 Sep 2020 10:44:10 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 60C212B72F for ; Mon, 28 Sep 2020 10:44:01 +0200 (CEST) Received: from kvmformation1.odiso.net (globalOdiso.M6Lille.odiso.net [89.248.211.242]) by firstgate.proxmox.com (Proxmox) with ESMTP id 388F82B433 for ; Mon, 28 Sep 2020 10:43:38 +0200 (CEST) Received: by kvmformation1.odiso.net (Postfix, from userid 0) id 2EC79D6868; Mon, 28 Sep 2020 10:43:38 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Mon, 28 Sep 2020 10:43:36 +0200 Message-Id: <20200928084336.3487196-27-aderumier@odiso.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200928084336.3487196-1-aderumier@odiso.com> References: <20200928084336.3487196-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 1 AWL -0.433 Adjusted score from AWL reputation of From: address HEADER_FROM_DIFFERENT_DOMAINS 0.078 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.399 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 v9 pve-network 26/26] generate sdn/.running-config on apply 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, 28 Sep 2020 08:44:10 -0000 This is the source configuration for generate local configuration /sdn/*.cfg are pending configs Signed-off-by: Alexandre Derumier --- PVE/API2/Network/SDN.pm | 2 +- PVE/Network/SDN.pm | 57 +++++++++++++++++++-------- PVE/Network/SDN/Controllers.pm | 12 ++++-- PVE/Network/SDN/Subnets.pm | 11 +++++- PVE/Network/SDN/Vnets.pm | 18 ++++++--- PVE/Network/SDN/Zones.pm | 27 +++++++------ PVE/Network/SDN/Zones/EvpnPlugin.pm | 2 +- PVE/Network/SDN/Zones/SimplePlugin.pm | 2 +- test/generateconfig.pl | 2 + 9 files changed, 91 insertions(+), 42 deletions(-) diff --git a/PVE/API2/Network/SDN.pm b/PVE/API2/Network/SDN.pm index fcda11f..f129d60 100644 --- a/PVE/API2/Network/SDN.pm +++ b/PVE/API2/Network/SDN.pm @@ -119,7 +119,7 @@ __PACKAGE__->register_method ({ my $rpcenv = PVE::RPCEnvironment::get(); my $authuser = $rpcenv->get_user(); - PVE::Network::SDN::increase_version(); + PVE::Network::SDN::commit_config(); my $code = sub { $rpcenv->{type} = 'priv'; # to start tasks in background diff --git a/PVE/Network/SDN.pm b/PVE/Network/SDN.pm index 85faca0..f21de15 100644 --- a/PVE/Network/SDN.pm +++ b/PVE/Network/SDN.pm @@ -8,32 +8,39 @@ use JSON; use PVE::Network::SDN::Vnets; use PVE::Network::SDN::Zones; +use PVE::Network::SDN::Controllers; +use PVE::Network::SDN::Subnets; use PVE::Tools qw(extract_param dir_glob_regex run_command); use PVE::Cluster qw(cfs_read_file cfs_write_file cfs_lock_file); -my $version_cfg = "sdn/.version"; +my $running_cfg = "sdn/.running-config"; -my $parse_version_cfg = sub { +my $parse_running_cfg = sub { my ($filename, $raw) = @_; - return 0 if !defined($raw) || $raw eq ''; + my $cfg = {}; - warn "invalid sdn version '$raw'" if $raw !~ m/\d+$/; + return $cfg if !defined($raw) || $raw eq ''; - return $raw, + eval { + $cfg = from_json($raw); + }; + return {} if $@; + + return $cfg; }; -my $write_version_cfg = sub { - my ($filename, $version) = @_; +my $write_running_cfg = sub { + my ($filename, $cfg) = @_; - warn "invalid sdn version" if $version !~ m/\d+$/; + my $json = to_json($cfg); - return $version; + return $json; }; -PVE::Cluster::cfs_register_file($version_cfg, $parse_version_cfg, $write_version_cfg); +PVE::Cluster::cfs_register_file($running_cfg, $parse_running_cfg, $write_running_cfg); # improve me : move status code inside plugins ? @@ -70,23 +77,40 @@ sub status { return($zone_status, $vnet_status); } +sub config { + return cfs_read_file($running_cfg); +} + +sub commit_config { -sub increase_version { + my $cfg = cfs_read_file($running_cfg); + my $version = $cfg->{version}; - my $version = cfs_read_file($version_cfg); if ($version) { $version++; } else { $version = 1; } - cfs_write_file($version_cfg, $version); + my $vnets_cfg = PVE::Network::SDN::Vnets::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 $vnets = { ids => $vnets_cfg->{ids} }; + my $zones = { ids => $zones_cfg->{ids} }; + my $controllers = { ids => $controllers_cfg->{ids} }; + my $subnets = { ids => $subnets_cfg->{ids} }; + + $cfg = { version => $version, vnets => $vnets, zones => $zones, controllers => $controllers, subnets => $subnets }; + + cfs_write_file($running_cfg, $cfg); } sub lock_sdn_config { my ($code, $errmsg) = @_; - cfs_lock_file($version_cfg, undef, $code); + cfs_lock_file($running_cfg, undef, $code); if (my $err = $@) { $errmsg ? die "$errmsg: $err" : die $err; @@ -101,8 +125,9 @@ sub get_local_vnets { my $nodename = PVE::INotify::nodename(); - my $vnets_cfg = PVE::Network::SDN::Vnets::config(); - my $zones_cfg = PVE::Network::SDN::Zones::config(); + my $cfg = PVE::Network::SDN::config(); + my $vnets_cfg = $cfg->{vnets}; + my $zones_cfg = $cfg->{zones}; my @vnetids = PVE::Network::SDN::Vnets::sdn_vnets_ids($vnets_cfg); diff --git a/PVE/Network/SDN/Controllers.pm b/PVE/Network/SDN/Controllers.pm index 91a74d8..c210516 100644 --- a/PVE/Network/SDN/Controllers.pm +++ b/PVE/Network/SDN/Controllers.pm @@ -68,9 +68,11 @@ sub complete_sdn_controller { sub generate_controller_config { - my $vnet_cfg = PVE::Cluster::cfs_read_file('sdn/vnets.cfg'); - my $zone_cfg = PVE::Cluster::cfs_read_file('sdn/zones.cfg'); - my $controller_cfg = PVE::Cluster::cfs_read_file('sdn/controllers.cfg'); + my $cfg = PVE::Network::SDN::config(); + my $vnet_cfg = $cfg->{vnets}; + my $zone_cfg = $cfg->{zones}; + my $controller_cfg = $cfg->{controllers}; + return if !$vnet_cfg && !$zone_cfg && !$controller_cfg; #read main config for physical interfaces @@ -131,7 +133,9 @@ sub generate_controller_config { sub reload_controller { - my $controller_cfg = PVE::Cluster::cfs_read_file('sdn/controllers.cfg'); + my $cfg = PVE::Network::SDN::config(); + my $controller_cfg = $cfg->{controllers}; + return if !$controller_cfg; foreach my $id (keys %{$controller_cfg->{ids}}) { diff --git a/PVE/Network/SDN/Subnets.pm b/PVE/Network/SDN/Subnets.pm index 626b71d..5b99c91 100644 --- a/PVE/Network/SDN/Subnets.pm +++ b/PVE/Network/SDN/Subnets.pm @@ -49,9 +49,16 @@ sub complete_sdn_subnet { } sub get_subnet { - my ($subnetid) = @_; + my ($subnetid, $running) = @_; + + my $cfg = {}; + if($running) { + my $cfg = PVE::Network::SDN::config(); + $cfg = $cfg->{subnets}; + } else { + $cfg = PVE::Network::SDN::Subnets::config(); + } - my $cfg = PVE::Network::SDN::Subnets::config(); my $subnet = PVE::Network::SDN::Subnets::sdn_subnets_config($cfg, $subnetid, 1); return $subnet; } diff --git a/PVE/Network/SDN/Vnets.pm b/PVE/Network/SDN/Vnets.pm index 7cec418..d45ef2a 100644 --- a/PVE/Network/SDN/Vnets.pm +++ b/PVE/Network/SDN/Vnets.pm @@ -47,10 +47,18 @@ sub complete_sdn_vnet { } sub get_vnet { - my ($vnetid) = @_; + my ($vnetid, $running) = @_; + + my $cfg = {}; + if($running) { + my $cfg = PVE::Network::SDN::config(); + $cfg = $cfg->{vnets}; + } else { + $cfg = PVE::Network::SDN::Vnets::config(); + } - my $cfg = PVE::Network::SDN::Vnets::config(); my $vnet = PVE::Network::SDN::Vnets::sdn_vnets_config($cfg, $vnetid, 1); + return $vnet; } @@ -72,7 +80,7 @@ sub get_next_free_ip { my ($vnetid, $hostname, $ipversion) = @_; $ipversion = 4 if !$ipversion; - my $subnets = PVE::Network::SDN::Vnets::get_subnets($vnetid); + my $subnets = PVE::Network::SDN::Vnets::get_subnets($vnetid, 1); my $ip = undef; my $subnetcount = 0; @@ -98,7 +106,7 @@ sub get_next_free_ip { sub add_ip { my ($vnetid, $cidr, $hostname) = @_; - my $subnets = PVE::Network::SDN::Vnets::get_subnets($vnetid); + my $subnets = PVE::Network::SDN::Vnets::get_subnets($vnetid, 1); my ($ip, $mask) = split(/\//, $cidr); my ($subnetid, $subnet) = PVE::Network::SDN::Subnets::find_ip_subnet($ip, $subnets); @@ -109,7 +117,7 @@ sub add_ip { sub del_ip { my ($vnetid, $cidr, $hostname) = @_; - my $subnets = PVE::Network::SDN::Vnets::get_subnets($vnetid); + my $subnets = PVE::Network::SDN::Vnets::get_subnets($vnetid, 1); my ($ip, $mask) = split(/\//, $cidr); my ($subnetid, $subnet) = PVE::Network::SDN::Subnets::find_ip_subnet($ip, $subnets); diff --git a/PVE/Network/SDN/Zones.pm b/PVE/Network/SDN/Zones.pm index 25af088..75f3233 100644 --- a/PVE/Network/SDN/Zones.pm +++ b/PVE/Network/SDN/Zones.pm @@ -11,7 +11,6 @@ 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; @@ -76,11 +75,13 @@ sub complete_sdn_zone { 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'); + my $cfg = PVE::Network::SDN::config(); + + my $version = $cfg->{version}; + my $vnet_cfg = $cfg->{vnets}; + my $zone_cfg = $cfg->{zones}; + my $subnet_cfg = $cfg->{subnets}; + my $controller_cfg = $cfg->{controllers}; return if !$vnet_cfg && !$zone_cfg; my $interfaces_config = PVE::INotify::read_file('interfaces'); @@ -188,7 +189,8 @@ sub status { my $err_config = undef; my $local_version = PVE::Network::SDN::Zones::read_etc_network_config_version(); - my $sdn_version = PVE::Cluster::cfs_read_file('sdn/.version'); + my $cfg = PVE::Network::SDN::config(); + my $sdn_version = $cfg->{version}; return if !$sdn_version; @@ -210,8 +212,9 @@ sub status { my $status = ifquery_check(); - my $vnet_cfg = PVE::Cluster::cfs_read_file('sdn/vnets.cfg'); - my $zone_cfg = PVE::Cluster::cfs_read_file('sdn/zones.cfg'); + + my $vnet_cfg = $cfg->{vnets}; + my $zone_cfg = $cfg->{zones}; my $nodename = PVE::INotify::nodename(); my $vnet_status = {}; @@ -253,7 +256,7 @@ sub status { sub tap_create { my ($iface, $bridge) = @_; - my $vnet = PVE::Network::SDN::Vnets::get_vnet($bridge); + my $vnet = PVE::Network::SDN::Vnets::get_vnet($bridge, 1); if (!$vnet) { # fallback for classic bridge PVE::Network::tap_create($iface, $bridge); return; @@ -267,7 +270,7 @@ sub tap_create { sub veth_create { my ($veth, $vethpeer, $bridge, $hwaddr) = @_; - my $vnet = PVE::Network::SDN::Vnets::get_vnet($bridge); + my $vnet = PVE::Network::SDN::Vnets::get_vnet($bridge, 1); if (!$vnet) { # fallback for classic bridge PVE::Network::veth_create($veth, $vethpeer, $bridge, $hwaddr); return; @@ -281,7 +284,7 @@ sub veth_create { sub tap_plug { my ($iface, $bridge, $tag, $firewall, $trunks, $rate) = @_; - my $vnet = PVE::Network::SDN::Vnets::get_vnet($bridge); + my $vnet = PVE::Network::SDN::Vnets::get_vnet($bridge, 1); if (!$vnet) { # fallback for classic bridge PVE::Network::tap_plug($iface, $bridge, $tag, $firewall, $trunks, $rate); return; diff --git a/PVE/Network/SDN/Zones/EvpnPlugin.pm b/PVE/Network/SDN/Zones/EvpnPlugin.pm index d5ee56b..2191008 100644 --- a/PVE/Network/SDN/Zones/EvpnPlugin.pm +++ b/PVE/Network/SDN/Zones/EvpnPlugin.pm @@ -79,7 +79,7 @@ sub generate_sdn_config { @iface_config = (); my $address = {}; - my $subnets = PVE::Network::SDN::Vnets::get_subnets($vnetid); + my $subnets = PVE::Network::SDN::Vnets::get_subnets($vnetid, 1); foreach my $subnetid (sort keys %{$subnets}) { my $subnet = $subnets->{$subnetid}; my $cidr = $subnetid =~ s/-/\//r; diff --git a/PVE/Network/SDN/Zones/SimplePlugin.pm b/PVE/Network/SDN/Zones/SimplePlugin.pm index c58ae87..c0ab1fe 100644 --- a/PVE/Network/SDN/Zones/SimplePlugin.pm +++ b/PVE/Network/SDN/Zones/SimplePlugin.pm @@ -36,7 +36,7 @@ sub generate_sdn_config { my @iface_config = (); my $address = {}; - my $subnets = PVE::Network::SDN::Vnets::get_subnets($vnetid); + my $subnets = PVE::Network::SDN::Vnets::get_subnets($vnetid, 1); foreach my $subnetid (sort keys %{$subnets}) { my $subnet = $subnets->{$subnetid}; my $cidr = $subnetid =~ s/-/\//r; diff --git a/test/generateconfig.pl b/test/generateconfig.pl index 92108ec..250db43 100644 --- a/test/generateconfig.pl +++ b/test/generateconfig.pl @@ -8,6 +8,7 @@ use PVE::Network::SDN::Zones; use PVE::Network::SDN::Controllers; use Data::Dumper; +PVE::Network::SDN::commit_config(); my $network_config = PVE::Network::SDN::Zones::generate_etc_network_config(); PVE::Network::SDN::Zones::write_etc_network_config($network_config); @@ -16,6 +17,7 @@ print $network_config; print "\n"; my $controller_config = PVE::Network::SDN::Controllers::generate_controller_config(); + if ($controller_config) { print Dumper($controller_config); PVE::Network::SDN::Controllers::write_controller_config($controller_config); -- 2.20.1