my $cfg = {};
if($running) {
- my $cfg = PVE::Network::SDN::config();
+ my $cfg = PVE::Network::SDN::running_config();
$cfg = $cfg->{subnets};
} else {
$cfg = PVE::Network::SDN::Subnets::config();
my ($zone, $subnetid, $subnet) = @_;
my $ipam = $zone->{ipam};
+ return if !$ipam;
my $ipam_cfg = PVE::Network::SDN::Ipams::config();
my $plugin_config = $ipam_cfg->{ids}->{$ipam};
my $plugin = PVE::Network::SDN::Ipams::Plugin->lookup($plugin_config->{type});
my ($zone, $subnetid, $subnet) = @_;
my $ipam = $zone->{ipam};
+ return if !$ipam;
my $ipam_cfg = PVE::Network::SDN::Ipams::config();
my $plugin_config = $ipam_cfg->{ids}->{$ipam};
my $plugin = PVE::Network::SDN::Ipams::Plugin->lookup($plugin_config->{type});
}
sub next_free_ip {
- my ($zone, $subnetid, $subnet, $hostname, $mac, $description) = @_;
+ my ($zone, $subnetid, $subnet, $hostname, $mac, $description, $skipdns) = @_;
my $cidr = undef;
my $ip = undef;
$hostname .= ".$dnszoneprefix" if $dnszoneprefix;
#verify dns zones before ipam
- verify_dns_zone($dnszone, $dns);
+ verify_dns_zone($dnszone, $dns) if !$skipdns;
if($ipamid) {
my $ipam_cfg = PVE::Network::SDN::Ipams::config();
eval {
my $reversednszone = get_reversedns_zone($subnetid, $subnet, $reversedns, $ip);
- #add dns
- add_dns_record($dnszone, $dns, $hostname, $ip);
- #add reverse dns
- add_dns_ptr_record($reversednszone, $dnszone, $reversedns, $hostname, $ip);
+ if(!$skipdns) {
+ #add dns
+ add_dns_record($dnszone, $dns, $hostname, $ip);
+ #add reverse dns
+ add_dns_ptr_record($reversednszone, $dnszone, $reversedns, $hostname, $ip);
+ }
};
if ($@) {
#rollback
}
sub add_ip {
- my ($zone, $subnetid, $subnet, $ip, $hostname, $mac, $description) = @_;
+ my ($zone, $subnetid, $subnet, $ip, $hostname, $mac, $description, $is_gateway, $skipdns) = @_;
return if !$subnet || !$ip;
$hostname .= ".$dnszoneprefix" if $dnszoneprefix;
#verify dns zones before ipam
- verify_dns_zone($dnszone, $dns);
- verify_dns_zone($reversednszone, $reversedns);
+ if(!$skipdns) {
+ verify_dns_zone($dnszone, $dns);
+ verify_dns_zone($reversednszone, $reversedns);
+ }
if ($ipamid) {
+
my $ipam_cfg = PVE::Network::SDN::Ipams::config();
my $plugin_config = $ipam_cfg->{ids}->{$ipamid};
my $plugin = PVE::Network::SDN::Ipams::Plugin->lookup($plugin_config->{type});
+
eval {
- $plugin->add_ip($plugin_config, $subnetid, $subnet, $ip, $hostname, $mac, $description);
+ $plugin->add_ip($plugin_config, $subnetid, $subnet, $ip, $hostname, $mac, $description, $is_gateway);
};
die $@ if $@;
}
eval {
- #add dns
- add_dns_record($dnszone, $dns, $hostname, $ip);
- #add reverse dns
- add_dns_ptr_record($reversednszone, $dnszone, $reversedns, $hostname, $ip);
+ if(!$skipdns) {
+ #add dns
+ add_dns_record($dnszone, $dns, $hostname, $ip);
+ #add reverse dns
+ add_dns_ptr_record($reversednszone, $dnszone, $reversedns, $hostname, $ip);
+ }
};
if ($@) {
#rollback
}
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;
$hostname .= ".$dnszoneprefix" if $dnszoneprefix;
#verify dns zones before ipam
- verify_dns_zone($dnszone, $dns);
- verify_dns_zone($reversednszone, $reversedns);
+ if(!$skipdns) {
+ verify_dns_zone($dnszone, $dns);
+ verify_dns_zone($reversednszone, $reversedns);
+ }
if ($ipamid) {
my $ipam_cfg = PVE::Network::SDN::Ipams::config();
return if $hostname eq $oldhostname;
eval {
- #add dns
-
- 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);
+ if(!$skipdns) {
+ #add dns
+ 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);
+ }
};
}
sub del_ip {
- my ($zone, $subnetid, $subnet, $ip, $hostname) = @_;
+ my ($zone, $subnetid, $subnet, $ip, $hostname, $skipdns) = @_;
return if !$subnet || !$ip;
my $dnszoneprefix = $subnet->{dnszoneprefix};
$hostname .= ".$dnszoneprefix" if $dnszoneprefix;
-
- verify_dns_zone($dnszone, $dns);
- verify_dns_zone($reversednszone, $reversedns);
+ if(!$skipdns) {
+ verify_dns_zone($dnszone, $dns);
+ verify_dns_zone($reversednszone, $reversedns);
+ }
if ($ipamid) {
my $ipam_cfg = PVE::Network::SDN::Ipams::config();
}
eval {
- del_dns_record($dnszone, $dns, $hostname, $ip);
- del_dns_ptr_record($reversednszone, $reversedns, $ip);
+ if(!$skipdns) {
+ del_dns_record($dnszone, $dns, $hostname, $ip);
+ del_dns_ptr_record($reversednszone, $reversedns, $ip);
+ }
};
if ($@) {
warn $@;