From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 90AFA1FF15C for ; Wed, 27 Nov 2024 17:28:02 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1F9A31B684; Wed, 27 Nov 2024 17:27:42 +0100 (CET) To: pve-devel@lists.proxmox.com Date: Wed, 27 Nov 2024 17:18:02 +0100 In-Reply-To: <20241127161803.8866-1-lou.lecrivain@wdz.de> References: <20241127161803.8866-1-lou.lecrivain@wdz.de> MIME-Version: 1.0 Message-ID: List-Id: Proxmox VE development discussion List-Post: From: Lou Lecrivain via pve-devel Precedence: list Cc: Lou Lecrivain X-Mailman-Version: 2.1.29 X-BeenThere: pve-devel@lists.proxmox.com List-Subscribe: , List-Unsubscribe: , List-Archive: Reply-To: Proxmox VE development discussion List-Help: Subject: [pve-devel] SPAM: [PATCH pve-network 15/16] ipam: nautobot: implement plain prefix allocation (without ranges) Content-Type: multipart/mixed; boundary="===============5310919381914537175==" Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" --===============5310919381914537175== Content-Type: message/rfc822 Content-Disposition: inline Return-Path: X-Original-To: pve-devel@lists.proxmox.com Delivered-To: pve-devel@lists.proxmox.com 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 E7321CAFD4 for ; Wed, 27 Nov 2024 17:27:39 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D0C121B0F6 for ; Wed, 27 Nov 2024 17:27:09 +0100 (CET) Received: from smtp.smtpout.orange.fr (smtp-26.smtpout.orange.fr [80.12.242.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 27 Nov 2024 17:27:09 +0100 (CET) Received: from localhost ([176.139.8.107]) by smtp.orange.fr with ESMTPA id GKkLt8WKCTyP2GKkLtuJfs; Wed, 27 Nov 2024 17:18:34 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=orange.fr; s=t20230301; t=1732724314; bh=yjbTLSq6A1X00u1jucAdlIumCy3Nmc4LnwAZNmOH66U=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=AfOturE7iOn7VoGyKDX3R7Q3/vQA7xWScBtBQKWG7WbQmTLzcrHvqzFym1PZVlOJh FPLhnrOOBdXxu47WLsdO94TpShCAijhhb80p9F9q5phI108GiZ+0CaQXr5m6o0+gaz boG85i+z+qBxnhSVoUDIBOISm1Lv65qnHkX0JqT/MFayXzgS2tWV4bvMWQGGNbnfTH v9jq1OqWX18IlQt/11sY+DbSEf8E43w48J6uDfBJhKU7m6vOu4Haf6bkcNJOfiAThm e/uwFXEtGaGSCGA8Z8uXOjC22nCjPLzNh8KEnn2PBP4pB4nlJQnveClCDEMSGwGuuX hpBwHJntC7/rA== X-ME-Helo: localhost X-ME-Auth: bG91LmxlY3JpdmFpbkBvcmFuZ2UuZnI= X-ME-Date: Wed, 27 Nov 2024 17:18:34 +0100 X-ME-IP: 176.139.8.107 From: Lou Lecrivain To: pve-devel@lists.proxmox.com subject: SPAM: [PATCH pve-network 15/16] ipam: nautobot: implement plain prefix allocation (without ranges) Date: Wed, 27 Nov 2024 17:18:02 +0100 Message-Id: <20241127161803.8866-16-lou.lecrivain@wdz.de> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241127161803.8866-1-lou.lecrivain@wdz.de> References: <20241127161803.8866-1-lou.lecrivain@wdz.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 4 BAYES_00 -1.9 Bayes spam probability is 0 to 1% DKIM_SIGNED 0.1 Message has a DKIM or DK signature, not necessarily valid DKIM_VALID -0.1 Message has at least one valid DKIM or DK signature DKIM_VALID_EF -0.1 Message has a valid DKIM or DK signature from envelope-from domain DMARC_REJECT 0.1 DMARC reject policy FREEMAIL_FORGED_FROMDOMAIN 0.001 2nd level domains in From and EnvelopeFrom freemail headers are different FREEMAIL_FROM 0.001 Sender email is commonly abused enduser mail provider HEADER_FROM_DIFFERENT_DOMAINS 0.001 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_REJECT 6 DKIM has Failed or SPF has failed on the message and the domain has a DMARC reject policy RCVD_IN_DNSWL_NONE -0.0001 Sender listed at https://www.dnswl.org/, no trust RCVD_IN_MSPIKE_H3 0.001 Good reputation (+3) RCVD_IN_MSPIKE_WL 0.001 Mailspike good senders RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_PASS -0.001 SPF: HELO matches SPF record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [nautobotplugin.pm,orange.fr] + bugfix (return from eval was garbage-collected, callers got undef) Signed-off-by: lou lecrivain --- src/PVE/Network/SDN/Ipams/NautobotPlugin.pm | 30 ++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/src/PVE/Network/SDN/Ipams/NautobotPlugin.pm b/src/PVE/Network/SDN/Ipams/NautobotPlugin.pm index 95e749c..e3ba57c 100644 --- a/src/PVE/Network/SDN/Ipams/NautobotPlugin.pm +++ b/src/PVE/Network/SDN/Ipams/NautobotPlugin.pm @@ -96,6 +96,33 @@ sub add_ip { } } +sub add_next_freeip { + my ($class, $plugin_config, $subnetid, $subnet, $hostname, $mac, $vmid, $noerr) = @_; + + my $cidr = $subnet->{cidr}; + + my $url = $plugin_config->{url}; + my $namespace = $plugin_config->{namespace}; + my $headers = default_headers($plugin_config); + + my $internalid = PVE::Network::SDN::Ipams::NetboxPlugin::get_prefix_id($url, $cidr, $headers); + + my $description = "mac:$mac" if $mac; + + my $params = { type => "dhcp", dns_name => $hostname, description => $description, namespace => $namespace, status => default_ip_status() }; + + my $ip = eval { + my $result = PVE::Network::SDN::api_request("POST", "$url/ipam/prefixes/$internalid/available-ips/", $headers, $params); + my ($ip, undef) = split(/\//, $result->{address}); + return $ip; + }; + + if ($@) { + die "can't find free ip in subnet $cidr: $@" if !$noerr; + } + return $ip; +} + sub add_range_next_freeip { my ($class, $plugin_config, $subnet, $range, $data, $noerr) = @_; @@ -107,7 +134,7 @@ sub add_range_next_freeip { my $minimal_size = NetAddr::IP->new($range->{'start-address'}) - NetAddr::IP->new($cidr); my $internalid = PVE::Network::SDN::Ipams::NetboxPlugin::get_prefix_id($url, $cidr, $headers); - eval { + my $ip = eval { my $result = PVE::Network::SDN::api_request("GET", "$url/ipam/prefixes/$internalid/available-ips/?limit=$minimal_size", $headers); # v important for NetAddr::IP comparison! my @ips = map((split(/\//,$_->{address}))[0], @{$result}); @@ -125,6 +152,7 @@ sub add_range_next_freeip { if ($@) { die "can't find free ip in range $range->{'start-address'}-$range->{'end-address'}: $@" if !$noerr; } + return $ip; } -- 2.39.5 --===============5310919381914537175== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel --===============5310919381914537175==--