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 1A2C31FF171 for ; Fri, 13 Dec 2024 20:46:43 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3FA631488D; Fri, 13 Dec 2024 20:46:40 +0100 (CET) To: pve-devel@lists.proxmox.com Date: Fri, 13 Dec 2024 20:45:40 +0100 In-Reply-To: <20241213194539.43105-2-lou.lecrivain@wdz.de> References: <20241213194539.43105-2-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 v3 4/4] update tests following changes to behaviour: - allocating IPs also when prefix-only - PVE IPAM register details for every allocation strategy Content-Type: multipart/mixed; boundary="===============2173498721778457746==" Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" --===============2173498721778457746== 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 5D034C2AFE for ; Fri, 13 Dec 2024 20:46:39 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4750E1476F for ; Fri, 13 Dec 2024 20:46:38 +0100 (CET) Received: from smtp-tls.etu.univ-nantes.fr (smtptlsetu1-cha.cpub.univ-nantes.fr [IPv6:2001:660:7220:385:193:52:103:133]) (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 ; Fri, 13 Dec 2024 20:46:37 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by smtp-tls.etu.univ-nantes.fr (Postfix) with ESMTP id 7F8AB2035B; Fri, 13 Dec 2024 20:46:30 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at smtptlsetu1-cha.cpub.univ-nantes.fr Received: from smtp-tls.etu.univ-nantes.fr ([127.0.0.1]) by localhost (smtptlsetu1-cha.cpub.univ-nantes.fr [127.0.0.1]) (amavisd-new, port 10024) with LMTP id C2mZjS4UnwuA; Fri, 13 Dec 2024 20:46:30 +0100 (CET) Received: from localhost.localdomain (ip-185-104-138-75.ptr.icomera.net [185.104.138.75]) (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 smtp-tls.etu.univ-nantes.fr (Postfix) with ESMTPSA id E9AD920355; Fri, 13 Dec 2024 20:46:29 +0100 (CET) From: lou lecrivain To: pve-devel@lists.proxmox.com subject: SPAM: [PATCH pve-network v3 4/4] update tests following changes to behaviour: - allocating IPs also when prefix-only - PVE IPAM register details for every allocation strategy Date: Fri, 13 Dec 2024 20:45:40 +0100 Message-ID: <20241213194539.43105-5-lou.lecrivain@wdz.de> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241213194539.43105-2-lou.lecrivain@wdz.de> References: <20241213194539.43105-2-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% DMARC_REJECT 0.1 DMARC reject policy KAM_DMARC_REJECT 6 DKIM has Failed or SPF has failed on the message and the domain has a DMARC reject policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record T_SPF_PERMERROR 0.01 SPF: test of record failed (permerror) From: Lou Lecrivain Signed-off-by: lou lecrivain Tested-by: Stefan Hanreich Reviewed-by: Stefan Hanreich --- src/test/run_test_subnets.pl | 24 +++++++++++++++++++++--- src/test/run_test_vnets_blackbox.pl | 6 ++---- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/src/test/run_test_subnets.pl b/src/test/run_test_subnets.pl index d1af0b3..79186c2 100755 --- a/src/test/run_test_subnets.pl +++ b/src/test/run_test_subnets.pl @@ -237,7 +237,13 @@ foreach my $path (@plugins) { . $ip . '":{"gateway":1},"' . $ipnextfree - . '":{},"' + . '":{"hostname":"' + . $hostname + . '","mac":"' + . $mac + . '","vmid":"' + . $vmid + . '"},"' . $ip2 . '":{"hostname":"' . $hostname @@ -268,7 +274,13 @@ foreach my $path (@plugins) { . $subnet_cidr . '":{"ips":{"' . $ipnextfree - . '":{},"' + . '":{"hostname":"' + . $hostname + . '","mac":"' + . $mac + . '","vmid":"' + . $vmid + . '"},"' . $ip2 . '":{"hostname":"' . $hostname @@ -328,7 +340,13 @@ foreach my $path (@plugins) { . $subnet_cidr . '":{"ips":{"' . $ipnextfree - . '":{},"' + . '":{"hostname":"' + . $hostname + . '","mac":"' + . $mac + . '","vmid":"' + . $vmid + . '"},"' . $ip2 . '":{"hostname":"' . $hostname diff --git a/src/test/run_test_vnets_blackbox.pl b/src/test/run_test_vnets_blackbox.pl index f7caca2..b79e1dc 100755 --- a/src/test/run_test_vnets_blackbox.pl +++ b/src/test/run_test_vnets_blackbox.pl @@ -413,7 +413,6 @@ sub test_nic_join { die "$test_name: we're expecting an array of subnets" if !$subnets; my $num_subnets = scalar $subnets->@*; die "$test_name: we're expecting an array of subnets. $num_subnets elements found" if ($num_subnets < 1); - my $num_dhcp_ranges = scalar grep { $_->{'dhcp-range'} } $subnets->@*; my $zoneid = "TESTZONE"; my $vnetid = "testvnet"; @@ -452,7 +451,7 @@ sub test_nic_join { my @ips = get_ips_from_mac($mac); my $num_ips = scalar @ips; - is ($num_ips, $num_dhcp_ranges, "$test_name: Expecting $num_dhcp_ranges IPs, found $num_ips"); + is ($num_ips, $num_subnets, "$test_name: Expecting $num_subnets IPs, found $num_ips"); ok ((all { ($_->{vnet} eq $vnetid && $_->{zone} eq $zoneid) } @ips), "$test_name: all IPs in correct vnet and zone" ); @@ -678,8 +677,7 @@ sub test_nic_start { die "$test_name: we're expecting an array of subnets" if !$subnets; my $num_subnets = scalar $subnets->@*; die "$test_name: we're expecting an array of subnets. $num_subnets elements found" if ($num_subnets < 1); - - $num_expected_ips = scalar grep { $_->{'dhcp-range'} } $subnets->@* if !defined $num_expected_ips; + $num_expected_ips = $num_subnets if !defined $num_expected_ips; my $zoneid = "TESTZONE"; my $vnetid = "testvnet"; -- 2.47.0 --===============2173498721778457746== 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 --===============2173498721778457746==--