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

subnets/ipam : fix is_gateway

Browse Source 
- add lost is_gateway in subnets subnet when creating subnet
- allow reuse ip as gateway in subnet create if it's already flagged gateway in the ipamdb
- add tests
This commit is contained in:
Alexandre Derumier 2021-06-04 13:25:00 +02:00 committed by Thomas Lamprecht
parent 9f1e793423
commit 34c4c6d74f
9 changed files with 75 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
PVE/Network/SDN/Ipams/NetboxPlugin.pm
View File

@ -93,7 +93,11 @@ sub add_ip {
};
if ($@) {
die "error add subnet ip to ipam: ip already exist: $@" if !$noerr;
if($is_gateway) {
die "error add subnet ip to ipam: ip $ip already exist: $@" if !is_ip_gateway($url, $ip, $headers) && !$noerr;
} else {
die "error add subnet ip to ipam: ip already exist: $@" if !$noerr;
}
}
}
@ -208,6 +212,14 @@ sub get_ip_id {
return $ip_id;
}
sub is_ip_gateway {
my ($url, $ip, $headers) = @_;
my $result = PVE::Network::SDN::api_request("GET", "$url/addresses/search/$ip", $headers);
my $data = @{$result->{data}}[0];
my $description = $data->{description};
my $is_gateway = 1 if $description eq 'gateway';
return $is_gateway;
}
1;

4
PVE/Network/SDN/Ipams/PVEPlugin.pm
View File

@ -95,9 +95,9 @@ sub add_ip {
my $dbsubnet = $dbzone->{subnets}->{$cidr};
die "subnet '$cidr' doesn't exist in IPAM DB\n" if !$dbsubnet;
die "IP '$ip' already exist\n" if defined($dbsubnet->{ips}->{$ip});
die "IP '$ip' already exist\n" if (!$is_gateway && defined($dbsubnet->{ips}->{$ip})) || ($is_gateway && defined($dbsubnet->{ips}->{$ip}) && !defined($dbsubnet->{ips}->{$ip}->{gateway}));
$dbsubnet->{ips}->{$ip} = {};
$dbsubnet->{ips}->{$ip} = {gateway => 1} if $is_gateway;
write_db($db);
});

18
PVE/Network/SDN/Ipams/PhpIpamPlugin.pm
View File

