From: Aaron Lauterer <a.lauterer@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH manager v4 6/7] fix #3893: api: network: add bridge_vids parameter
Date: Mon, 29 Jul 2024 13:55:39 +0200 [thread overview]
Message-ID: <20240729115540.191594-7-a.lauterer@proxmox.com> (raw)
In-Reply-To: <20240729115540.191594-1-a.lauterer@proxmox.com>
Signed-off-by: Aaron Lauterer <a.lauterer@proxmox.com>
Tested-By: Stefan Hanreich <s.hanreich@proxmox.com>
Reviewed-by: Shannon Sterz <s.sterz@proxmox.com>
---
changes since
v3:
* changed "vlans" to "VLANs" in description
v2:
* added checks to handle empty lists
PVE/API2/Network.pm | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/PVE/API2/Network.pm b/PVE/API2/Network.pm
index f39f04f5..a1dad4b5 100644
--- a/PVE/API2/Network.pm
+++ b/PVE/API2/Network.pm
@@ -66,6 +66,11 @@ my $confdesc = {
type => 'boolean',
optional => 1,
},
+ bridge_vids => {
+ description => "Specify the allowed VLANs. For example: '2 4 100-200'. Only used if the bridge is VLAN aware.",
+ optional => 1,
+ type => 'string', format => 'pve-vlan-id-or-range-list',
+ },
bridge_ports => {
description => "Specify the interfaces you want to add to your bridge.",
optional => 1,
@@ -469,6 +474,10 @@ __PACKAGE__->register_method({
if ! grep { $_ eq $iface } @ports;
}
+ if ($param->{bridge_vids} && !PVE::Tools::check_list_empty($param->{bridge_vids})) {
+ raise_param_exc({ bridge_vids => "VLAN list items are empty" });
+ }
+
$ifaces->{$iface} = $param;
PVE::INotify::write_file('interfaces', $config);
@@ -558,7 +567,11 @@ __PACKAGE__->register_method({
foreach my $k (keys %$param) {
$ifaces->{$iface}->{$k} = $param->{$k};
}
-
+
+ if ($param->{bridge_vids} && !PVE::Tools::check_list_empty($param->{bridge_vids})) {
+ raise_param_exc({ bridge_vids => "VLAN list items are empty" });
+ }
+
PVE::INotify::write_file('interfaces', $config);
};
--
2.39.2
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
next prev parent reply other threads:[~2024-07-29 11:56 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-29 11:55 [pve-devel] [PATCH common, widget-toolkit, manager v4 0/7] fix #3893: make bridge vids configurable Aaron Lauterer
2024-07-29 11:55 ` [pve-devel] [PATCH common v4 1/7] tools: add check_list_empty function Aaron Lauterer
2024-09-09 14:02 ` Fiona Ebner
2024-09-10 6:56 ` Aaron Lauterer
2024-07-29 11:55 ` [pve-devel] [PATCH common v4 2/7] fix #3893: network: add vlan id and range parameter definitions Aaron Lauterer
2024-09-10 9:21 ` Fiona Ebner
2024-07-29 11:55 ` [pve-devel] [PATCH common v4 3/7] inotify: interfaces: make sure bridge_vids use space as separator Aaron Lauterer
2024-09-10 9:37 ` Fiona Ebner
2024-07-29 11:55 ` [pve-devel] [PATCH widget-toolkit v4 4/7] fix #3892: Network: add bridge vids field for bridge_vids Aaron Lauterer
2024-07-29 11:55 ` [pve-devel] [PATCH widget-toolkit v4 5/7] Network: add explanation for bridge vids field Aaron Lauterer
2024-07-29 11:55 ` Aaron Lauterer [this message]
2024-07-29 11:55 ` [pve-devel] [PATCH manager v4 7/7] fix #3893: ui: network: enable bridge_vids field Aaron Lauterer
2024-10-02 13:13 ` [pve-devel] [PATCH common, widget-toolkit, manager v4 0/7] fix #3893: make bridge vids configurable Aaron Lauterer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240729115540.191594-7-a.lauterer@proxmox.com \
--to=a.lauterer@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.