From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pve-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9])
by lore.proxmox.com (Postfix) with ESMTPS id 7640D1FF2AD
for <inbox@lore.proxmox.com>; Wed, 3 Jul 2024 10:02:07 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 4B6052978;
Wed, 3 Jul 2024 10:02:21 +0200 (CEST)
From: Aaron Lauterer <a.lauterer@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Wed, 3 Jul 2024 10:01:43 +0200
Message-Id: <20240703080147.81154-3-a.lauterer@proxmox.com>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <20240703080147.81154-1-a.lauterer@proxmox.com>
References: <20240703080147.81154-1-a.lauterer@proxmox.com>
MIME-Version: 1.0
X-SPAM-LEVEL: Spam detection results: 0
AWL -0.042 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
URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See
http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more
information. [jsonschema.pm]
Subject: [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 <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>
Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: pve-devel-bounces@lists.proxmox.com
Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com>
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 <a.lauterer@proxmox.com>
---
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) {
+ return undef if $noerr;
+ die "invalid VLAN configuration '$vlan'\n";
+ }
+ my $start = $1;
+ my $end = $3;
+ return undef if (!defined $check_vid->($start));
+ 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 {
--
2.39.2
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel