From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <a.lauterer@proxmox.com>
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 320C0F73C
for <pve-devel@lists.proxmox.com>; Fri, 29 Sep 2023 15:37:15 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 1AEA2242A
for <pve-devel@lists.proxmox.com>; Fri, 29 Sep 2023 15:37:15 +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 <pve-devel@lists.proxmox.com>; Fri, 29 Sep 2023 15:37:13 +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 8C2004472D
for <pve-devel@lists.proxmox.com>; Fri, 29 Sep 2023 15:37:13 +0200 (CEST)
Message-ID: <e750146d-78eb-42e3-9e70-4e07aefe9ef6@proxmox.com>
Date: Fri, 29 Sep 2023 15:37:12 +0200
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Content-Language: en-US
From: Aaron Lauterer <a.lauterer@proxmox.com>
To: pve-devel@lists.proxmox.com
Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
References: <20230614093033.820848-1-a.lauterer@proxmox.com>
In-Reply-To: <20230614093033.820848-1-a.lauterer@proxmox.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
X-SPAM-LEVEL: Spam detection results: 0
AWL -0.077 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: Re: [pve-devel] [PATCH v2 common 1/4] fix #3893: network: make
bridge vids configurable
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Fri, 29 Sep 2023 13:37:15 -0000
ping? patches still apply cleanly
On 6/14/23 11:30, Aaron Lauterer wrote:
> For that we need to add a new format option that checks against valid
> VLAN tags and ranges, for example: 2 4 100-200
>
> The check, if the default value should be used, needs to fail not just
> when not defined, but also in case it is an empty string.
>
> Signed-off-by: Aaron Lauterer <a.lauterer@proxmox.com>
> ---
> no changes since v1.
>
> I think replacing the 'defined' check with 'length' should be fine. We
> need to also handle the situation that the parameter is defined, but an
> empty string. There should be no autovivification happening. If I missed
> a side effect, let me know.
>
> For the new format option I went with singular for the name as it only
> checks a single VLAN ID/range from the list, 'pve-bridge-vid', but I am
> not sure if it wouldn't be better to call it the actual parameter name
> 'pve-bridge-vids'.
>
> src/PVE/INotify.pm | 2 +-
> src/PVE/JSONSchema.pm | 32 ++++++++++++++++++++++++++++++++
> 2 files changed, 33 insertions(+), 1 deletion(-)
>
> diff --git a/src/PVE/INotify.pm b/src/PVE/INotify.pm
> index bc33a8f..14f40ac 100644
> --- a/src/PVE/INotify.pm
> +++ b/src/PVE/INotify.pm
> @@ -1270,7 +1270,7 @@ sub __interface_to_string {
>
> if (defined($d->{bridge_vlan_aware})) {
> $raw .= "\tbridge-vlan-aware yes\n";
> - my $vlans = defined($d->{bridge_vids}) ? $d->{bridge_vids} : "2-4094";
> + my $vlans = length($d->{bridge_vids}) ? $d->{bridge_vids} : "2-4094";
> $raw .= "\tbridge-vids $vlans\n";
> }
> $done->{bridge_vlan_aware} = 1;
> diff --git a/src/PVE/JSONSchema.pm b/src/PVE/JSONSchema.pm
> index 85d47f2..1051a45 100644
> --- a/src/PVE/JSONSchema.pm
> +++ b/src/PVE/JSONSchema.pm
> @@ -78,6 +78,12 @@ register_standard_option('pve-iface', {
> minLength => 2, maxLength => 20,
> });
>
> +register_standard_option('pve-bridge-vid', {
> + description => "Bridge VLAN ID.",
> + type => 'string', format => 'pve-bridge-vid',
> + minLength => 1, maxLength => 9,
> +});
> +
> register_standard_option('pve-storage-id', {
> description => "The storage identifier.",
> type => 'string', format => 'pve-storage-id',
> @@ -588,6 +594,32 @@ sub pve_verify_iface {
> return $id;
> }
>
> +# bridge vlan id (vids)
> +register_format('pve-bridge-vid', \&pve_verify_bridge_vid);
> +sub pve_verify_bridge_vid {
> + my ($vlan, $noerr) = @_;
> +
> + my $check_vid = sub {
> + my $id = shift;
> + if ( $id < 2 || $id > 4094) {
> + return undef if $noerr;
> + die "invalid VLAN tag '$id'\n";
> + }
> + };
> +
> + if ($vlan !~ m/^(\d+)([-](\d+))?$/i) {
> + return undef if $noerr;
> + die "invalid VLAN configuration '$vlan'\n";
> + }
> + $check_vid->($1);
> + if ($3) {
> + $check_vid->($3);
> + die "VLAN range must go from lower to higher tag '$vlan'" if $1 > $3 && !$noerr;
> + }
> +
> + return $vlan;
> +}
> +
> # general addresses by name or IP
> register_format('address', \&pve_verify_address);
> sub pve_verify_address {