From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 080551FF15C for ; Wed, 27 Nov 2024 17:28:40 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 03AD91B965; Wed, 27 Nov 2024 17:28:06 +0100 (CET) To: pve-devel@lists.proxmox.com Date: Wed, 27 Nov 2024 17:17:58 +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 11/16] ipam: nautobot: add update_ip sub Content-Type: multipart/mixed; boundary="===============2234819641615013726==" Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" --===============2234819641615013726== 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 E4B62CB03A for ; Wed, 27 Nov 2024 17:28:03 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A24CF1B5CE for ; Wed, 27 Nov 2024 17:27:33 +0100 (CET) Received: from smtp.smtpout.orange.fr (smtp-20.smtpout.orange.fr [80.12.242.20]) (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:33 +0100 (CET) Received: from localhost ([176.139.8.107]) by smtp.orange.fr with ESMTPA id GKkItdHuRqIR0GKkItPWw9; Wed, 27 Nov 2024 17:18:30 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=orange.fr; s=t20230301; t=1732724310; bh=yrTBwB4l1LVrxTF4Dugt6IT3oV/51Bd7uAFlpLccHOo=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=B3pv6UaAAcJVlqZKxPX4UvlNsTGxbYb8UyAUCxVc3IZgax9NeG0JdvHG/xtYg8PW/ iBAVCLrpBCRxkGdpgE/i2ttJei2sotN7+fktZn152GjPt0hPk9J7H/F+xKiWwuICpU s93zZRTznzOSzET2ApAYTFVRjAKig9zzXCP8Ccpl99auFYCBvJE0dSf4QmleQNJi68 7JxV3GmJdxw98PbK16JhdpeNqneTU6pWnKdzyi1XdtQGWOmauO29PgiI5MwG0f5eWE ZGPG5Ixqw3QLppxBR6a2HtiCQKYqQF02ast/vPkBTjjG1soTs3V711fNpWtWbnCdDW I2w/JPJKlYCnA== X-ME-Helo: localhost X-ME-Auth: bG91LmxlY3JpdmFpbkBvcmFuZ2UuZnI= X-ME-Date: Wed, 27 Nov 2024 17:18:30 +0100 X-ME-IP: 176.139.8.107 From: Lou Lecrivain To: pve-devel@lists.proxmox.com subject: SPAM: [PATCH pve-network 11/16] ipam: nautobot: add update_ip sub Date: Wed, 27 Nov 2024 17:17:58 +0100 Message-Id: <20241127161803.8866-12-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 AWL 0.000 Adjusted score from AWL reputation of From: address 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 SPF_HELO_PASS -0.001 SPF: HELO matches SPF record SPF_PASS -0.001 SPF: sender matches SPF record + use default_headers to avoid code repetition Signed-off-by: lou lecrivain --- src/PVE/Network/SDN/Ipams/NautobotPlugin.pm | 45 ++++++++++++++++++--- 1 file changed, 39 insertions(+), 6 deletions(-) diff --git a/src/PVE/Network/SDN/Ipams/NautobotPlugin.pm b/src/PVE/Network/SDN/Ipams/NautobotPlugin.pm index c6581f9..e328c9f 100644 --- a/src/PVE/Network/SDN/Ipams/NautobotPlugin.pm +++ b/src/PVE/Network/SDN/Ipams/NautobotPlugin.pm @@ -32,6 +32,13 @@ sub default_ip_status { return 'Active'; } +sub default_headers { + my ($plugin_config) = @_; + my $token = $plugin_config->{token}; + + return ['Content-Type' => "application/json", 'Authorization' => "token $token", 'Accept' => "application/json"]; +} + # implem sub add_subnet { @@ -40,9 +47,8 @@ sub add_subnet { my $cidr = $subnet->{cidr}; my $gateway = $subnet->{gateway}; my $url = $plugin_config->{url}; - my $token = $plugin_config->{token}; my $namespace = $plugin_config->{namespace}; - my $headers = ['Content-Type' => "application/json", 'Authorization' => "token $token", 'Accept' => "application/json"]; + my $headers = default_headers($plugin_config); my $internalid = PVE::Network::SDN::Ipams::NetboxPlugin::get_prefix_id($url, $cidr, $headers); @@ -64,9 +70,8 @@ sub add_ip { my $mask = $subnet->{mask}; my $url = $plugin_config->{url}; - my $token = $plugin_config->{token}; my $namespace = $plugin_config->{namespace}; - my $headers = ['Content-Type' => "application/json", 'Authorization' => "token $token", 'Accept' => "application/json"]; + my $headers = default_headers($plugin_config); my $description = undef; if ($is_gateway) { @@ -91,13 +96,41 @@ sub add_ip { } +sub update_ip { + my ($class, $plugin_config, $subnetid, $subnet, $ip, $hostname, $mac, $vmid, $is_gateway, $noerr) = @_; + + my $mask = $subnet->{mask}; + my $url = $plugin_config->{url}; + my $namespace = $plugin_config->{namespace}; + my $headers = default_headers($plugin_config); + + my $description = undef; + if ($is_gateway) { + $description = 'gateway' + } elsif ($mac) { + $description = "mac:$mac"; + } + + my $params = { address => "$ip/$mask", type => "dhcp", dns_name => $hostname, description => $description, namespace => $namespace, status => default_ip_status()}; + + my $ip_id = PVE::Network::SDN::Ipams::NetboxPlugin::get_ip_id($url, $ip, $headers); + die "can't find ip $ip in ipam" if !$ip_id; + + eval { + PVE::Network::SDN::api_request("PATCH", "$url/ipam/ip-addresses/$ip_id/", $headers, $params); + }; + if ($@) { + die "error updating ip $ip: $@" if !$noerr; + } +} + + sub verify_api { my ($class, $plugin_config) = @_; my $url = $plugin_config->{url}; - my $token = $plugin_config->{token}; my $namespace = $plugin_config->{namespace}; - my $headers = ['Content-Type' => "application/json", 'Authorization' => "token $token", 'Accept' => "application/json"]; + my $headers = default_headers($plugin_config); # check that the namespace exists AND that default IP active status # exists AND that we have indeed API access -- 2.39.5 --===============2234819641615013726== 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 --===============2234819641615013726==--