From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 02E491FF15E for ; Fri, 26 Jul 2024 14:22:48 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4CE331DDDF; Fri, 26 Jul 2024 14:22:48 +0200 (CEST) Mime-Version: 1.0 Date: Fri, 26 Jul 2024 14:22:15 +0200 Message-Id: From: "Shannon Sterz" To: "Proxmox VE development discussion" X-Mailer: aerc 0.17.0-69-g65571b67d7d3-dirty References: <20240703080147.81154-1-a.lauterer@proxmox.com> <20240703080147.81154-3-a.lauterer@proxmox.com> In-Reply-To: <20240703080147.81154-3-a.lauterer@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL -0.049 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 common v3 2/3] fix #3893: network: add vlan id and range parameter definitions 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" On Wed Jul 3, 2024 at 10:01 AM CEST, Aaron Lauterer wrote: > This is one step to make it possible to define the VLAN IDs and ranges > for bridges. > > It is expected to be used in combination with the `-list` magic > property. Therefore it defines and checks the validity of a single list > item that could just be a single VLAN tag ID or a range. > > Signed-off-by: Aaron Lauterer > --- > changes since v2: > * renamed schema to a more generic one with the use case of the guest > trunk config in mind > > src/PVE/JSONSchema.pm | 34 ++++++++++++++++++++++++++++++++++ > 1 file changed, 34 insertions(+) > > diff --git a/src/PVE/JSONSchema.pm b/src/PVE/JSONSchema.pm > index 115f811..22fe048 100644 > --- a/src/PVE/JSONSchema.pm > +++ b/src/PVE/JSONSchema.pm > @@ -81,6 +81,12 @@ register_standard_option('pve-iface', { > minLength => 2, maxLength => 20, > }); > > +register_standard_option('pve-vlan-id-or-range', { > + description => "VLAN ID or range.", > + type => 'string', format => 'pve-vlan-id-or-range', > + minLength => 1, maxLength => 9, > +}); > + > register_standard_option('pve-storage-id', { > description => "The storage identifier.", > type => 'string', format => 'pve-storage-id', > @@ -595,6 +601,34 @@ sub pve_verify_iface { > return $id; > } > > +# vlan id (vids), single or range > +register_format('pve-vlan-id-or-range', \&pve_verify_vlan_id_or_range); > +sub pve_verify_vlan_id_or_range { > + my ($vlan, $noerr) = @_; > + > + my $check_vid = sub { > + my $tag = shift; > + if ( $tag < 2 || $tag > 4094) { > + return undef if $noerr; > + die "invalid VLAN tag '$tag'\n"; > + } > + }; > + > + if ($vlan !~ m/^(\d+)([-](\d+))?$/i) { nit: pretty sure you can ommit the [] brackets here and you could use a non-capturing group to get this somewhat cleaner regex: ^(\d+)(?:-(\d+))?$ also not sure this needs to be case insensitive, but it's probably fine. by using a non capturing group you don't get the useless "-" in the second group... > + return undef if $noerr; > + die "invalid VLAN configuration '$vlan'\n"; > + } > + my $start = $1; > + my $end = $3; ... so this becomes: my $end = $2; > + return undef if (!defined $check_vid->($start)); nit: there is an extra space here. > + if ($end) { > + return undef if (!defined $check_vid->($end)); > + die "VLAN range must go from lower to higher tag '$vlan'" if $start >= $end && !$noerr; > + } > + > + return $vlan; > +} > + > # general addresses by name or IP > register_format('address', \&pve_verify_address); > sub pve_verify_address { _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel