From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 9F2D21FF168 for ; Tue, 10 Dec 2024 16:11:30 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C741632852; Tue, 10 Dec 2024 16:11:35 +0100 (CET) From: Gabriel Goller To: pve-devel@lists.proxmox.com Date: Tue, 10 Dec 2024 16:11:30 +0100 Message-Id: <20241210151130.321984-4-g.goller@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241210151130.321984-1-g.goller@proxmox.com> References: <20241210151130.321984-1-g.goller@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.034 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH container v2 3/3] api: return all addresses of an interface 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Return all ip-addresses of an interface, not only the first one. Change return schema to resemble the 'agent/network-get-interfaces' qemu call. This helps us making the AgentIPView more generic and display the ip on both containers and vms. Signed-off-by: Gabriel Goller --- src/PVE/API2/LXC.pm | 35 +++++++++++++++++++++++++---------- src/PVE/LXC.pm | 7 +++++-- 2 files changed, 30 insertions(+), 12 deletions(-) diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm index 213e518a7b62..b14e88a7baf2 100644 --- a/src/PVE/API2/LXC.pm +++ b/src/PVE/API2/LXC.pm @@ -2546,20 +2546,35 @@ __PACKAGE__->register_method({ description => 'The name of the interface', optional => 0, }, - hwaddr => { + "hardware-address" => { type => 'string', description => 'The MAC address of the interface', optional => 0, }, - inet => { - type => 'string', - description => 'The IPv4 address of the interface', - optional => 1, - }, - inet6 => { - type => 'string', - description => 'The IPv6 address of the interface', - optional => 1, + "ip-addresses" => { + type => 'array', + description => 'All the Addresses of the interface', + optional => 0, + items => { + type => 'object', + properties => { + prefix => { + type => 'integer', + description => 'IP-Prefix', + optional => 1, + }, + "ip-address" => { + type => 'string', + description => 'IP-Address', + optional => 1, + }, + "ip-address-type" => { + type => 'string', + description => 'IP-Family', + optional => 1, + }, + } + } }, } }, diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm index e78e36576fc3..60d92d69abcc 100644 --- a/src/PVE/LXC.pm +++ b/src/PVE/LXC.pm @@ -1141,10 +1141,13 @@ sub get_interfaces { my $res; for my $interface ($config->@*) { my $obj = { name => $interface->{ifname} }; + my @list = (); for my $ip ($interface->{addr_info}->@*) { - $obj->{$ip->{family}} = $ip->{local} . "/" . $ip->{prefixlen}; + my $ip = {'ip-address-type' => $ip->{family}, 'ip-address' => $ip->{local}, 'prefix' => $ip->{prefixlen}}; + push(@list, $ip); } - $obj->{hwaddr} = $interface->{address}; + $obj->{'ip-addresses'} = \@list; + $obj->{'hardware-address'} = $interface->{address}; push @$res, $obj } -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel