* [pve-devel] [PATCH pve-network 1/2] sdn: powerdns: remove priority from tests
@ 2024-03-04 17:33 Stefan Hanreich
2024-03-04 17:33 ` [pve-devel] [PATCH pve-network 2/2] sdn: powerdns: fix counting records of existing rrset Stefan Hanreich
0 siblings, 1 reply; 2+ messages in thread
From: Stefan Hanreich @ 2024-03-04 17:33 UTC (permalink / raw)
To: pve-devel
Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
---
.../dns/powerdns/expected.add_a_multiple_record.ipv4 | 2 +-
.../dns/powerdns/expected.add_a_multiple_record.ipv6 | 2 +-
src/test/dns/powerdns/expected.add_a_record.ipv4 | 2 +-
src/test/dns/powerdns/expected.add_a_record.ipv6 | 2 +-
src/test/dns/powerdns/expected.add_ptr_record.ipv4 | 2 +-
src/test/dns/powerdns/expected.add_ptr_record.ipv6 | 2 +-
.../dns/powerdns/expected.del_a_multiple_record.ipv4 | 2 +-
.../dns/powerdns/expected.del_a_multiple_record.ipv6 | 2 +-
src/test/run_test_dns.pl | 12 ++++--------
9 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/src/test/dns/powerdns/expected.add_a_multiple_record.ipv4 b/src/test/dns/powerdns/expected.add_a_multiple_record.ipv4
index 846391a..60b9af7 100644
--- a/src/test/dns/powerdns/expected.add_a_multiple_record.ipv4
+++ b/src/test/dns/powerdns/expected.add_a_multiple_record.ipv4
@@ -1,5 +1,5 @@
bless( {
- '_content' => '{"rrsets":[{"changetype":"REPLACE","name":"myhostname.domain.com.","records":[{"content":"127.0.0.1","disabled":false,"name":"myhostname.domain.com.","priority":0,"type":"A"},{"content":"10.0.0.1","disabled":false,"name":"myhostname.domain.com.","priority":0,"type":"A"}],"ttl":"3600","type":"A"}]}',
+ '_content' => '{"rrsets":[{"changetype":"REPLACE","name":"myhostname.domain.com.","records":[{"content":"127.0.0.1","disabled":false,"name":"myhostname.domain.com.","type":"A"},{"content":"10.0.0.1","disabled":false,"name":"myhostname.domain.com.","type":"A"}],"ttl":"3600","type":"A"}]}',
'_headers' => bless( {
'::std_case' => {
'x-api-key' => 'X-API-Key'
diff --git a/src/test/dns/powerdns/expected.add_a_multiple_record.ipv6 b/src/test/dns/powerdns/expected.add_a_multiple_record.ipv6
index 7642dbb..9e53c7f 100644
--- a/src/test/dns/powerdns/expected.add_a_multiple_record.ipv6
+++ b/src/test/dns/powerdns/expected.add_a_multiple_record.ipv6
@@ -1,5 +1,5 @@
bless( {
- '_content' => '{"rrsets":[{"changetype":"REPLACE","name":"myhostname.domain.com.","records":[{"content":"2001:4860:4860::8844","disabled":false,"name":"myhostname.domain.com.","priority":0,"type":"AAAA"},{"content":"2001:4860:4860::8888","disabled":false,"name":"myhostname.domain.com.","priority":0,"type":"AAAA"}],"ttl":"3600","type":"AAAA"}]}',
+ '_content' => '{"rrsets":[{"changetype":"REPLACE","name":"myhostname.domain.com.","records":[{"content":"2001:4860:4860::8844","disabled":false,"name":"myhostname.domain.com.","type":"AAAA"},{"content":"2001:4860:4860::8888","disabled":false,"name":"myhostname.domain.com.","type":"AAAA"}],"ttl":"3600","type":"AAAA"}]}',
'_headers' => bless( {
'::std_case' => {
'x-api-key' => 'X-API-Key'
diff --git a/src/test/dns/powerdns/expected.add_a_record.ipv4 b/src/test/dns/powerdns/expected.add_a_record.ipv4
index c4bb573..066ed77 100644
--- a/src/test/dns/powerdns/expected.add_a_record.ipv4
+++ b/src/test/dns/powerdns/expected.add_a_record.ipv4
@@ -1,5 +1,5 @@
bless( {
- '_content' => '{"rrsets":[{"changetype":"REPLACE","name":"myhostname.domain.com.","records":[{"content":"10.0.0.1","disabled":false,"name":"myhostname.domain.com.","priority":0,"type":"A"}],"ttl":"3600","type":"A"}]}',
+ '_content' => '{"rrsets":[{"changetype":"REPLACE","name":"myhostname.domain.com.","records":[{"content":"10.0.0.1","disabled":false,"name":"myhostname.domain.com.","type":"A"}],"ttl":"3600","type":"A"}]}',
'_headers' => bless( {
'::std_case' => {
'x-api-key' => 'X-API-Key'
diff --git a/src/test/dns/powerdns/expected.add_a_record.ipv6 b/src/test/dns/powerdns/expected.add_a_record.ipv6
index 55706bf..466a3b6 100644
--- a/src/test/dns/powerdns/expected.add_a_record.ipv6
+++ b/src/test/dns/powerdns/expected.add_a_record.ipv6
@@ -1,5 +1,5 @@
bless( {
- '_content' => '{"rrsets":[{"changetype":"REPLACE","name":"myhostname.domain.com.","records":[{"content":"2001:4860:4860::8888","disabled":false,"name":"myhostname.domain.com.","priority":0,"type":"AAAA"}],"ttl":"3600","type":"AAAA"}]}',
+ '_content' => '{"rrsets":[{"changetype":"REPLACE","name":"myhostname.domain.com.","records":[{"content":"2001:4860:4860::8888","disabled":false,"name":"myhostname.domain.com.","type":"AAAA"}],"ttl":"3600","type":"AAAA"}]}',
'_headers' => bless( {
'::std_case' => {
'x-api-key' => 'X-API-Key'
diff --git a/src/test/dns/powerdns/expected.add_ptr_record.ipv4 b/src/test/dns/powerdns/expected.add_ptr_record.ipv4
index 45b78e3..7c69946 100644
--- a/src/test/dns/powerdns/expected.add_ptr_record.ipv4
+++ b/src/test/dns/powerdns/expected.add_ptr_record.ipv4
@@ -1,5 +1,5 @@
bless( {
- '_content' => '{"rrsets":[{"changetype":"REPLACE","name":"1.0.0.10.in-addr.arpa.","records":[{"content":"myhostname.","disabled":false,"name":"1.0.0.10.in-addr.arpa.","priority":0,"type":"PTR"}],"ttl":"3600","type":"PTR"}]}',
+ '_content' => '{"rrsets":[{"changetype":"REPLACE","name":"1.0.0.10.in-addr.arpa.","records":[{"content":"myhostname.","disabled":false,"name":"1.0.0.10.in-addr.arpa.","type":"PTR"}],"ttl":"3600","type":"PTR"}]}',
'_headers' => bless( {
'::std_case' => {
'x-api-key' => 'X-API-Key'
diff --git a/src/test/dns/powerdns/expected.add_ptr_record.ipv6 b/src/test/dns/powerdns/expected.add_ptr_record.ipv6
index d507c27..c80c0c9 100644
--- a/src/test/dns/powerdns/expected.add_ptr_record.ipv6
+++ b/src/test/dns/powerdns/expected.add_ptr_record.ipv6
@@ -1,5 +1,5 @@
bless( {
- '_content' => '{"rrsets":[{"changetype":"REPLACE","name":"8.8.8.8.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.6.8.4.0.6.8.4.1.0.0.2.ip6.arpa.","records":[{"content":"myhostname.","disabled":false,"name":"8.8.8.8.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.6.8.4.0.6.8.4.1.0.0.2.ip6.arpa.","priority":0,"type":"PTR"}],"ttl":"3600","type":"PTR"}]}',
+ '_content' => '{"rrsets":[{"changetype":"REPLACE","name":"8.8.8.8.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.6.8.4.0.6.8.4.1.0.0.2.ip6.arpa.","records":[{"content":"myhostname.","disabled":false,"name":"8.8.8.8.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.6.8.4.0.6.8.4.1.0.0.2.ip6.arpa.","type":"PTR"}],"ttl":"3600","type":"PTR"}]}',
'_headers' => bless( {
'::std_case' => {
'x-api-key' => 'X-API-Key'
diff --git a/src/test/dns/powerdns/expected.del_a_multiple_record.ipv4 b/src/test/dns/powerdns/expected.del_a_multiple_record.ipv4
index 7aec8ed..925016a 100644
--- a/src/test/dns/powerdns/expected.del_a_multiple_record.ipv4
+++ b/src/test/dns/powerdns/expected.del_a_multiple_record.ipv4
@@ -1,5 +1,5 @@
bless( {
- '_content' => '{"rrsets":[{"changetype":"REPLACE","name":"myhostname.domain.com.","records":[{"content":"127.0.0.1","disabled":false,"name":"myhostname.domain.com.","priority":0,"type":"A"}],"ttl":"3600","type":"A"}]}',
+ '_content' => '{"rrsets":[{"changetype":"REPLACE","name":"myhostname.domain.com.","records":[{"content":"127.0.0.1","disabled":false,"name":"myhostname.domain.com.","type":"A"}],"ttl":"3600","type":"A"}]}',
'_headers' => bless( {
'::std_case' => {
'x-api-key' => 'X-API-Key'
diff --git a/src/test/dns/powerdns/expected.del_a_multiple_record.ipv6 b/src/test/dns/powerdns/expected.del_a_multiple_record.ipv6
index 33637dc..ccac02e 100644
--- a/src/test/dns/powerdns/expected.del_a_multiple_record.ipv6
+++ b/src/test/dns/powerdns/expected.del_a_multiple_record.ipv6
@@ -1,5 +1,5 @@
bless( {
- '_content' => '{"rrsets":[{"changetype":"REPLACE","name":"myhostname.domain.com.","records":[{"content":"2001:4860:4860::8844","disabled":false,"name":"myhostname.domain.com.","priority":0,"type":"AAAA"}],"ttl":"3600","type":"AAAA"}]}',
+ '_content' => '{"rrsets":[{"changetype":"REPLACE","name":"myhostname.domain.com.","records":[{"content":"2001:4860:4860::8844","disabled":false,"name":"myhostname.domain.com.","type":"AAAA"}],"ttl":"3600","type":"AAAA"}]}',
'_headers' => bless( {
'::std_case' => {
'x-api-key' => 'X-API-Key'
diff --git a/src/test/run_test_dns.pl b/src/test/run_test_dns.pl
index 87e011e..007cfaf 100755
--- a/src/test/run_test_dns.pl
+++ b/src/test/run_test_dns.pl
@@ -151,8 +151,7 @@ foreach my $path (@plugins) {
my $record = { content => $ip,
disabled => JSON::false,
name => $fqdn,
- type => $type,
- priority => 0 };
+ type => $type };
my $rrset = { name => $fqdn,
type => $type,
@@ -186,14 +185,12 @@ foreach my $path (@plugins) {
my $record = { content => $ip,
disabled => JSON::false,
name => $fqdn,
- type => $type,
- priority => 0 };
+ type => $type };
my $record2 = { content => $ip2,
disabled => JSON::false,
name => $fqdn,
- type => $type,
- priority => 0 };
+ type => $type };
my $rrset = { name => $fqdn,
type => $type,
@@ -227,8 +224,7 @@ foreach my $path (@plugins) {
my $record2 = { content => $ip2,
disabled => JSON::false,
name => $fqdn,
- type => $type,
- priority => 0 };
+ type => $type };
my $rrset = { name => $fqdn,
type => $type,
--
2.39.2
^ permalink raw reply [flat|nested] 2+ messages in thread
* [pve-devel] [PATCH pve-network 2/2] sdn: powerdns: fix counting records of existing rrset
2024-03-04 17:33 [pve-devel] [PATCH pve-network 1/2] sdn: powerdns: remove priority from tests Stefan Hanreich
@ 2024-03-04 17:33 ` Stefan Hanreich
0 siblings, 0 replies; 2+ messages in thread
From: Stefan Hanreich @ 2024-03-04 17:33 UTC (permalink / raw)
To: pve-devel
Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
---
src/PVE/Network/SDN/Dns/PowerdnsPlugin.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/PVE/Network/SDN/Dns/PowerdnsPlugin.pm b/src/PVE/Network/SDN/Dns/PowerdnsPlugin.pm
index ab20e8d..dae63d1 100644
--- a/src/PVE/Network/SDN/Dns/PowerdnsPlugin.pm
+++ b/src/PVE/Network/SDN/Dns/PowerdnsPlugin.pm
@@ -138,7 +138,7 @@ sub del_a_record {
my $final_records = [ grep { $_->{content} ne $ip } $existing_rrset->{records}->@* ];
my $final_records_size = scalar($final_records->@*);
# early return if we didn't find our record (i.e., un/filtered record sets have the same size)
- return if scalar($existing_rrset->{content}->@*) == $final_records_size;
+ return if scalar($existing_rrset->{records}->@*) == $final_records_size;
my $rrset = {
name => $fqdn,
--
2.39.2
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-03-04 17:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-04 17:33 [pve-devel] [PATCH pve-network 1/2] sdn: powerdns: remove priority from tests Stefan Hanreich
2024-03-04 17:33 ` [pve-devel] [PATCH pve-network 2/2] sdn: powerdns: fix counting records of existing rrset Stefan Hanreich
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.