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 386A865F28 for ; Tue, 5 Jan 2021 10:35:43 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2B64E25551 for ; Tue, 5 Jan 2021 10:35:43 +0100 (CET) Received: from kvmformation1.odiso.net (globalOdiso.M6Lille.odiso.net [89.248.211.242]) by firstgate.proxmox.com (Proxmox) with ESMTP id 904C0254CA for ; Tue, 5 Jan 2021 10:35:37 +0100 (CET) Received: by kvmformation1.odiso.net (Postfix, from userid 0) id 6B980168B9C; Tue, 5 Jan 2021 10:35:37 +0100 (CET) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Tue, 5 Jan 2021 10:35:28 +0100 Message-Id: <20210105093536.1727641-8-aderumier@odiso.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210105093536.1727641-1-aderumier@odiso.com> References: <20210105093536.1727641-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 1 AWL -0.139 Adjusted score from AWL reputation of From: address HEADER_FROM_DIFFERENT_DOMAINS 0.248 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.287 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [phpipamplugin.pm] Subject: [pve-devel] [PATCH pve-network 07/15] ipam: phpipam: rename get_internal to get_prefix_id (like netbox) 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: Tue, 05 Jan 2021 09:35:43 -0000 Signed-off-by: Alexandre Derumier --- PVE/Network/SDN/Ipams/PhpIpamPlugin.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/PVE/Network/SDN/Ipams/PhpIpamPlugin.pm b/PVE/Network/SDN/Ipams/PhpIpamPlugin.pm index 7147916..235d553 100644 --- a/PVE/Network/SDN/Ipams/PhpIpamPlugin.pm +++ b/PVE/Network/SDN/Ipams/PhpIpamPlugin.pm @@ -51,7 +51,7 @@ sub add_subnet { my $headers = ['Content-Type' => 'application/json; charset=UTF-8', 'Token' => $token]; #search subnet - my $internalid = get_internalid($url, $cidr, $headers); + my $internalid = get_prefix_id($url, $cidr, $headers); #create subnet if (!$internalid) { @@ -80,7 +80,7 @@ sub del_subnet { my $section = $plugin_config->{section}; my $headers = ['Content-Type' => 'application/json; charset=UTF-8', 'Token' => $token]; - my $internalid = get_internalid($url, $cidr, $headers); + my $internalid = get_prefix_id($url, $cidr, $headers); return if !$internalid; return; #fixme: check that prefix is empty exluding gateway, before delete @@ -103,7 +103,7 @@ sub add_ip { my $section = $plugin_config->{section}; my $headers = ['Content-Type' => 'application/json; charset=UTF-8', 'Token' => $token]; - my $internalid = get_internalid($url, $cidr, $headers); + my $internalid = get_prefix_id($url, $cidr, $headers); my $params = { ip => $ip, subnetId => $internalid, @@ -160,7 +160,7 @@ sub add_next_freeip { my $section = $plugin_config->{section}; my $headers = ['Content-Type' => 'application/json; charset=UTF-8', 'Token' => $token]; - my $internalid = get_internalid($url, $cidr, $headers); + my $internalid = get_prefix_id($url, $cidr, $headers); my $params = { hostname => $hostname, description => $description, @@ -226,7 +226,7 @@ sub on_update_hook { #helpers -sub get_internalid { +sub get_prefix_id { my ($url, $cidr, $headers) = @_; my $result = PVE::Network::SDN::api_request("GET", "$url/subnets/cidr/$cidr", $headers); -- 2.20.1