@ -106,10 +106,10 @@ sub add_ip {
my $params = { ip => $ip,
subnetId => $internalid,
is_gateway => $is_gateway,
hostname => $hostname,
description => $description,
};
$params->{is_gateway} = 1 if $is_gateway;
$params->{mac} = $mac if $mac;
eval {
@ -117,7 +117,11 @@ sub add_ip {
};
if ($@) {
die "error add subnet ip to ipam: ip $ip already exist: $@" if !$noerr;
if($is_gateway) {
die "error add subnet ip to ipam: ip $ip already exist: $@" if !is_ip_gateway($url, $ip, $headers) && !$noerr;
} else {
die "error add subnet ip to ipam: ip $ip already exist: $@" if !$noerr;
}
}
}
@ -134,10 +138,10 @@ sub update_ip {
die "can't find ip addresse in ipam" if !$ip_id;
my $params = {
is_gateway => $is_gateway,
hostname => $hostname,
description => $description,
};
$params->{is_gateway} = 1 if $is_gateway;
$params->{mac} = $mac if $mac;
eval {
@ -242,6 +246,14 @@ sub get_ip_id {
return $ip_id;
}
sub is_ip_gateway {
my ($url, $ip, $headers) = @_;
my $result = PVE::Network::SDN::api_request("GET", "$url/addresses/search/$ip", $headers);
my $data = @{$result->{data}}[0];
my $is_gateway = $data->{is_gateway};
return $is_gateway;
}
1;

2
PVE/Network/SDN/SubnetPlugin.pm
View File

@ -143,7 +143,7 @@ sub on_update_hook {
}
if(!$old_gateway || $gateway && $gateway ne $old_gateway) {
my $hostname = "$vnetid-gw";
my $description = "$vnetid gw";
my $description = "gateway";
PVE::Network::SDN::Subnets::add_ip($zone, $subnetid, $subnet, $gateway, $hostname, $mac, $description, 1);
}

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

@ -232,7 +232,7 @@ sub next_free_ip {
}
sub add_ip {
my ($zone, $subnetid, $subnet, $ip, $hostname, $mac, $description) = @_;
my ($zone, $subnetid, $subnet, $ip, $hostname, $mac, $description, $is_gateway) = @_;
return if !$subnet || !$ip;
@ -259,7 +259,7 @@ sub add_ip {
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 $@;
}

9
test/ipams/netbox/expected.add_ip_notgateway Normal file
View File

@ -0,0 +1,9 @@
bless( {
'_content' => '{"address":"10.0.0.1/24","description":"mydescription mac:da:65:8f:18:9b:6f","dns_name":"myhostname"}',
'_headers' => bless( {
'authorization' => 'token 0123456789abcdef0123456789abcdef01234567',
'content-type' => 'application/json; charset=UTF-8'
}, 'HTTP::Headers' ),
'_method' => 'POST',
'_uri' => bless( do{\(my $o = 'http://localhost:8000/api/ipam/ip-addresses/')}, 'URI::http' )
}, 'HTTP::Request' );

12
test/ipams/phpipam/expected.add_ip_notgateway Normal file
View File

@ -0,0 +1,12 @@
bless( {
'_content' => '{"description":"mydescription","hostname":"myhostname","ip":"10.0.0.1","mac":"da:65:8f:18:9b:6f","subnetId":1}',
'_headers' => bless( {
'::std_case' => {
'token' => 'Token'
},
'content-type' => 'application/json; charset=UTF-8',
'token' => 'JPHkPSLB4O_XL-GQz4qtEFmNpx-99Htw'
}, 'HTTP::Headers' ),
'_method' => 'POST',
'_uri' => bless( do{\(my $o = 'https://localhost/api/apiadmin/addresses/')}, 'URI::https' )
}, 'HTTP::Request' );

18
test/run_test_ipams.pl
View File

@ -99,6 +99,9 @@ foreach my $path (@plugins) {
},
get_ip_id => sub {
return 1;
},
is_ip_gateway => sub {
return 1;
}
);
@ -146,9 +149,22 @@ foreach my $path (@plugins) {
$test = "update_ip";
$expected = Dumper read_sdn_config("$path/expected.$test");
$name = "$ipamid $test";
$plugin->update_ip($plugin_config, $subnetid, $subnet, $ip, $hostname, $mac, $description, $is_gateway, 1);
if ($@) {
is ($@, $expected, $name);
} else {
fail($name);
}
## add_ip_notgateway
$is_gateway = undef;
$test = "add_ip_notgateway";
$expected = Dumper read_sdn_config("$path/expected.$test");
$name = "$ipamid $test";
$plugin->add_ip($plugin_config, $subnetid, $subnet, $ip, $hostname, $mac, $description, $is_gateway, 1);
if ($@) {
is ($@, $expected, $name);
} else {

8
test/run_test_subnets.pl
View File

@ -135,10 +135,10 @@ foreach my $path (@plugins) {
$test = "add_ip $ip";
$name = "$testid $test";
$result = undef;
$expected = '{"zones":{"myzone":{"subnets":{"'.$subnet_cidr.'":{"ips":{"'.$ip.'":{}}}}}}}';
$expected = '{"zones":{"myzone":{"subnets":{"'.$subnet_cidr.'":{"ips":{"'.$ip.'":{"gateway":1}}}}}}}';
eval {
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, $is_gateway);
};
if ($@) {
@ -170,7 +170,7 @@ foreach my $path (@plugins) {
$test = "add_second_ip $ip2";
$name = "$testid $test";
$result = undef;
$expected = '{"zones":{"myzone":{"subnets":{"'.$subnet_cidr.'":{"ips":{"'.$ip.'":{},"'.$ip2.'":{}}}}}}}';
$expected = '{"zones":{"myzone":{"subnets":{"'.$subnet_cidr.'":{"ips":{"'.$ip.'":{"gateway":1},"'.$ip2.'":{}}}}}}}';
eval {
PVE::Network::SDN::Subnets::add_ip($zone, $subnetid, $subnet, $ip2, $hostname, $mac, $description);
@ -189,7 +189,7 @@ foreach my $path (@plugins) {
$test = "find_next_freeip ($ipnextfree)";
$name = "$testid $test";
$result = undef;
$expected = '{"zones":{"myzone":{"subnets":{"'.$subnet_cidr.'":{"ips":{"'.$ip.'":{},"'.$ipnextfree.'":{},"'.$ip2.'":{}}}}}}}';
$expected = '{"zones":{"myzone":{"subnets":{"'.$subnet_cidr.'":{"ips":{"'.$ip.'":{"gateway":1},"'.$ipnextfree.'":{},"'.$ip2.'":{}}}}}}}';
eval {
$ip3 = PVE::Network::SDN::Subnets::next_free_ip($zone, $subnetid, $subnet, $hostname, $mac, $description);