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 E50B4A1757 for ; Thu, 15 Jun 2023 11:43:36 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CE64B24C26 for ; Thu, 15 Jun 2023 11:43:36 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 15 Jun 2023 11:43:36 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 17A5C458E4 for ; Thu, 15 Jun 2023 11:43:36 +0200 (CEST) From: Leo Nunner To: pve-devel@lists.proxmox.com Date: Thu, 15 Jun 2023 11:43:31 +0200 Message-Id: <20230615094333.66179-2-l.nunner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230615094333.66179-1-l.nunner@proxmox.com> References: <20230615094333.66179-1-l.nunner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.095 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 T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [lxc.pm] Subject: [pve-devel] [PATCH v2 container] api: network: get interfaces from containers 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: Thu, 15 Jun 2023 09:43:36 -0000 Adds an 'interfaces' endpoint in the API (/nodes/{node}/lxc/{vmid}/interfaces'), which returns a list of interface names, together with a MAC, IPv4 and IPv6 address. This list may be expanded in the future. Note that this is only returned for *running* containers, stopped containers simply return an empty list. Signed-off-by: Leo Nunner --- src/PVE/API2/LXC.pm | 50 +++++++++++++++++++++++++++++++++++++++++++++ src/PVE/LXC.pm | 26 +++++++++++++++++++++++ 2 files changed, 76 insertions(+) diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm index 28d14de..8839105 100644 --- a/src/PVE/API2/LXC.pm +++ b/src/PVE/API2/LXC.pm @@ -2510,6 +2510,56 @@ __PACKAGE__->register_method({ return PVE::GuestHelpers::config_with_pending_array($conf, $pending_delete_hash); }}); +__PACKAGE__->register_method({ + name => 'ip', + path => '{vmid}/interfaces', + method => 'GET', + protected => 1, + permissions => { + check => ['perm', '/vms/{vmid}', [ 'VM.Audit' ]], + }, + description => 'Get IP addresses of the specified container interface.', + parameters => { + additionalProperties => 0, + properties => { + node => get_standard_option('pve-node'), + vmid => get_standard_option('pve-vmid', { completion => \&PVE::LXC::complete_ctid }), + }, + }, + returns => { + type => "array", + items => { + type => 'object', + properties => { + name => { + type => 'string', + description => 'The name of the interface', + optional => 0, + }, + hwaddr => { + 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, + }, + } + }, + }, + code => sub { + my ($param) = @_; + + return PVE::LXC::get_interfaces($param->{vmid}); + }}); + __PACKAGE__->register_method({ name => 'mtunnel', path => '{vmid}/mtunnel', diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm index a531ea5..611f5c2 100644 --- a/src/PVE/LXC.pm +++ b/src/PVE/LXC.pm @@ -1036,6 +1036,32 @@ sub hotplug_net { PVE::LXC::Config->write_config($vmid, $conf); } +sub get_interfaces { + my ($vmid) = @_; + + my $pid = eval { find_lxc_pid($vmid); }; + return if $@; + + my $output; + # enters the network namespace of the container and executes 'ip a' + run_command(['nsenter', '-t', $pid, '--net', '--', 'ip', '--json', 'a'], + outfunc => sub { $output .= shift; }); + + my $config = JSON::decode_json($output); + + my $res; + for my $interface ($config->@*) { + my $obj = { name => $interface->{ifname} }; + for my $ip ($interface->{addr_info}->@*) { + $obj->{$ip->{family}} = $ip->{local} . "/" . $ip->{prefixlen}; + } + $obj->{hwaddr} = $interface->{address}; + push @$res, $obj + } + + return $res; +} + sub update_ipconfig { my ($vmid, $conf, $opt, $eth, $newnet, $rootdir) = @_; -- 2.30.2