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 61577986D3 for ; Wed, 15 Nov 2023 15:22:21 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4A0907735 for ; Wed, 15 Nov 2023 15:22:21 +0100 (CET) Received: from bastionodiso.odiso.net (bastionodiso.odiso.net [IPv6:2a0a:1580:2000::2d]) (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 ; Wed, 15 Nov 2023 15:22:16 +0100 (CET) Received: from kvmformation3.odiso.net (formationkvm3.odiso.net [10.3.94.12]) by bastionodiso.odiso.net (Postfix) with ESMTP id DD75F8107; Wed, 15 Nov 2023 15:22:09 +0100 (CET) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id BB687118134; Wed, 15 Nov 2023 15:22:09 +0100 (CET) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Wed, 15 Nov 2023 15:21:54 +0100 Message-Id: <20231115142208.563587-2-aderumier@odiso.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231115142208.563587-1-aderumier@odiso.com> References: <20231115142208.563587-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.019 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 HEADER_FROM_DIFFERENT_DOMAINS 0.25 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 SPF_NONE 0.001 SPF: sender does not publish an SPF Record T_SCC_BODY_TEXT_LINE -0.01 - T_SPF_HELO_TEMPERROR 0.01 SPF: test of HELO record failed (temperror) Subject: [pve-devel] [PATCH pve-network 1/3] fix subnets && netbox ipam 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: Wed, 15 Nov 2023 14:22:21 -0000 Signed-off-by: Alexandre Derumier --- src/test/ipams/netbox/expected.add_ip | 2 +- src/test/ipams/netbox/expected.add_ip_notgateway | 2 +- src/test/ipams/netbox/expected.add_next_freeip | 2 +- src/test/ipams/netbox/expected.update_ip | 2 +- src/test/run_test_subnets.pl | 8 ++++---- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/test/ipams/netbox/expected.add_ip b/src/test/ipams/netbox/expected.add_ip index e9323ca..cd46c53 100644 --- a/src/test/ipams/netbox/expected.add_ip +++ b/src/test/ipams/netbox/expected.add_ip @@ -1,5 +1,5 @@ bless( { - '_content' => '{"address":"10.0.0.1/24","description":"mydescription mac:da:65:8f:18:9b:6f","dns_name":"myhostname"}', + '_content' => '{"address":"10.0.0.1/24","description":"gateway","dns_name":"myhostname"}', '_headers' => bless( { 'authorization' => 'token 0123456789abcdef0123456789abcdef01234567', 'content-type' => 'application/json; charset=UTF-8' diff --git a/src/test/ipams/netbox/expected.add_ip_notgateway b/src/test/ipams/netbox/expected.add_ip_notgateway index e9323ca..5ea43cd 100644 --- a/src/test/ipams/netbox/expected.add_ip_notgateway +++ b/src/test/ipams/netbox/expected.add_ip_notgateway @@ -1,5 +1,5 @@ bless( { - '_content' => '{"address":"10.0.0.1/24","description":"mydescription mac:da:65:8f:18:9b:6f","dns_name":"myhostname"}', + '_content' => '{"address":"10.0.0.1/24","description":"mac:da:65:8f:18:9b:6f","dns_name":"myhostname"}', '_headers' => bless( { 'authorization' => 'token 0123456789abcdef0123456789abcdef01234567', 'content-type' => 'application/json; charset=UTF-8' diff --git a/src/test/ipams/netbox/expected.add_next_freeip b/src/test/ipams/netbox/expected.add_next_freeip index 86840eb..fbbafbb 100644 --- a/src/test/ipams/netbox/expected.add_next_freeip +++ b/src/test/ipams/netbox/expected.add_next_freeip @@ -1,5 +1,5 @@ bless( { - '_content' => '{"description":"mydescription mac:da:65:8f:18:9b:6f","dns_name":"myhostname"}', + '_content' => '{"description":"mac:da:65:8f:18:9b:6f","dns_name":"myhostname"}', '_headers' => bless( { 'authorization' => 'token 0123456789abcdef0123456789abcdef01234567', 'content-type' => 'application/json; charset=UTF-8' diff --git a/src/test/ipams/netbox/expected.update_ip b/src/test/ipams/netbox/expected.update_ip index 5679e8d..d3bc1ad 100644 --- a/src/test/ipams/netbox/expected.update_ip +++ b/src/test/ipams/netbox/expected.update_ip @@ -1,5 +1,5 @@ bless( { - '_content' => '{"address":"10.0.0.1/24","description":"mydescription mac:da:65:8f:18:9b:6f","dns_name":"myhostname"}', + '_content' => '{"address":"10.0.0.1/24","description":"gateway","dns_name":"myhostname"}', '_headers' => bless( { 'authorization' => 'token 0123456789abcdef0123456789abcdef01234567', 'content-type' => 'application/json; charset=UTF-8' diff --git a/src/test/run_test_subnets.pl b/src/test/run_test_subnets.pl index c98359a..578b5c1 100755 --- a/src/test/run_test_subnets.pl +++ b/src/test/run_test_subnets.pl @@ -176,7 +176,7 @@ foreach my $path (@plugins) { $test = "add_second_ip $ip2"; $name = "$testid $test"; $result = undef; - $expected = '{"zones":{"myzone":{"subnets":{"'.$subnet_cidr.'":{"ips":{"'.$ip.'":{"gateway":1},"'.$ip2.'":{}}}}}}}'; + $expected = '{"zones":{"myzone":{"subnets":{"'.$subnet_cidr.'":{"ips":{"'.$ip.'":{"gateway":1},"'.$ip2.'":{"hostname":"'.$hostname.'","ip":"'.$ip2.'","mac":"'.$mac.'"}}}}}}}'; eval { PVE::Network::SDN::Subnets::add_ip($zone, $subnetid, $subnet, $ip2, $hostname, $mac, $description); @@ -195,7 +195,7 @@ foreach my $path (@plugins) { $test = "find_next_freeip ($ipnextfree)"; $name = "$testid $test"; $result = undef; - $expected = '{"zones":{"myzone":{"subnets":{"'.$subnet_cidr.'":{"ips":{"'.$ip.'":{"gateway":1},"'.$ipnextfree.'":{},"'.$ip2.'":{}}}}}}}'; + $expected = '{"zones":{"myzone":{"subnets":{"'.$subnet_cidr.'":{"ips":{"'.$ip.'":{"gateway":1},"'.$ipnextfree.'":{},"'.$ip2.'":{"hostname":"'.$hostname.'","ip":"'.$ip2.'","mac":"'.$mac.'"}}}}}}}'; eval { $ip3 = PVE::Network::SDN::Subnets::add_next_free_ip($zone, $subnetid, $subnet, $hostname, $mac, $description); @@ -212,7 +212,7 @@ foreach my $path (@plugins) { $test = "del_ip $ip"; $name = "$testid $test"; $result = undef; - $expected = '{"zones":{"myzone":{"subnets":{"'.$subnet_cidr.'":{"ips":{"'.$ipnextfree.'":{},"'.$ip2.'":{}}}}}}}'; + $expected = '{"zones":{"myzone":{"subnets":{"'.$subnet_cidr.'":{"ips":{"'.$ipnextfree.'":{},"'.$ip2.'":{"hostname":"'.$hostname.'","ip":"'.$ip2.'","mac":"'.$mac.'"}}}}}}}'; eval { PVE::Network::SDN::Subnets::del_ip($zone, $subnetid, $subnet, $ip, $hostname); @@ -264,7 +264,7 @@ foreach my $path (@plugins) { $name = "$testid $test"; $result = undef; - $expected = '{"zones":{"myzone":{"subnets":{"'.$subnet_cidr.'":{"ips":{"'.$ipnextfree.'":{},"'.$ip2.'":{}}}}}}}'; + $expected = '{"zones":{"myzone":{"subnets":{"'.$subnet_cidr.'":{"ips":{"'.$ipnextfree.'":{},"'.$ip2.'":{"hostname":"'.$hostname.'","ip":"'.$ip2.'","mac":"'.$mac.'"}}}}}}}'; eval { PVE::Network::SDN::Subnets::add_ip($zone, $subnetid, $subnet, $ip, $hostname, $mac, $description); -- 2.39.2