From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <pve-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
	by lore.proxmox.com (Postfix) with ESMTPS id A8C901FF16E
	for <inbox@lore.proxmox.com>; Mon,  9 Dec 2024 12:33:05 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
	by firstgate.proxmox.com (Proxmox) with ESMTP id 2B9752F2;
	Mon,  9 Dec 2024 12:33:01 +0100 (CET)
To: pve-devel@lists.proxmox.com
Date: Mon,  9 Dec 2024 12:31:58 +0100
In-Reply-To: <20241209113158.7343-1-lou.lecrivain@wdz.de>
References: <20241209113158.7343-1-lou.lecrivain@wdz.de>
MIME-Version: 1.0
Message-ID: <mailman.96.1733743980.332.pve-devel@lists.proxmox.com>
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Post: <mailto:pve-devel@lists.proxmox.com>
From: Lou Lecrivain via pve-devel <pve-devel@lists.proxmox.com>
Precedence: list
Cc: Lou Lecrivain <lou.lecrivain@wdz.de>
X-Mailman-Version: 2.1.29
X-BeenThere: pve-devel@lists.proxmox.com
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, 
 <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, 
 <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
Subject: [pve-devel] SPAM: [PATCH pve-network v2 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="===============4781027866798789908=="
Errors-To: pve-devel-bounces@lists.proxmox.com
Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com>

--===============4781027866798789908==
Content-Type: message/rfc822
Content-Disposition: inline

Return-Path: <lou.lecrivain@orange.fr>
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 F1053C1881
	for <pve-devel@lists.proxmox.com>; Mon,  9 Dec 2024 12:32:59 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
	by firstgate.proxmox.com (Proxmox) with ESMTP id C849A18C
	for <pve-devel@lists.proxmox.com>; Mon,  9 Dec 2024 12:32:29 +0100 (CET)
Received: from smtp.smtpout.orange.fr (smtp-76.smtpout.orange.fr [80.12.242.76])
	(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 <pve-devel@lists.proxmox.com>; Mon,  9 Dec 2024 12:32:29 +0100 (CET)
Received: from localhost ([176.139.8.107])
	by smtp.orange.fr with ESMTPA
	id KbzytBjcilrsfKbzytPQZx; Mon, 09 Dec 2024 12:32:22 +0100
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=orange.fr;
	s=t20230301; t=1733743942;
	bh=uER7q0OJwg5Met6FPARhkvCjFN/JYqYIYFyaj1DjGRE=;
	h=From:To:Subject:Date:Message-Id:MIME-Version;
	b=HlA2z38xLSVJYlU9ZzdQnwmWb8ywEvyGbELd/FOX2IFfUOaKuuq8KHii7I1mybprE
	 9cHLJPNUM1HP5YB6Yk+IwAea7lQZ2A/XsseMQ6XnrWNi2dDRJIOkkpoPKRwPtK/qhP
	 snJwdcf/ep1gIAA5H1lbDrNL+QTuE0TSRXEJmXGHUSVHaQIDoNixDjEPmcYUPf7wxp
	 OhnZaHuUCE5jcgeH3Iu9DfDOhXC/UGGfd0DhQbrdnPG88tTjgMfBgAeN41AAFQ3TOn
	 LxHXbQQcz3mbRn1ghKMWeKvqsyOWMOeh/s6Pd/KNWaFDR6I24Xak2rWRVo3yHUemoR
	 QyaKY5xp8TH2g==
X-ME-Helo: localhost
X-ME-Auth: bG91LmxlY3JpdmFpbkBvcmFuZ2UuZnI=
X-ME-Date: Mon, 09 Dec 2024 12:32:22 +0100
X-ME-IP: 176.139.8.107
From: Lou Lecrivain <lou.lecrivain@wdz.de>
To: pve-devel@lists.proxmox.com
subject: SPAM: [PATCH pve-network v2 4/4] update tests following changes to behaviour: - allocating IPs also when prefix-only - PVE IPAM register details for every allocation strategy
Date: Mon,  9 Dec 2024 12:31:58 +0100
Message-Id: <20241209113158.7343-5-lou.lecrivain@wdz.de>
X-Mailer: git-send-email 2.39.5
In-Reply-To: <20241209113158.7343-1-lou.lecrivain@wdz.de>
References: <20241209113158.7343-1-lou.lecrivain@wdz.de>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results:  4
	AWL                    -0.095 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.249 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_H4       -0.01 Very Good reputation (+4)
	RCVD_IN_MSPIKE_WL       -0.01 Mailspike good senders
	SPF_HELO_PASS          -0.001 SPF: HELO matches SPF record
	SPF_PASS               -0.001 SPF: sender matches SPF record

Signed-off-by: lou lecrivain <lou.lecrivain@wdz.de>
---
 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.39.5



--===============4781027866798789908==
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

--===============4781027866798789908==--