From: Alexandre Derumier <aderumier@odiso.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH pve-network 12/15] subnets: convert dns private function to public sub
Date: Tue, 5 Jan 2021 10:35:33 +0100 [thread overview]
Message-ID: <20210105093536.1727641-13-aderumier@odiso.com> (raw)
In-Reply-To: <20210105093536.1727641-1-aderumier@odiso.com>
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
---
PVE/Network/SDN/Subnets.pm | 66 +++++++++++++++++++-------------------
1 file changed, 33 insertions(+), 33 deletions(-)
diff --git a/PVE/Network/SDN/Subnets.pm b/PVE/Network/SDN/Subnets.pm
index 25261ac..ec0fb66 100644
--- a/PVE/Network/SDN/Subnets.pm
+++ b/PVE/Network/SDN/Subnets.pm
@@ -94,7 +94,7 @@ sub find_ip_subnet {
return ($subnetid, $subnet);
}
-my $verify_dns_zone = sub {
+sub verify_dns_zone {
my ($zone, $dns) = @_;
return if !$zone || !$dns;
@@ -103,9 +103,9 @@ my $verify_dns_zone = sub {
my $plugin_config = $dns_cfg->{ids}->{$dns};
my $plugin = PVE::Network::SDN::Dns::Plugin->lookup($plugin_config->{type});
$plugin->verify_zone($plugin_config, $zone);
-};
+}
-my $get_reversedns_zone = sub {
+sub get_reversedns_zone {
my ($subnetid, $subnet, $dns, $ip) = @_;
return if !$subnetid || !$dns || !$ip;
@@ -114,9 +114,9 @@ my $get_reversedns_zone = sub {
my $plugin_config = $dns_cfg->{ids}->{$dns};
my $plugin = PVE::Network::SDN::Dns::Plugin->lookup($plugin_config->{type});
$plugin->get_reversedns_zone($plugin_config, $subnetid, $subnet, $ip);
-};
+}
-my $add_dns_record = sub {
+sub add_dns_record {
my ($zone, $dns, $hostname, $ip) = @_;
return if !$zone || !$dns || !$hostname || !$ip;
@@ -125,9 +125,9 @@ my $add_dns_record = sub {
my $plugin = PVE::Network::SDN::Dns::Plugin->lookup($plugin_config->{type});
$plugin->add_a_record($plugin_config, $zone, $hostname, $ip);
-};
+}
-my $add_dns_ptr_record = sub {
+sub add_dns_ptr_record {
my ($reversezone, $zone, $dns, $hostname, $ip) = @_;
return if !$zone || !$reversezone || !$dns || !$hostname || !$ip;
@@ -137,9 +137,9 @@ my $add_dns_ptr_record = sub {
my $plugin_config = $dns_cfg->{ids}->{$dns};
my $plugin = PVE::Network::SDN::Dns::Plugin->lookup($plugin_config->{type});
$plugin->add_ptr_record($plugin_config, $reversezone, $hostname, $ip);
-};
+}
-my $del_dns_record = sub {
+sub del_dns_record {
my ($zone, $dns, $hostname, $ip) = @_;
return if !$zone || !$dns || !$hostname || !$ip;
@@ -148,9 +148,9 @@ my $del_dns_record = sub {
my $plugin_config = $dns_cfg->{ids}->{$dns};
my $plugin = PVE::Network::SDN::Dns::Plugin->lookup($plugin_config->{type});
$plugin->del_a_record($plugin_config, $zone, $hostname, $ip);
-};
+}
-my $del_dns_ptr_record = sub {
+sub del_dns_ptr_record {
my ($reversezone, $dns, $ip) = @_;
return if !$reversezone || !$dns || !$ip;
@@ -159,7 +159,7 @@ my $del_dns_ptr_record = sub {
my $plugin_config = $dns_cfg->{ids}->{$dns};
my $plugin = PVE::Network::SDN::Dns::Plugin->lookup($plugin_config->{type});
$plugin->del_ptr_record($plugin_config, $reversezone, $ip);
-};
+}
sub next_free_ip {
my ($zone, $subnetid, $subnet, $hostname, $mac, $description) = @_;
@@ -177,7 +177,7 @@ sub next_free_ip {
$hostname .= ".$dnszoneprefix" if $dnszoneprefix;
#verify dns zones before ipam
- &$verify_dns_zone($dnszone, $dns);
+ verify_dns_zone($dnszone, $dns);
if($ipamid) {
my $ipam_cfg = PVE::Network::SDN::Ipams::config();
@@ -191,12 +191,12 @@ sub next_free_ip {
}
eval {
- my $reversednszone = &$get_reversedns_zone($subnetid, $subnet, $reversedns, $ip);
+ my $reversednszone = get_reversedns_zone($subnetid, $subnet, $reversedns, $ip);
#add dns
- &$add_dns_record($dnszone, $dns, $hostname, $ip);
+ add_dns_record($dnszone, $dns, $hostname, $ip);
#add reverse dns
- &$add_dns_ptr_record($reversednszone, $dnszone, $reversedns, $hostname, $ip);
+ add_dns_ptr_record($reversednszone, $dnszone, $reversedns, $hostname, $ip);
};
if ($@) {
#rollback
@@ -221,14 +221,14 @@ sub add_ip {
my $dns = $zone->{dns};
my $dnszone = $zone->{dnszone};
my $reversedns = $zone->{reversedns};
- my $reversednszone = &$get_reversedns_zone($subnetid, $subnet, $reversedns, $ip);
+ my $reversednszone = get_reversedns_zone($subnetid, $subnet, $reversedns, $ip);
my $dnszoneprefix = $subnet->{dnszoneprefix};
$hostname .= ".$dnszoneprefix" if $dnszoneprefix;
#verify dns zones before ipam
- &$verify_dns_zone($dnszone, $dns);
- &$verify_dns_zone($reversednszone, $reversedns);
+ verify_dns_zone($dnszone, $dns);
+ verify_dns_zone($reversednszone, $reversedns);
if ($ipamid) {
my $ipam_cfg = PVE::Network::SDN::Ipams::config();
@@ -242,9 +242,9 @@ sub add_ip {
eval {
#add dns
- &$add_dns_record($dnszone, $dns, $hostname, $ip);
+ add_dns_record($dnszone, $dns, $hostname, $ip);
#add reverse dns
- &$add_dns_ptr_record($reversednszone, $dnszone, $reversedns, $hostname, $ip);
+ add_dns_ptr_record($reversednszone, $dnszone, $reversedns, $hostname, $ip);
};
if ($@) {
#rollback
@@ -268,14 +268,14 @@ sub update_ip {
my $dns = $zone->{dns};
my $dnszone = $zone->{dnszone};
my $reversedns = $zone->{reversedns};
- my $reversednszone = &$get_reversedns_zone($subnetid, $subnet, $reversedns, $ip);
+ my $reversednszone = get_reversedns_zone($subnetid, $subnet, $reversedns, $ip);
my $dnszoneprefix = $subnet->{dnszoneprefix};
$hostname .= ".$dnszoneprefix" if $dnszoneprefix;
#verify dns zones before ipam
- &$verify_dns_zone($dnszone, $dns);
- &$verify_dns_zone($reversednszone, $reversedns);
+ verify_dns_zone($dnszone, $dns);
+ verify_dns_zone($reversednszone, $reversedns);
if ($ipamid) {
my $ipam_cfg = PVE::Network::SDN::Ipams::config();
@@ -292,11 +292,11 @@ sub update_ip {
eval {
#add dns
- &$del_dns_record($dnszone, $dns, $oldhostname, $ip);
- &$add_dns_record($dnszone, $dns, $hostname, $ip);
+ del_dns_record($dnszone, $dns, $oldhostname, $ip);
+ add_dns_record($dnszone, $dns, $hostname, $ip);
#add reverse dns
- &$del_dns_ptr_record($reversednszone, $reversedns, $ip);
- &$add_dns_ptr_record($reversednszone, $dnszone, $reversedns, $hostname, $ip);
+ del_dns_ptr_record($reversednszone, $reversedns, $ip);
+ add_dns_ptr_record($reversednszone, $dnszone, $reversedns, $hostname, $ip);
};
}
@@ -312,13 +312,13 @@ sub del_ip {
my $dns = $zone->{dns};
my $dnszone = $zone->{dnszone};
my $reversedns = $zone->{reversedns};
- my $reversednszone = &$get_reversedns_zone($subnetid, $subnet, $reversedns, $ip);
+ my $reversednszone = get_reversedns_zone($subnetid, $subnet, $reversedns, $ip);
my $dnszoneprefix = $subnet->{dnszoneprefix};
$hostname .= ".$dnszoneprefix" if $dnszoneprefix;
- &$verify_dns_zone($dnszone, $dns);
- &$verify_dns_zone($reversednszone, $reversedns);
+ verify_dns_zone($dnszone, $dns);
+ verify_dns_zone($reversednszone, $reversedns);
if ($ipamid) {
my $ipam_cfg = PVE::Network::SDN::Ipams::config();
@@ -328,8 +328,8 @@ sub del_ip {
}
eval {
- &$del_dns_record($dnszone, $dns, $hostname, $ip);
- &$del_dns_ptr_record($reversednszone, $reversedns, $ip);
+ del_dns_record($dnszone, $dns, $hostname, $ip);
+ del_dns_ptr_record($reversednszone, $reversedns, $ip);
};
if ($@) {
warn $@;
--
2.20.1
next prev parent reply other threads:[~2021-01-05 9:35 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 ` [pve-devel] [PATCH pve-network 10/15] dns: add noerr param Alexandre Derumier
2021-01-05 9:35 ` [pve-devel] [PATCH pve-network 11/15] tests: add dns tests Alexandre Derumier
2021-01-05 9:35 ` Alexandre Derumier [this message]
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-13-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