[pve-devel] [PATCH cluster v6 3/3] datacenter.cfg: add option for tag-tree-style and tag-colors

[Thomas Lamprecht]

On 12.04.22 15:34, Dominik Csapak wrote:

something ate the commit message ;-)

> Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
> ---
>  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: <tag>:<color>[;<tag>: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 => '<tag>=<hex-color>[:<hex-color-for-text>][,<tag>=...]',
> +	    description => "Manual color mapping for tags (comma separated).",
> +	},
>      },
>  };
>