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 38B7B986CE for ; Wed, 15 Nov 2023 15:22:21 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 180E17732 for ; Wed, 15 Nov 2023 15:22:21 +0100 (CET) Received: from bastionodiso.odiso.net (bastionodiso.odiso.net [185.151.191.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 15 Nov 2023 15:22:16 +0100 (CET) Received: from kvmformation3.odiso.net (formationkvm3.odiso.net [10.3.94.12]) by bastionodiso.odiso.net (Postfix) with ESMTP id DC3948106; Wed, 15 Nov 2023 15:22:09 +0100 (CET) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id C19221181B0; Wed, 15 Nov 2023 15:22:09 +0100 (CET) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Wed, 15 Nov 2023 15:21:55 +0100 Message-Id: <20231115142208.563587-3-aderumier@odiso.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231115142208.563587-1-aderumier@odiso.com> References: <20231115142208.563587-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.028 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 HEADER_FROM_DIFFERENT_DOMAINS 0.25 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 SPF_NONE 0.001 SPF: sender does not publish an SPF Record T_SCC_BODY_TEXT_LINE -0.01 - T_SPF_HELO_TEMPERROR 0.01 SPF: test of HELO record failed (temperror) URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [config.pm, lxc.pm] Subject: [pve-devel] [PATCH pve-container 1/6] nic hotplug : add|del ips in ipam 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: Wed, 15 Nov 2023 14:22:21 -0000 Signed-off-by: Alexandre Derumier --- src/PVE/LXC.pm | 17 +++++++++++++++++ src/PVE/LXC/Config.pm | 12 ++++++++++++ 2 files changed, 29 insertions(+) diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm index 7ec816b..7ccef08 100644 --- a/src/PVE/LXC.pm +++ b/src/PVE/LXC.pm @@ -961,6 +961,12 @@ sub update_net { safe_string_ne($oldnet->{name}, $newnet->{name})) { PVE::Network::veth_delete($veth); + + if ($have_sdn) { + eval { PVE::Network::SDN::Vnets::del_ips_from_mac($oldnet->{bridge}, $oldnet->{hwaddr}, $conf->{hostname}) }; + warn $@ if $@; + } + delete $conf->{$opt}; PVE::LXC::Config->write_config($vmid, $conf); @@ -974,14 +980,23 @@ sub update_net { ) { if ($oldnet->{bridge}) { + PVE::Network::tap_unplug($veth); foreach (qw(bridge tag firewall)) { delete $oldnet->{$_}; } $conf->{$opt} = PVE::LXC::Config->print_lxc_network($oldnet); PVE::LXC::Config->write_config($vmid, $conf); + + if ($have_sdn) { + eval { PVE::Network::SDN::Vnets::del_ips_from_mac($oldnet->{bridge}, $oldnet->{hwaddr}, $conf->{hostname}) }; + warn $@ if $@; + } } + if ($have_sdn) { + PVE::Network::SDN::Vnets::add_next_free_cidr($newnet->{bridge}, $conf->{hostname}, $newnet->{hwaddr}, "vmid: $vmid", undef, 1); + } PVE::LXC::net_tap_plug($veth, $newnet); # This includes the rate: @@ -1012,6 +1027,8 @@ sub hotplug_net { my $eth = $newnet->{name}; if ($have_sdn) { + PVE::Network::SDN::Vnets::add_next_free_cidr($newnet->{bridge}, $conf->{hostname}, $newnet->{hwaddr}, "vmid: $vmid", undef, 1); + PVE::Network::SDN::Vnets::add_dhcp_mapping($newnet->{bridge}, $newnet->{hwaddr}); PVE::Network::SDN::Zones::veth_create($veth, $vethpeer, $newnet->{bridge}, $newnet->{hwaddr}); } else { PVE::Network::veth_create($veth, $vethpeer, $newnet->{bridge}, $newnet->{hwaddr}); diff --git a/src/PVE/LXC/Config.pm b/src/PVE/LXC/Config.pm index 56e1f10..c884313 100644 --- a/src/PVE/LXC/Config.pm +++ b/src/PVE/LXC/Config.pm @@ -22,6 +22,12 @@ use constant { FITHAW => 0xc0045878, }; +my $have_sdn; +eval { + require PVE::Network::SDN::Vnets; + $have_sdn = 1; +}; + my $nodename = PVE::INotify::nodename(); my $lock_handles = {}; my $lockdir = "/run/lock/lxc"; @@ -1383,6 +1389,12 @@ sub vmconfig_hotplug_pending { } elsif ($opt =~ m/^net(\d)$/) { my $netid = $1; PVE::Network::veth_delete("veth${vmid}i$netid"); + if ($have_sdn) { + my $net = PVE::LXC::Config->parse_lxc_network($conf->{$opt}); + print "delete ips from $opt\n"; + eval { PVE::Network::SDN::Vnets::del_ips_from_mac($net->{bridge}, $net->{hwaddr}, $conf->{hostname}) }; + warn $@ if $@; + } } else { die "skip\n"; # skip non-hotpluggable opts } -- 2.39.2