matthieu/pve-network
1
0
Fork 0
forked from Mirror/pve-network
Code Pull requests Activity

update tests following changes to behaviour:

Browse source 
- allocating IPs also when prefix-only
- PVE IPAM register details for every allocation strategy

Signed-off-by: lou lecrivain <lou.lecrivain@wdz.de>
Tested-by: Stefan Hanreich <s.hanreich@proxmox.com>
Reviewed-by: Stefan Hanreich <s.hanreich@proxmox.com>
Tested-by: Hannes Duerr <h.duerr@proxmox.com>
Link: https://lore.proxmox.com/mailman.185.1734119199.332.pve-devel@lists.proxmox.com
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Lou Lecrivain 2024-12-13 20:45:40 +01:00 committed by Thomas Lamprecht
parent 5a050f4d4c
commit 2eb697c39e
2 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/test/run_test_subnets.pl
View file

@ -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

6
src/test/run_test_vnets_blackbox.pl
View file

@ -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";