From: Alexandre Derumier <aderumier@odiso.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH pve-network 10/15] dns: add noerr param
Date: Tue, 5 Jan 2021 10:35:31 +0100 [thread overview]
Message-ID: <20210105093536.1727641-11-aderumier@odiso.com> (raw)
In-Reply-To: <20210105093536.1727641-1-aderumier@odiso.com>
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
---
PVE/Network/SDN/Dns/Plugin.pm | 10 +++++-----
PVE/Network/SDN/Dns/PowerdnsPlugin.pm | 22 +++++++++++-----------
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/PVE/Network/SDN/Dns/Plugin.pm b/PVE/Network/SDN/Dns/Plugin.pm
index 199c170..07d0be1 100644
--- a/PVE/Network/SDN/Dns/Plugin.pm
+++ b/PVE/Network/SDN/Dns/Plugin.pm
@@ -67,31 +67,31 @@ sub parse_section_header {
sub add_a_record {
- my ($class, $plugin_config, $zone, $hostname, $ip) = @_;
+ my ($class, $plugin_config, $zone, $hostname, $ip, $noerr) = @_;
die "please implement inside plugin";
}
sub add_ptr_record {
- my ($class, $plugin_config, $zone, $hostname, $ip) = @_;
+ my ($class, $plugin_config, $zone, $hostname, $ip, $noerr) = @_;
die "please implement inside plugin";
}
sub del_ptr_record {
- my ($class, $plugin_config, $zone, $ip) = @_;
+ my ($class, $plugin_config, $zone, $ip, $noerr) = @_;
die "please implement inside plugin";
}
sub del_a_record {
- my ($class, $plugin_config, $zone, $hostname, $ip) = @_;
+ my ($class, $plugin_config, $zone, $hostname, $ip, $noerr) = @_;
die "please implement inside plugin";
}
sub verify_zone {
- my ($class, $plugin_config, $zone) = @_;
+ my ($class, $plugin_config, $zone, $noerr) = @_;
die "please implement inside plugin";
}
diff --git a/PVE/Network/SDN/Dns/PowerdnsPlugin.pm b/PVE/Network/SDN/Dns/PowerdnsPlugin.pm
index d93fb06..339ac28 100644
--- a/PVE/Network/SDN/Dns/PowerdnsPlugin.pm
+++ b/PVE/Network/SDN/Dns/PowerdnsPlugin.pm
@@ -42,7 +42,7 @@ sub options {
# Plugin implementation
sub add_a_record {
- my ($class, $plugin_config, $zone, $hostname, $ip) = @_;
+ my ($class, $plugin_config, $zone, $hostname, $ip, $noerr) = @_;
my $url = $plugin_config->{url};
my $key = $plugin_config->{key};
@@ -88,12 +88,12 @@ sub add_a_record {
};
if ($@) {
- die "error add $fqdn to zone $zone: $@";
+ die "error add $fqdn to zone $zone: $@" if !$noerr;
}
}
sub add_ptr_record {
- my ($class, $plugin_config, $zone, $hostname, $ip) = @_;
+ my ($class, $plugin_config, $zone, $hostname, $ip, $noerr) = @_;
my $url = $plugin_config->{url};
my $key = $plugin_config->{key};
@@ -125,12 +125,12 @@ sub add_ptr_record {
};
if ($@) {
- die "error add $reverseip to zone $zone: $@";
+ die "error add $reverseip to zone $zone: $@" if !$noerr;
}
}
sub del_a_record {
- my ($class, $plugin_config, $zone, $hostname, $ip) = @_;
+ my ($class, $plugin_config, $zone, $hostname, $ip, $noerr) = @_;
my $url = $plugin_config->{url};
my $key = $plugin_config->{key};
@@ -151,7 +151,7 @@ sub del_a_record {
push @$final_records, $record;
}
return if !$foundrecord;
-
+
my $rrset = {};
if (scalar (@{$final_records}) > 0) {
@@ -177,12 +177,12 @@ sub del_a_record {
};
if ($@) {
- die "error delete $fqdn from zone $zone: $@";
+ die "error delete $fqdn from zone $zone: $@" if !$noerr;
}
}
sub del_ptr_record {
- my ($class, $plugin_config, $zone, $ip) = @_;
+ my ($class, $plugin_config, $zone, $ip, $noerr) = @_;
my $url = $plugin_config->{url};
my $key = $plugin_config->{key};
@@ -204,12 +204,12 @@ sub del_ptr_record {
};
if ($@) {
- die "error delete $reverseip from zone $zone: $@";
+ die "error delete $reverseip from zone $zone: $@" if !$noerr;
}
}
sub verify_zone {
- my ($class, $plugin_config, $zone) = @_;
+ my ($class, $plugin_config, $zone, $noerr) = @_;
#verify that api is working
@@ -222,7 +222,7 @@ sub verify_zone {
};
if ($@) {
- die "can't read zone $zone: $@";
+ die "can't read zone $zone: $@" if !$noerr;
}
}
--
2.20.1
next prev parent reply other threads:[~2021-01-05 9:36 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-05 9:35 [pve-devel] [PATCH pve-network 00/15] bugfix && unit tests Alexandre Derumier
2021-01-05 9:35 ` [pve-devel] [PATCH pve-network 01/15] sdn: pending_config: initialize empty pending key Alexandre Derumier
2021-01-05 9:35 ` [pve-devel] [PATCH pve-network 02/15] ipams: add mac address Alexandre Derumier
2021-01-05 9:35 ` [pve-devel] [PATCH pve-network 03/15] ipam: add update_ip Alexandre Derumier
2021-01-05 9:35 ` [pve-devel] [PATCH pve-network 04/15] dns/ipam : move api_request helper to sdn module Alexandre Derumier
2021-01-05 9:35 ` [pve-devel] [PATCH pve-network 05/15] subnets: fix del_ip rollback Alexandre Derumier
2021-01-05 9:35 ` [pve-devel] [PATCH pve-network 06/15] dns: add update record && fix powerdns Alexandre Derumier
2021-01-05 9:35 ` [pve-devel] [PATCH pve-network 07/15] ipam: phpipam: rename get_internal to get_prefix_id (like netbox) Alexandre Derumier
2021-01-05 9:35 ` [pve-devel] [PATCH pve-network 08/15] ipams: add noerr param Alexandre Derumier
2021-01-05 9:35 ` [pve-devel] [PATCH pve-network 09/15] tests: add ipams tests Alexandre Derumier
2021-01-05 9:35 ` Alexandre Derumier [this message]
2021-01-05 9:35 ` [pve-devel] [PATCH pve-network 11/15] tests: add dns tests Alexandre Derumier
2021-01-05 9:35 ` [pve-devel] [PATCH pve-network 12/15] subnets: convert dns private function to public sub Alexandre Derumier
2021-01-05 9:35 ` [pve-devel] [PATCH pve-network 13/15] subnets: add add_subnet/del_subnet Alexandre Derumier
2021-01-05 9:35 ` [pve-devel] [PATCH pve-network 14/15] tests: add subnets tests Alexandre Derumier
2021-02-06 13:56 ` Thomas Lamprecht
2021-02-07 14:09 ` aderumier
2021-01-05 9:35 ` [pve-devel] [PATCH pve-network 15/15] fix coding style NetAddr::IP->new Alexandre Derumier
2021-02-06 13:57 ` [pve-devel] [PATCH pve-network 00/15] bugfix && unit tests Thomas Lamprecht
2021-02-07 14:26 ` aderumier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210105093536.1727641-11-aderumier@odiso.com \
--to=aderumier@odiso.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox