From: Aaron Lauterer <a.lauterer@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH manager v5 6/7] fix #3893: api: network: add bridge_vids parameter
Date: Wed, 2 Oct 2024 15:11:56 +0200 [thread overview]
Message-ID: <20241002131157.227292-7-a.lauterer@proxmox.com> (raw)
In-Reply-To: <20241002131157.227292-1-a.lauterer@proxmox.com>
The API itself allows several list separators. The network configuration
for bridge_vids expects a space separated list. We therefore convert it
initially to a space separated list.
Signed-off-by: Aaron Lauterer <a.lauterer@proxmox.com>
---
I opted for a comment before the step where we split and reassemble the
list with spaces as separators as this step might be a bit obscure if
one is not aware of the reason (interfaces syntax).
Feel free to drop the comments if you think they are unnessecary
changes since
v4:
* use the list_is_empty function, therefore avoiding negative matches
* recreate the list with spaces as separators
v3:
* changed "vlans" to "VLANs" in description
v2:
* added checks to handle empty lists
PVE/API2/Network.pm | 23 ++++++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
diff --git a/PVE/API2/Network.pm b/PVE/API2/Network.pm
index f39f04f5..397239ed 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,14 @@ __PACKAGE__->register_method({
if ! grep { $_ eq $iface } @ports;
}
+ if ($param->{bridge_vids} && PVE::Tools::list_is_empty($param->{bridge_vids})) {
+ raise_param_exc({ bridge_vids => "VLAN list items are empty" });
+ }
+ # make sure the list is space separated! other separators will cause problems in the
+ # network configuration
+ $param->{bridge_vids} = join(" ", PVE::Tools::split_list($param->{bridge_vids}))
+ if $param->{bridge_vids};
+
$ifaces->{$iface} = $param;
PVE::INotify::write_file('interfaces', $config);
@@ -558,7 +571,15 @@ __PACKAGE__->register_method({
foreach my $k (keys %$param) {
$ifaces->{$iface}->{$k} = $param->{$k};
}
-
+
+ if ($param->{bridge_vids} && PVE::Tools::list_is_empty($param->{bridge_vids})) {
+ raise_param_exc({ bridge_vids => "VLAN list items are empty" });
+ }
+ # make sure the list is space separated! other separators will cause problems in the
+ # network configuration
+ $param->{bridge_vids} = join(" ", PVE::Tools::split_list($param->{bridge_vids}))
+ if $param->{bridge_vids};
+
PVE::INotify::write_file('interfaces', $config);
};
--
2.39.5
_______________________________________________
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-10-02 13:12 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-02 13:11 [pve-devel] [PATCH common, widget-toolkit, manager v5 0/7] fix #3893: make bridge vids configurable Aaron Lauterer
2024-10-02 13:11 ` [pve-devel] [PATCH common v5 1/7] tools: add check_list_empty function Aaron Lauterer
2024-10-02 13:11 ` [pve-devel] [PATCH common v5 2/7] inotify: interfaces: check if bridge_vids is truthy instead of defined Aaron Lauterer
2024-10-02 13:11 ` [pve-devel] [PATCH common v5 3/7] fix #3893: network: add vlan id and range parameter definitions Aaron Lauterer
2024-10-02 13:11 ` [pve-devel] [PATCH widget-toolkit v5 4/7] fix #3892: Network: add bridge vids field for bridge_vids Aaron Lauterer
2024-10-02 13:11 ` [pve-devel] [PATCH widget-toolkit v5 5/7] Network: add explanation for bridge vids field Aaron Lauterer
2024-10-02 13:11 ` Aaron Lauterer [this message]
2024-10-02 13:11 ` [pve-devel] [PATCH manager v5 7/7] fix #3893: ui: network: enable bridge_vids field 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=20241002131157.227292-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox