proxmox-mirrors/pve-network
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-network synced 2025-08-16 13:00:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vnet/subnet : add skipdns option

Browse Source 
allow to register ip to ipam without dns registration.
can be used for temp/pending ip for example
This commit is contained in:
Alexandre Derumier 2021-11-05 09:06:41 +01:00 committed by Thomas Lamprecht
parent 78d58f66fd
commit 83dcfd5733
2 changed files with 49 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
PVE/Network/SDN/Subnets.pm
View File

@ -184,7 +184,7 @@ sub del_subnet {
} }
sub next_free_ip { sub next_free_ip {
my ($zone, $subnetid, $subnet, $hostname, $mac, $description) = @_; my ($zone, $subnetid, $subnet, $hostname, $mac, $description, $skipdns) = @_;
my $cidr = undef; my $cidr = undef;
my $ip = undef; my $ip = undef;
@ -199,7 +199,7 @@ sub next_free_ip {
$hostname .= ".$dnszoneprefix" if $dnszoneprefix; $hostname .= ".$dnszoneprefix" if $dnszoneprefix;
#verify dns zones before ipam #verify dns zones before ipam
verify_dns_zone($dnszone, $dns); verify_dns_zone($dnszone, $dns) if !$skipdns;
if($ipamid) { if($ipamid) {
my $ipam_cfg = PVE::Network::SDN::Ipams::config(); my $ipam_cfg = PVE::Network::SDN::Ipams::config();
@ -215,10 +215,12 @@ sub next_free_ip {
eval { eval {
my $reversednszone = get_reversedns_zone($subnetid, $subnet, $reversedns, $ip); my $reversednszone = get_reversedns_zone($subnetid, $subnet, $reversedns, $ip);
#add dns if(!$skipdns) {
add_dns_record($dnszone, $dns, $hostname, $ip); #add dns
#add reverse dns add_dns_record($dnszone, $dns, $hostname, $ip);
add_dns_ptr_record($reversednszone, $dnszone, $reversedns, $hostname, $ip); #add reverse dns
add_dns_ptr_record($reversednszone, $dnszone, $reversedns, $hostname, $ip);
}
}; };
if ($@) { if ($@) {
#rollback #rollback
@ -232,7 +234,7 @@ sub next_free_ip {
} }
sub add_ip { sub add_ip {
my ($zone, $subnetid, $subnet, $ip, $hostname, $mac, $description, $is_gateway) = @_; my ($zone, $subnetid, $subnet, $ip, $hostname, $mac, $description, $is_gateway, $skipdns) = @_;
return if !$subnet || !$ip; return if !$subnet || !$ip;
@ -249,8 +251,10 @@ sub add_ip {
$hostname .= ".$dnszoneprefix" if $dnszoneprefix; $hostname .= ".$dnszoneprefix" if $dnszoneprefix;
#verify dns zones before ipam #verify dns zones before ipam
verify_dns_zone($dnszone, $dns); if(!$skipdns) {
verify_dns_zone($reversednszone, $reversedns); verify_dns_zone($dnszone, $dns);
verify_dns_zone($reversednszone, $reversedns);
}
if ($ipamid) { if ($ipamid) {
@ -265,10 +269,12 @@ sub add_ip {
} }
eval { eval {
#add dns if(!$skipdns) {
add_dns_record($dnszone, $dns, $hostname, $ip); #add dns
#add reverse dns add_dns_record($dnszone, $dns, $hostname, $ip);
add_dns_ptr_record($reversednszone, $dnszone, $reversedns, $hostname, $ip); #add reverse dns
add_dns_ptr_record($reversednszone, $dnszone, $reversedns, $hostname, $ip);
}
}; };
if ($@) { if ($@) {
#rollback #rollback
@ -281,7 +287,7 @@ sub add_ip {
} }
sub update_ip { sub update_ip {
my ($zone, $subnetid, $subnet, $ip, $hostname, $oldhostname, $mac, $description) = @_; my ($zone, $subnetid, $subnet, $ip, $hostname, $oldhostname, $mac, $description, $skipdns) = @_;
return if !$subnet || !$ip; return if !$subnet || !$ip;
@ -298,8 +304,10 @@ sub update_ip {
$hostname .= ".$dnszoneprefix" if $dnszoneprefix; $hostname .= ".$dnszoneprefix" if $dnszoneprefix;
#verify dns zones before ipam #verify dns zones before ipam
verify_dns_zone($dnszone, $dns); if(!$skipdns) {
verify_dns_zone($reversednszone, $reversedns); verify_dns_zone($dnszone, $dns);
verify_dns_zone($reversednszone, $reversedns);
}
if ($ipamid) { if ($ipamid) {
my $ipam_cfg = PVE::Network::SDN::Ipams::config(); my $ipam_cfg = PVE::Network::SDN::Ipams::config();
@ -314,18 +322,19 @@ sub update_ip {
return if $hostname eq $oldhostname; return if $hostname eq $oldhostname;
eval { eval {
#add dns if(!$skipdns) {
#add dns
del_dns_record($dnszone, $dns, $oldhostname, $ip); del_dns_record($dnszone, $dns, $oldhostname, $ip);
add_dns_record($dnszone, $dns, $hostname, $ip); add_dns_record($dnszone, $dns, $hostname, $ip);
#add reverse dns #add reverse dns
del_dns_ptr_record($reversednszone, $reversedns, $ip); del_dns_ptr_record($reversednszone, $reversedns, $ip);
add_dns_ptr_record($reversednszone, $dnszone, $reversedns, $hostname, $ip); add_dns_ptr_record($reversednszone, $dnszone, $reversedns, $hostname, $ip);
}
}; };
} }
sub del_ip { sub del_ip {
my ($zone, $subnetid, $subnet, $ip, $hostname) = @_; my ($zone, $subnetid, $subnet, $ip, $hostname, $skipdns) = @_;
return if !$subnet || !$ip; return if !$subnet || !$ip;
@ -340,9 +349,10 @@ sub del_ip {
my $dnszoneprefix = $subnet->{dnszoneprefix}; my $dnszoneprefix = $subnet->{dnszoneprefix};
$hostname .= ".$dnszoneprefix" if $dnszoneprefix; $hostname .= ".$dnszoneprefix" if $dnszoneprefix;
if(!$skipdns) {
verify_dns_zone($dnszone, $dns); verify_dns_zone($dnszone, $dns);
verify_dns_zone($reversednszone, $reversedns); verify_dns_zone($reversednszone, $reversedns);
}
if ($ipamid) { if ($ipamid) {
my $ipam_cfg = PVE::Network::SDN::Ipams::config(); my $ipam_cfg = PVE::Network::SDN::Ipams::config();
@ -352,8 +362,10 @@ sub del_ip {
} }
eval { eval {
del_dns_record($dnszone, $dns, $hostname, $ip); if(!$skipdns) {
del_dns_ptr_record($reversednszone, $reversedns, $ip); del_dns_record($dnszone, $dns, $hostname, $ip);
del_dns_ptr_record($reversednszone, $reversedns, $ip);
}
}; };
if ($@) { if ($@) {
warn $@; warn $@;

16
PVE/Network/SDN/Vnets.pm
View File

@ -100,7 +100,7 @@ sub get_subnet_from_vnet_cidr {
} }
sub get_next_free_cidr { sub get_next_free_cidr {
my ($vnetid, $hostname, $mac, $description, $ipversion) = @_; my ($vnetid, $hostname, $mac, $description, $ipversion, $skipdns) = @_;
my $vnet = PVE::Network::SDN::Vnets::get_vnet($vnetid); my $vnet = PVE::Network::SDN::Vnets::get_vnet($vnetid);
my $zoneid = $vnet->{zone}; my $zoneid = $vnet->{zone};
@ -121,7 +121,7 @@ sub get_next_free_cidr {
$subnetcount++; $subnetcount++;
eval { eval {
$ip = PVE::Network::SDN::Subnets::next_free_ip($zone, $subnetid, $subnet, $hostname, $mac, $description); $ip = PVE::Network::SDN::Subnets::next_free_ip($zone, $subnetid, $subnet, $hostname, $mac, $description, $skipdns);
}; };
warn $@ if $@; warn $@ if $@;
last if $ip; last if $ip;
@ -132,30 +132,30 @@ sub get_next_free_cidr {
} }
sub add_cidr { sub add_cidr {
my ($vnetid, $cidr, $hostname, $mac, $description) = @_; my ($vnetid, $cidr, $hostname, $mac, $description, $skipdns) = @_;
return if !$vnetid; return if !$vnetid;
my ($zone, $subnetid, $subnet, $ip) = PVE::Network::SDN::Vnets::get_subnet_from_vnet_cidr($vnetid, $cidr); my ($zone, $subnetid, $subnet, $ip) = PVE::Network::SDN::Vnets::get_subnet_from_vnet_cidr($vnetid, $cidr);
PVE::Network::SDN::Subnets::add_ip($zone, $subnetid, $subnet, $ip, $hostname, $mac, $description); PVE::Network::SDN::Subnets::add_ip($zone, $subnetid, $subnet, $ip, $hostname, $mac, $description, undef, $skipdns);
} }
sub update_cidr { sub update_cidr {
my ($vnetid, $cidr, $hostname, $oldhostname, $mac, $description) = @_; my ($vnetid, $cidr, $hostname, $oldhostname, $mac, $description, $skipdns) = @_;
return if !$vnetid; return if !$vnetid;
my ($zone, $subnetid, $subnet, $ip) = PVE::Network::SDN::Vnets::get_subnet_from_vnet_cidr($vnetid, $cidr); my ($zone, $subnetid, $subnet, $ip) = PVE::Network::SDN::Vnets::get_subnet_from_vnet_cidr($vnetid, $cidr);
PVE::Network::SDN::Subnets::update_ip($zone, $subnetid, $subnet, $ip, $hostname, $oldhostname, $mac, $description); PVE::Network::SDN::Subnets::update_ip($zone, $subnetid, $subnet, $ip, $hostname, $oldhostname, $mac, $description, $skipdns);
} }
sub del_cidr { sub del_cidr {
my ($vnetid, $cidr, $hostname) = @_; my ($vnetid, $cidr, $hostname, $skipdns) = @_;
return if !$vnetid; return if !$vnetid;
my ($zone, $subnetid, $subnet, $ip) = PVE::Network::SDN::Vnets::get_subnet_from_vnet_cidr($vnetid, $cidr); my ($zone, $subnetid, $subnet, $ip) = PVE::Network::SDN::Vnets::get_subnet_from_vnet_cidr($vnetid, $cidr);
PVE::Network::SDN::Subnets::del_ip($zone, $subnetid, $subnet, $ip, $hostname); PVE::Network::SDN::Subnets::del_ip($zone, $subnetid, $subnet, $ip, $hostname, $skipdns);
} }