From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id BC5F09A35D for ; Tue, 14 Nov 2023 19:06:31 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B10691F7F0 for ; Tue, 14 Nov 2023 19:06:29 +0100 (CET) Received: from lana.proxmox.com (unknown [94.136.29.99]) by firstgate.proxmox.com (Proxmox) with ESMTP for ; Tue, 14 Nov 2023 19:06:25 +0100 (CET) Received: by lana.proxmox.com (Postfix, from userid 10043) id DDD762C4331; Tue, 14 Nov 2023 19:06:23 +0100 (CET) From: Stefan Hanreich To: pve-devel@lists.proxmox.com Date: Tue, 14 Nov 2023 19:06:08 +0100 Message-Id: <20231114180620.2635449-11-s.hanreich@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231114180620.2635449-1-s.hanreich@proxmox.com> References: <20231114180620.2635449-1-s.hanreich@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.492 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [WIP v3 pve-network 10/22] api: add IPAM endpoints X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Nov 2023 18:06:31 -0000 Signed-off-by: Stefan Hanreich --- src/PVE/API2/Network/SDN.pm | 6 ++ src/PVE/API2/Network/SDN/Ipam.pm | 172 ++++++++++++++++++++++++++++++ src/PVE/API2/Network/SDN/Makefile | 2 +- 3 files changed, 179 insertions(+), 1 deletion(-) create mode 100644 src/PVE/API2/Network/SDN/Ipam.pm diff --git a/src/PVE/API2/Network/SDN.pm b/src/PVE/API2/Network/SDN.pm index d216e48..551afcf 100644 --- a/src/PVE/API2/Network/SDN.pm +++ b/src/PVE/API2/Network/SDN.pm @@ -15,6 +15,7 @@ use PVE::Network::SDN; use PVE::API2::Network::SDN::Controllers; use PVE::API2::Network::SDN::Vnets; use PVE::API2::Network::SDN::Zones; +use PVE::API2::Network::SDN::Ipam; use PVE::API2::Network::SDN::Ipams; use PVE::API2::Network::SDN::Dns; @@ -35,6 +36,11 @@ __PACKAGE__->register_method ({ path => 'controllers', }); +__PACKAGE__->register_method ({ + subclass => "PVE::API2::Network::SDN::Ipam", + path => 'ipam', +}); + __PACKAGE__->register_method ({ subclass => "PVE::API2::Network::SDN::Ipams", path => 'ipams', diff --git a/src/PVE/API2/Network/SDN/Ipam.pm b/src/PVE/API2/Network/SDN/Ipam.pm new file mode 100644 index 0000000..66131e3 --- /dev/null +++ b/src/PVE/API2/Network/SDN/Ipam.pm @@ -0,0 +1,172 @@ +package PVE::API2::Network::SDN::Ipam; + +use strict; +use warnings; + +use PVE::Tools qw(extract_param); +use PVE::Cluster qw(cfs_read_file cfs_write_file); + +use PVE::Network::SDN; +use PVE::Network::SDN::Dhcp; +use PVE::Network::SDN::Vnets; +use PVE::Network::SDN::Ipams::Plugin; + +use PVE::JSONSchema qw(get_standard_option); +use PVE::RPCEnvironment; + +use PVE::RESTHandler; + +use base qw(PVE::RESTHandler); + +__PACKAGE__->register_method ({ + name => 'dhcpindex', + path => '', + method => 'GET', + description => 'List DHCP Mappings', + protected => 1, + permissions => { + }, + parameters => { + }, + returns => { + type => 'array', + }, + code => sub { + my ($param) = @_; + + my $ipam_plugin = PVE::Network::SDN::Ipams::Plugin->lookup('pve'); + my $ipam_db = $ipam_plugin->read_db(); + + my $result = []; + + for my $zone_id (keys %{$ipam_db->{zones}}) { + my $zone_config = PVE::Network::SDN::Zones::get_zone($zone_id, 1); + next if !$zone_config || $zone_config->{ipam} ne 'pve' || !$zone_config->{dhcp}; + + my $zone = $ipam_db->{zones}->{$zone_id}; + + my $vnets = PVE::Network::SDN::Zones::get_vnets($zone_id, 1); + + for my $subnet_cidr (keys %{$zone->{subnets}}) { + my $subnet = $zone->{subnets}->{$subnet_cidr}; + my $ip = new Net::IP ($subnet_cidr) or die 'Found invalid CIDR in IPAM'; + + my $vnet = undef; + for my $vnet_id (keys %$vnets) { + eval { + my ($zone, $subnetid, $subnet_cfg, $ip) = PVE::Network::SDN::Vnets::get_subnet_from_vnet_ip( + $vnet_id, + $ip->ip(), + ); + + $vnet = $subnet_cfg->{vnet}; + }; + + last if $vnet; + } + + for my $ip (keys %{$subnet->{ips}}) { + my $entry = $subnet->{ips}->{$ip}; + $entry->{zone} = $zone_id; + $entry->{subnet} = $subnet_cidr; + $entry->{ip} = $ip; + + if ($vnet) { + $entry->{vnet} = $vnet; + } + + push @$result, $entry; + } + } + } + + return $result; + }, +}); + +__PACKAGE__->register_method ({ + name => 'dhcpdelete', + path => '{vnet}/{mac}', + method => 'DELETE', + description => 'Delete DHCP Mapping', + protected => 1, + permissions => { + }, + parameters => { + additionalProperties => 0, + mac => { type => 'string' }, + vnet => { type => 'string' }, + }, + returns => { type => 'null' }, + code => sub { + my ($param) = @_; + + my $vnet = extract_param($param, 'vnet'); + my $mac = extract_param($param, 'mac'); + + PVE::Network::SDN::Dhcp::remove_mapping($vnet, $mac); + PVE::Network::SDN::Vnets::del_ips_from_mac($vnet, $mac); + + return undef; + }, +}); + +__PACKAGE__->register_method ({ + name => 'dhcpcreate', + path => '{vnet}/{mac}', + method => 'POST', + description => 'Create DHCP Mapping', + protected => 1, + permissions => { + }, + parameters => { + additionalProperties => 0, + mac => { type => 'string' }, + vnet => { type => 'string' }, + ip => { type => 'string' }, + }, + returns => { type => 'null' }, + code => sub { + my ($param) = @_; + + my $vnet = extract_param($param, 'vnet'); + my $mac = extract_param($param, 'mac'); + my $ip = extract_param($param, 'ip'); + + PVE::Network::SDN::Vnets::add_ip($vnet, $ip, '', $mac, undef); + + return undef; + }, +}); +__PACKAGE__->register_method ({ + name => 'dhcpupdate', + path => '{vnet}/{mac}', + method => 'PUT', + description => 'Update DHCP Mapping', + protected => 1, + permissions => { + }, + parameters => { + additionalProperties => 0, + mac => { type => 'string' }, + vnet => { type => 'string' }, + vmid => { type => 'string' }, + ip => { type => 'string' }, + }, + returns => { type => 'null' }, + code => sub { + my ($param) = @_; + + my $vnet = extract_param($param, 'vnet'); + my $mac = extract_param($param, 'mac'); + my $vmid = extract_param($param, 'vmid'); + my $ip = extract_param($param, 'ip'); + + PVE::Network::SDN::Vnets::del_ips_from_mac($vnet, $mac, ''); + PVE::Network::SDN::Vnets::add_ip($vnet, $ip, '', $mac, $vmid); + + return undef; + }, +}); + +1; diff --git a/src/PVE/API2/Network/SDN/Makefile b/src/PVE/API2/Network/SDN/Makefile index 3683fa4..2480c09 100644 --- a/src/PVE/API2/Network/SDN/Makefile +++ b/src/PVE/API2/Network/SDN/Makefile @@ -1,4 +1,4 @@ -SOURCES=Vnets.pm Zones.pm Controllers.pm Subnets.pm Ipams.pm Dns.pm +SOURCES=Vnets.pm Zones.pm Controllers.pm Subnets.pm Ipams.pm Ipam.pm Dns.pm PERL5DIR=${DESTDIR}/usr/share/perl5 -- 2.39.2