From: Alexandre Derumier <aderumier@odiso.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v10 pve-network 30/35] move ipam option from subnet to zone
Date: Mon, 5 Oct 2020 17:09:07 +0200 [thread overview]
Message-ID: <20201005150912.463000-31-aderumier@odiso.com> (raw)
In-Reply-To: <20201005150912.463000-1-aderumier@odiso.com>
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
---
PVE/API2/Network/SDN/Zones.pm | 9 +++++++++
PVE/Network/SDN/SubnetPlugin.pm | 8 +-------
PVE/Network/SDN/Subnets.pm | 6 +++---
PVE/Network/SDN/Vnets.pm | 2 +-
PVE/Network/SDN/Zones/EvpnPlugin.pm | 1 +
PVE/Network/SDN/Zones/FaucetPlugin.pm | 1 +
PVE/Network/SDN/Zones/Plugin.pm | 4 ++++
PVE/Network/SDN/Zones/QinQPlugin.pm | 1 +
PVE/Network/SDN/Zones/SimplePlugin.pm | 3 ++-
PVE/Network/SDN/Zones/VlanPlugin.pm | 1 +
PVE/Network/SDN/Zones/VxlanPlugin.pm | 1 +
11 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/PVE/API2/Network/SDN/Zones.pm b/PVE/API2/Network/SDN/Zones.pm
index cbfa9fe..54f087d 100644
--- a/PVE/API2/Network/SDN/Zones.pm
+++ b/PVE/API2/Network/SDN/Zones.pm
@@ -88,6 +88,7 @@ __PACKAGE__->register_method ({
dns => { type => 'string', optional => 1},
reversedns => { type => 'string', optional => 1},
dnszone => { type => 'string', optional => 1},
+ ipam => { type => 'string', optional => 1},
pending => { optional => 1},
state => { type => 'string', optional => 1},
nodes => { type => 'string', optional => 1},
@@ -217,6 +218,10 @@ __PACKAGE__->register_method ({
raise_param_exc({ reversedns => "$reversednsserver don't exist"}) if $reversednsserver && !$dns_cfg->{ids}->{$reversednsserver};
raise_param_exc({ dnszone => "missing dns server"}) if $dnszone && !$dnsserver;
+ my $ipam = $opts->{ipam};
+ my $ipam_cfg = PVE::Network::SDN::Ipams::config();
+ raise_param_exc({ ipam => "$ipam not existing"}) if $ipam && !$ipam_cfg->{ids}->{$ipam};
+
$zone_cfg->{ids}->{$id} = $opts;
$plugin->on_update_hook($id, $zone_cfg, $controller_cfg);
@@ -269,6 +274,10 @@ __PACKAGE__->register_method ({
raise_param_exc({ reversedns => "$reversednsserver don't exist"}) if $reversednsserver && !$dns_cfg->{ids}->{$reversednsserver};
raise_param_exc({ dnszone => "missing dns server"}) if $dnszone && !$dnsserver;
+ my $ipam = $opts->{ipam};
+ my $ipam_cfg = PVE::Network::SDN::Ipams::config();
+ raise_param_exc({ ipam => "$ipam not existing"}) if $ipam && !$ipam_cfg->{ids}->{$ipam};
+
$plugin->on_update_hook($id, $zone_cfg, $controller_cfg);
PVE::Network::SDN::Zones::write_config($zone_cfg);
diff --git a/PVE/Network/SDN/SubnetPlugin.pm b/PVE/Network/SDN/SubnetPlugin.pm
index f57a5e9..a5d03f6 100644
--- a/PVE/Network/SDN/SubnetPlugin.pm
+++ b/PVE/Network/SDN/SubnetPlugin.pm
@@ -75,10 +75,6 @@ sub properties {
type => 'string', format => 'dns-name',
description => "dns domain zone prefix ex: 'adm' -> <hostname>.adm.mydomain.com",
},
- ipam => {
- type => 'string',
- description => "use a specific ipam",
- },
};
}
@@ -89,7 +85,6 @@ sub options {
# routes => { optional => 1 },
snat => { optional => 1 },
dnszoneprefix => { optional => 1 },
- ipam => { optional => 0 },
};
}
@@ -101,7 +96,7 @@ sub on_update_hook {
my $vnetid = $subnet->{vnet};
my $gateway = $subnet->{gateway};
- my $ipam = $subnet->{ipam};
+ my $ipam = $zone->{ipam};
my $dns = $zone->{dns};
my $dnszone = $zone->{dnszone};
my $reversedns = $zone->{reversedns};
@@ -121,7 +116,6 @@ sub on_update_hook {
if ($ipam) {
my $ipam_cfg = PVE::Network::SDN::Ipams::config();
my $plugin_config = $ipam_cfg->{ids}->{$ipam};
- raise_param_exc({ ipam => "$ipam not existing"}) if !$plugin_config;
my $plugin = PVE::Network::SDN::Ipams::Plugin->lookup($plugin_config->{type});
$plugin->add_subnet($plugin_config, $subnetid, $subnet);
diff --git a/PVE/Network/SDN/Subnets.pm b/PVE/Network/SDN/Subnets.pm
index aa7c6c1..50130d5 100644
--- a/PVE/Network/SDN/Subnets.pm
+++ b/PVE/Network/SDN/Subnets.pm
@@ -160,7 +160,7 @@ sub next_free_ip {
my $cidr = undef;
my $ip = undef;
- my $ipamid = $subnet->{ipam};
+ my $ipamid = $zone->{ipam};
my $dns = $zone->{dns};
my $dnszone = $zone->{dnszone};
my $reversedns = $zone->{reversedns};
@@ -204,7 +204,7 @@ sub add_ip {
return if !$subnet || !$ip;
- my $ipamid = $subnet->{ipam};
+ my $ipamid = $zone->{ipam};
my $dns = $zone->{dns};
my $dnszone = $zone->{dnszone};
my $reversedns = $zone->{reversedns};
@@ -246,7 +246,7 @@ sub del_ip {
return if !$subnet;
- my $ipamid = $subnet->{ipam};
+ my $ipamid = $zone->{ipam};
my $dns = $zone->{dns};
my $dnszone = $zone->{dnszone};
my $reversedns = $zone->{reversedns};
diff --git a/PVE/Network/SDN/Vnets.pm b/PVE/Network/SDN/Vnets.pm
index 3b49ada..d08db51 100644
--- a/PVE/Network/SDN/Vnets.pm
+++ b/PVE/Network/SDN/Vnets.pm
@@ -95,7 +95,7 @@ sub get_next_free_ip {
next if $ipversion != Net::IP::ip_get_version($network);
$subnetcount++;
- if ($subnet->{ipam}) {
+ if ($zone->{ipam}) {
eval {
$ip = PVE::Network::SDN::Subnets::next_free_ip($zone, $subnetid, $subnet, $hostname);
};
diff --git a/PVE/Network/SDN/Zones/EvpnPlugin.pm b/PVE/Network/SDN/Zones/EvpnPlugin.pm
index 3cb083b..723b3cc 100644
--- a/PVE/Network/SDN/Zones/EvpnPlugin.pm
+++ b/PVE/Network/SDN/Zones/EvpnPlugin.pm
@@ -40,6 +40,7 @@ sub options {
dns => { optional => 1 },
reversedns => { optional => 1 },
dnszone => { optional => 1 },
+ ipam => { optional => 0 },
};
}
diff --git a/PVE/Network/SDN/Zones/FaucetPlugin.pm b/PVE/Network/SDN/Zones/FaucetPlugin.pm
index 1b70a57..a9f119c 100644
--- a/PVE/Network/SDN/Zones/FaucetPlugin.pm
+++ b/PVE/Network/SDN/Zones/FaucetPlugin.pm
@@ -29,6 +29,7 @@ sub options {
dns => { optional => 1 },
reversedns => { optional => 1 },
dnszone => { optional => 1 },
+ ipam => { optional => 0 },
};
}
diff --git a/PVE/Network/SDN/Zones/Plugin.pm b/PVE/Network/SDN/Zones/Plugin.pm
index 7f6db0e..1f24269 100644
--- a/PVE/Network/SDN/Zones/Plugin.pm
+++ b/PVE/Network/SDN/Zones/Plugin.pm
@@ -44,6 +44,10 @@ my $defaultData = {
nodes => get_standard_option('pve-node-list', { optional => 1 }),
zone => get_standard_option('pve-sdn-zone-id',
{ completion => \&PVE::Network::SDN::Zones::complete_sdn_zone }),
+ ipam => {
+ type => 'string',
+ description => "use a specific ipam",
+ },
},
};
diff --git a/PVE/Network/SDN/Zones/QinQPlugin.pm b/PVE/Network/SDN/Zones/QinQPlugin.pm
index 8507ae6..aadfd27 100644
--- a/PVE/Network/SDN/Zones/QinQPlugin.pm
+++ b/PVE/Network/SDN/Zones/QinQPlugin.pm
@@ -43,6 +43,7 @@ sub options {
dns => { optional => 1 },
reversedns => { optional => 1 },
dnszone => { optional => 1 },
+ ipam => { optional => 0 },
};
}
diff --git a/PVE/Network/SDN/Zones/SimplePlugin.pm b/PVE/Network/SDN/Zones/SimplePlugin.pm
index 58cc1af..fe0f20f 100644
--- a/PVE/Network/SDN/Zones/SimplePlugin.pm
+++ b/PVE/Network/SDN/Zones/SimplePlugin.pm
@@ -26,7 +26,7 @@ sub properties {
dnszone => {
type => 'string', format => 'dns-name',
description => "dns domain zone ex: mydomain.com",
- },
+ }
};
}
@@ -37,6 +37,7 @@ sub options {
dns => { optional => 1 },
reversedns => { optional => 1 },
dnszone => { optional => 1 },
+ ipam => { optional => 0 },
};
}
diff --git a/PVE/Network/SDN/Zones/VlanPlugin.pm b/PVE/Network/SDN/Zones/VlanPlugin.pm
index fd750c9..e1ae75b 100644
--- a/PVE/Network/SDN/Zones/VlanPlugin.pm
+++ b/PVE/Network/SDN/Zones/VlanPlugin.pm
@@ -37,6 +37,7 @@ sub options {
dns => { optional => 1 },
reversedns => { optional => 1 },
dnszone => { optional => 1 },
+ ipam => { optional => 0 },
};
}
diff --git a/PVE/Network/SDN/Zones/VxlanPlugin.pm b/PVE/Network/SDN/Zones/VxlanPlugin.pm
index 7a6687a..e8870a0 100644
--- a/PVE/Network/SDN/Zones/VxlanPlugin.pm
+++ b/PVE/Network/SDN/Zones/VxlanPlugin.pm
@@ -41,6 +41,7 @@ sub options {
dns => { optional => 1 },
reversedns => { optional => 1 },
dnszone => { optional => 1 },
+ ipam => { optional => 0 },
};
}
--
2.20.1
next prev parent reply other threads:[~2020-10-05 15:09 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-05 15:08 [pve-devel] [PATCH v10 pve-network 00/35] add subnet plugin Alexandre Derumier
2020-10-05 15:08 ` [pve-devel] [PATCH v10 pve-network 01/35] " Alexandre Derumier
2020-10-05 15:08 ` [pve-devel] [PATCH v10 pve-network 02/35] vnets: add subnets Alexandre Derumier
2020-10-05 15:08 ` [pve-devel] [PATCH v10 pve-network 03/35] add subnets verifications hooks Alexandre Derumier
2020-10-05 15:08 ` [pve-devel] [PATCH v10 pve-network 04/35] zones: simple|evpn: add gateway ip from subnets to vnet Alexandre Derumier
2020-10-05 15:08 ` [pve-devel] [PATCH v10 pve-network 05/35] zone: add vnet_update_hook Alexandre Derumier
2020-10-05 15:08 ` [pve-devel] [PATCH v10 pve-network 06/35] vnets: subnets: use cidr Alexandre Derumier
2020-10-05 15:08 ` [pve-devel] [PATCH v10 pve-network 07/35] subnet: fix on_delete_hook Alexandre Derumier
2020-10-05 15:08 ` [pve-devel] [PATCH v10 pve-network 08/35] api2: subnet create: convert cidr to subnetid Alexandre Derumier
2020-10-05 15:08 ` [pve-devel] [PATCH v10 pve-network 09/35] api2: increase version on apply/reload only Alexandre Derumier
2020-10-05 15:08 ` [pve-devel] [PATCH v10 pve-network 10/35] add ipams plugins Alexandre Derumier
2020-10-05 15:08 ` [pve-devel] [PATCH v10 pve-network 11/35] add pve internal ipam plugin Alexandre Derumier
2020-10-05 15:08 ` [pve-devel] [PATCH v10 pve-network 12/35] vnets: find_free_ip : add ipversion detection Alexandre Derumier
2020-10-05 15:08 ` [pve-devel] [PATCH v10 pve-network 13/35] vnets: add add_ip Alexandre Derumier
2020-10-05 15:08 ` [pve-devel] [PATCH v10 pve-network 14/35] vnets: add del_ip + rework add_ip/find_free_ip Alexandre Derumier
2020-10-05 15:08 ` [pve-devel] [PATCH v10 pve-network 15/35] add dns plugin Alexandre Derumier
2020-10-05 15:08 ` [pve-devel] [PATCH v10 pve-network 16/35] Fix vnet gateway for routed setup + /32 pointopoint subnet Alexandre Derumier
2020-10-05 15:08 ` [pve-devel] [PATCH v10 pve-network 17/35] ipam : pveplugin : fix find_next_free_ip Alexandre Derumier
2020-10-05 15:08 ` [pve-devel] [PATCH v10 pve-network 18/35] add vnet to subnets && remove subnetlist from vnet Alexandre Derumier
2020-10-05 15:08 ` [pve-devel] [PATCH v10 pve-network 19/35] zones: evpn|simple: add snat iptables rules Alexandre Derumier
2020-10-05 15:08 ` [pve-devel] [PATCH v10 pve-network 20/35] subnet: disable route option for now and add dns domain format Alexandre Derumier
2020-10-05 15:08 ` [pve-devel] [PATCH v10 pve-network 21/35] dns: fix reverse dns Alexandre Derumier
2020-10-05 15:08 ` [pve-devel] [PATCH v10 pve-network 22/35] subnets: move api to /sdn/vnet/<vnet>/subnets && make vnet option not optionnal Alexandre Derumier
2020-10-05 15:09 ` [pve-devel] [PATCH v10 pve-network 23/35] zones: evpn : fix raise exception Alexandre Derumier
2020-10-05 15:09 ` [pve-devel] [PATCH v10 pve-network 24/35] subnet: make ipam not optionnal and use pve ipam as default Alexandre Derumier
2020-10-05 15:09 ` [pve-devel] [PATCH v10 pve-network 25/35] don't allow subnets on vlanware vnet Alexandre Derumier
2020-10-05 15:09 ` [pve-devel] [PATCH v10 pve-network 26/35] generate sdn/.running-config on apply Alexandre Derumier
2020-10-05 15:09 ` [pve-devel] [PATCH v10 pve-network 27/35] api: add running/pending zones/vnets/subnets/controllers Alexandre Derumier
2020-10-08 9:04 ` Thomas Lamprecht
2020-10-05 15:09 ` [pve-devel] [PATCH v10 pve-network 28/35] small bugfixes Alexandre Derumier
2020-10-05 15:09 ` [pve-devel] [PATCH v10 pve-network 29/35] move dns options from subnets to zone Alexandre Derumier
2020-10-05 15:09 ` Alexandre Derumier [this message]
2020-10-05 15:09 ` [pve-devel] [PATCH v10 pve-network 31/35] subnets/ipam: allow same subnet on different zones Alexandre Derumier
2020-10-05 15:09 ` [pve-devel] [PATCH v10 pve-network 32/35] vnets: allow duplicate tags in differents zones Alexandre Derumier
2020-10-05 15:09 ` [pve-devel] [PATCH v10 pve-network 33/35] ipam: verify api access on create/update Alexandre Derumier
2020-10-05 15:09 ` [pve-devel] [PATCH v10 pve-network 34/35] ipam: add hostname/description to ipam db Alexandre Derumier
2020-10-05 15:09 ` [pve-devel] [PATCH v10 pve-network 35/35] update documentation Alexandre Derumier
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=20201005150912.463000-31-aderumier@odiso.com \
--to=aderumier@odiso.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