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 9279A9A35B for ; Tue, 14 Nov 2023 19:06:31 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A7D301F7EF for ; Tue, 14 Nov 2023 19:06:29 +0100 (CET) Received: from lana.proxmox.com (unknown [94.136.29.99]) by firstgate.proxmox.com (Proxmox) with ESMTP for ; Tue, 14 Nov 2023 19:06:26 +0100 (CET) Received: by lana.proxmox.com (Postfix, from userid 10043) id 0AF232C4368; Tue, 14 Nov 2023 19:06:24 +0100 (CET) From: Stefan Hanreich To: pve-devel@lists.proxmox.com Date: Tue, 14 Nov 2023 19:06:12 +0100 Message-Id: <20231114180620.2635449-15-s.hanreich@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231114180620.2635449-1-s.hanreich@proxmox.com> References: <20231114180620.2635449-1-s.hanreich@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.498 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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 RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [WIP v3 pve-network 14/22] sdn: fix tests 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, 14 Nov 2023 18:06:31 -0000 From: Alexandre Derumier Signed-off-by: Stefan Hanreich --- src/test/run_test_subnets.pl | 8 +++++++- src/test/run_test_vnets.pl | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/test/run_test_subnets.pl b/src/test/run_test_subnets.pl index f6564e1..c98359a 100755 --- a/src/test/run_test_subnets.pl +++ b/src/test/run_test_subnets.pl @@ -109,6 +109,12 @@ foreach my $path (@plugins) { my $ipam_config = read_sdn_config ("$path/ipam_config"); return $ipam_config; }, + add_cache_mac_ip => sub { + return; + }, + del_cache_mac_ip => sub { + return; + } ); ## add_subnet @@ -192,7 +198,7 @@ foreach my $path (@plugins) { $expected = '{"zones":{"myzone":{"subnets":{"'.$subnet_cidr.'":{"ips":{"'.$ip.'":{"gateway":1},"'.$ipnextfree.'":{},"'.$ip2.'":{}}}}}}}'; eval { - $ip3 = PVE::Network::SDN::Subnets::next_free_ip($zone, $subnetid, $subnet, $hostname, $mac, $description); + $ip3 = PVE::Network::SDN::Subnets::add_next_free_ip($zone, $subnetid, $subnet, $hostname, $mac, $description); }; if ($@) { diff --git a/src/test/run_test_vnets.pl b/src/test/run_test_vnets.pl index 5aeb676..dc9da67 100755 --- a/src/test/run_test_vnets.pl +++ b/src/test/run_test_vnets.pl @@ -231,7 +231,7 @@ foreach my $path (@plugins) { $expected = $ipam ? $cidr3 : undef; eval { - $result = PVE::Network::SDN::Vnets::get_next_free_cidr($vnetid, $hostname, $mac, $description, $ipversion); + $result = PVE::Network::SDN::Vnets::add_next_free_cidr($vnetid, $hostname, $mac, $description); }; if ($@) { @@ -309,7 +309,7 @@ foreach my $path (@plugins) { $expected = $ipam ? $cidr1 : undef; eval { - $result = PVE::Network::SDN::Vnets::get_next_free_cidr($vnetid, $hostname, $mac, $description, $ipversion); + $result = PVE::Network::SDN::Vnets::add_next_free_cidr($vnetid, $hostname, $mac, $description); }; if ($@) { -- 2.39.2