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 17BDE9CA9 for ; Wed, 27 Apr 2022 07:56:22 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 032382301C for ; Wed, 27 Apr 2022 07:55:52 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 6F33A23011 for ; Wed, 27 Apr 2022 07:55:51 +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 46A3F42998 for ; Wed, 27 Apr 2022 07:55:51 +0200 (CEST) Message-ID: <5a3ff439-e589-7ea1-43d5-8c379ff3045a@proxmox.com> Date: Wed, 27 Apr 2022 07:55:50 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:100.0) Gecko/20100101 Thunderbird/100.0 Content-Language: en-US To: Proxmox VE development discussion , Dominik Csapak References: <20220412133423.1021857-1-d.csapak@proxmox.com> <20220412133423.1021857-4-d.csapak@proxmox.com> From: Thomas Lamprecht In-Reply-To: <20220412133423.1021857-4-d.csapak@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.958 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -1.857 Looks like a legit reply (A) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pve-devel] [PATCH cluster v6 3/3] datacenter.cfg: add option for tag-tree-style and tag-colors 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: Wed, 27 Apr 2022 05:56:22 -0000 On 12.04.22 15:34, Dominik Csapak wrote: something ate the commit message ;-) > Signed-off-by: Dominik Csapak > --- > data/PVE/DataCenterConfig.pm | 18 ++++++++++++++++++ > 1 file changed, 18 insertions(+) > > diff --git a/data/PVE/DataCenterConfig.pm b/data/PVE/DataCenterConfig.pm > index 6c0fa5b..c21dbb7 100644 > --- a/data/PVE/DataCenterConfig.pm > +++ b/data/PVE/DataCenterConfig.pm > @@ -106,6 +106,10 @@ sub pve_verify_mac_prefix { > return $mac_prefix; > } > > +my $TAG_RE = '[a-zA-Z0-9_][a-zA-Z0-9_\-\+\.]*'; > +my $COLOR_RE = '[0-9a-fA-F]{6}'; > +my $OVERRIDE_RE = "(?:${TAG_RE}=${COLOR_RE}(?:\:${COLOR_RE})?)"; > + > my $datacenter_schema = { > type => "object", > additionalProperties => 0, > @@ -222,6 +226,20 @@ my $datacenter_schema = { > maxLength => 64 * 1024, > optional => 1, > }, > + 'tag-tree-style' => { > + optional => 1, > + type => 'string', > + enum => ['full', 'circle', 'dense', 'none'], what's full vs. dense and why is the description not mentioning that? Also, isn't this less the style but more the shape? (but see below) > + default => 'circle', > + description => "Tag style in tree.", > + }, > + 'tag-colors' => { why don't we get a `tag-style` format-string property with a format that has `colors` and `shape` as members? the color list format would just need to change to: :[;:color>] > + optional => 1, > + type => 'string', > + pattern => "${OVERRIDE_RE}(?:\,$OVERRIDE_RE)*", sorry, but OVERRIDE_RE is really not a good variable name to use for a module wide regex, why not either $TAG_COLOR_OVERRIDE_RE or just set it inline? > + typetext => '=[:][,=...]', > + description => "Manual color mapping for tags (comma separated).", > + }, > }, > }; >