From: Wolfgang Bumiller <w.bumiller@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH network 3/7] api: take partial configs for PUT /cluster/sdn/vnets/<id>
Date: Wed, 22 Nov 2023 12:53:46 +0100 [thread overview]
Message-ID: <20231122115350.131255-4-w.bumiller@proxmox.com> (raw)
In-Reply-To: <20231122115350.131255-1-w.bumiller@proxmox.com>
Handle 'delete' parameter and partial updates.
See previous commit for explanation.
Cc: Alexandre Derumier <aderumier@odiso.com>
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
---
src/PVE/API2/Network/SDN/Vnets.pm | 24 ++++++++++++++++++++----
1 file changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/PVE/API2/Network/SDN/Vnets.pm b/src/PVE/API2/Network/SDN/Vnets.pm
index a32df8c..57de295 100644
--- a/src/PVE/API2/Network/SDN/Vnets.pm
+++ b/src/PVE/API2/Network/SDN/Vnets.pm
@@ -244,21 +244,37 @@ __PACKAGE__->register_method ({
my $id = extract_param($param, 'vnet');
my $digest = extract_param($param, 'digest');
+ my $delete = extract_param($param, 'delete');
my $privs = [ 'SDN.Allocate' ];
&$check_vnet_access($id, $privs);
+ if ($delete) {
+ $delete = [ PVE::Tools::split_list($delete) ];
+ }
+
PVE::Network::SDN::lock_sdn_config(sub {
my $cfg = PVE::Network::SDN::Vnets::config();
PVE::SectionConfig::assert_if_modified($cfg, $digest);
my $opts = PVE::Network::SDN::VnetPlugin->check_config($id, $param, 0, 1);
- raise_param_exc({ zone => "missing zone"}) if !$opts->{zone};
- my $subnets = PVE::Network::SDN::Vnets::get_subnets($id);
- raise_param_exc({ zone => "can't change zone if subnets exists"}) if($subnets && $opts->{zone} ne $cfg->{ids}->{$id}->{zone});
- $cfg->{ids}->{$id} = $opts;
+ my $data = $cfg->{ids}->{$id};
+ my $old_zone = $data->{zone};
+
+ if ($delete) {
+ my $options = PVE::Network::SDN::VnetPlugin->private()->{options}->{$data->{type}};
+ PVE::SectionConfig::delete_from_config($data, $options, $opts, $delete);
+ }
+
+ $data->{$_} = $opts->{$_} for keys $opts->%*;
+
+ my $new_zone = $data->{zone};
+ raise_param_exc({ zone => "cannot delete zone"}) if !$new_zone;
+ my $subnets = PVE::Network::SDN::Vnets::get_subnets($id);
+ raise_param_exc({ zone => "can't change zone if subnets exist"})
+ if $subnets && $old_zone ne $new_zone;
my $zone_cfg = PVE::Network::SDN::Zones::config();
my $zoneid = $cfg->{ids}->{$id}->{zone};
--
2.39.2
next prev parent reply other threads:[~2023-11-22 11:54 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-22 11:53 [pve-devel] applied-series: [PATCH network 0/7] PUT API endpoint changes Wolfgang Bumiller
2023-11-22 11:53 ` [pve-devel] [PATCH network 1/7] Revert "sdn: require ipam in simple plugin for dhcp" Wolfgang Bumiller
2023-11-22 11:53 ` [pve-devel] [PATCH network 2/7] api: take partial configs for PUT /cluster/sdn/zones/<id> Wolfgang Bumiller
2023-11-22 11:53 ` Wolfgang Bumiller [this message]
2023-11-22 11:53 ` [pve-devel] [PATCH network 4/7] api: take partial configs for PUT /cluster/sdn/vnets/<n>/subnets/<i> Wolfgang Bumiller
2023-11-22 11:53 ` [pve-devel] [PATCH network 5/7] api: handle delete parameter when updating ipams Wolfgang Bumiller
2023-11-22 11:53 ` [pve-devel] [PATCH network 6/7] api: handle delete parameter when updating dns entries Wolfgang Bumiller
2023-11-22 11:53 ` [pve-devel] [PATCH network 7/7] api: handle delete parameter when updating controllers Wolfgang Bumiller
2023-11-22 12:26 ` [pve-devel] applied-series: [PATCH network 0/7] PUT API endpoint changes Stefan Hanreich
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=20231122115350.131255-4-w.bumiller@proxmox.com \
--to=w.bumiller@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