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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 0BE5B9B974 for ; Fri, 26 May 2023 09:27:34 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E843CA8DA for ; Fri, 26 May 2023 09:27:33 +0200 (CEST) Received: from bastionodiso.odiso.net (bastionodiso.odiso.net [185.151.191.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 26 May 2023 09:27:32 +0200 (CEST) Received: from kvmformation3.odiso.net (formationkvm3.odiso.net [10.3.94.12]) by bastionodiso.odiso.net (Postfix) with ESMTP id 3FB147C05; Fri, 26 May 2023 09:27:26 +0200 (CEST) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id 31B342E3A67; Fri, 26 May 2023 09:27:26 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Fri, 26 May 2023 09:27:22 +0200 Message-Id: <20230526072724.1605613-3-aderumier@odiso.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230526072724.1605613-1-aderumier@odiso.com> References: <20230526072724.1605613-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.021 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 HEADER_FROM_DIFFERENT_DOMAINS 0.249 From and EnvelopeFrom 2nd level mail domains are different 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 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] [PATCH pve-manager 2/4] add permissions management for "local" network zone 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: Fri, 26 May 2023 07:27:34 -0000 add a default virtual zone called 'local' in the ressource tree, and handle permissions like a true sdn zone Signed-off-by: Alexandre Derumier --- PVE/API2/Cluster.pm | 12 ++++++++++++ PVE/API2/Network.pm | 5 +++-- www/manager6/sdn/ZoneContentView.js | 27 ++++++++++++++++++++++++++- 3 files changed, 41 insertions(+), 3 deletions(-) diff --git a/PVE/API2/Cluster.pm b/PVE/API2/Cluster.pm index 2e942368..e8f5e06e 100644 --- a/PVE/API2/Cluster.pm +++ b/PVE/API2/Cluster.pm @@ -474,6 +474,18 @@ __PACKAGE__->register_method({ } } + #add default "local" network zone + foreach my $node (@$nodelist) { + my $local_sdn = { + id => "sdn/$node/local", + sdn => 'local', + node => $node, + type => 'sdn', + status => 'ok', + }; + push @$res, $local_sdn; + } + if ($have_sdn) { if (!$param->{type} || $param->{type} eq 'sdn') { diff --git a/PVE/API2/Network.pm b/PVE/API2/Network.pm index a43579fa..b3faba1a 100644 --- a/PVE/API2/Network.pm +++ b/PVE/API2/Network.pm @@ -209,7 +209,7 @@ __PACKAGE__->register_method({ type => { description => "Only list specific interface types.", type => 'string', - enum => [ @$network_type_enum, 'any_bridge' ], + enum => [ @$network_type_enum, 'any_bridge', 'any_local_bridge' ], optional => 1, }, }, @@ -254,7 +254,8 @@ __PACKAGE__->register_method({ for my $k (sort keys $ifaces->%*) { my $type = $ifaces->{$k}->{type}; - my $match = $tfilter eq $type || ($tfilter eq 'any_bridge' && ($type eq 'bridge' || $type eq 'OVSBridge')); + my $match = $tfilter eq $type || ($tfilter =~ /^any(_local)?_bridge$/ && ($type eq 'bridge' || $type eq 'OVSBridge')); + delete $ifaces->{$k} if !($match && $can_access_vnet->($k)); } diff --git a/www/manager6/sdn/ZoneContentView.js b/www/manager6/sdn/ZoneContentView.js index 08fa9d81..1a994fc9 100644 --- a/www/manager6/sdn/ZoneContentView.js +++ b/www/manager6/sdn/ZoneContentView.js @@ -26,6 +26,9 @@ Ext.define('PVE.sdn.ZoneContentView', { } var baseurl = "/nodes/" + me.nodename + "/sdn/zones/" + me.zone + "/content"; + if (me.zone === 'local') { + baseurl = "/nodes/" + me.nodename + "/network?type=any_local_bridge"; + } var store = Ext.create('Ext.data.Store', { model: 'pve-sdnzone-content', groupField: 'content', @@ -95,7 +98,29 @@ Ext.define('PVE.sdn.ZoneContentView', { Ext.define('pve-sdnzone-content', { extend: 'Ext.data.Model', fields: [ - 'vnet', 'status', 'statusmsg', + { + name: 'iface', + convert: function(value, record) { + //map local vmbr to vnet + if (record.data.iface) { + record.data.vnet = record.data.iface; + } + return value; + }, + }, + { + name: 'comments', + convert: function(value, record) { + //map local vmbr comments to vnet alias + if (record.data.comments) { + record.data.alias = record.data.comments; + } + return value; + }, + }, + 'vnet', + 'status', + 'statusmsg', { name: 'text', convert: function(value, record) { -- 2.30.2