This is a POC to call ip to retreive ip address from ipam.
It's really more cleaner than v3, and ready for testing
Signed-off-by: Alexandre Derumier <aderum...@odiso.com>
---
src/PVE/LXC/Config.pm | 119 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 119 insertions(+)
diff --git a/src/PVE/LXC/Config.pm b/src/PVE/LXC/Config.pm
index 1277ef0..fbd9618 100644
--- a/src/PVE/LXC/Config.pm
+++ b/src/PVE/LXC/Config.pm
@@ -12,6 +12,14 @@ use PVE::INotify;
use PVE::JSONSchema qw(get_standard_option);
use PVE::Tools;
+my $have_sdn;
+eval {
+ require PVE::Network::SDN::Vnets;
+ require PVE::Network::SDN::Subnets;
+ $have_sdn = 1;
+};
+
+
use base qw(PVE::AbstractConfig);
use constant {FIFREEZE => 0xc0045877,
@@ -1043,6 +1051,10 @@ sub update_pct_config {
$class->check_protection($conf, "can't remove CT $vmid drive
'$opt'");
} elsif ($opt eq 'unprivileged') {
die "unable to delete read-only option: '$opt'\n";
+ } elsif ($opt =~ m/^net(\d+)$/) {
+ my $netid = $1;
+ my $oldnet = $class->parse_lxc_network($conf->{$opt});
+ delete_net_ip($conf->{hostname}, $oldnet, "vm:$vmid net:$netid");
}
$class->add_to_pending_delete($conf, $opt);
}
@@ -1070,6 +1082,12 @@ sub update_pct_config {
$value = PVE::LXC::verify_searchdomain_list($value);
} elsif ($opt eq 'unprivileged') {
die "unable to modify read-only option: '$opt'\n";
+ } elsif ($opt =~ m/^net(\d+)$/) {
+ my $netid = $1;
+ my $net = $class->parse_lxc_network($value);
+ my $oldnet = $class->parse_lxc_network($conf->{$opt});
+ update_net_ip($conf->{hostname}, $net, $oldnet, "vm:$vmid
net:$netid");
+ $value = $class->print_lxc_network($net);
}
$conf->{pending}->{$opt} = $value;
$class->remove_from_pending_delete($conf, $opt);
@@ -1662,4 +1680,105 @@ sub get_backup_volumes {
return $return_volumes;
}
+sub update_net_ip {
+ my ($hostname, $net, $oldnet, $description) = @_;
+
+ return if !$have_sdn;
+
+ my $oldbridge = $oldnet->{bridge};
+ my $bridge = $net->{bridge};
+
+ my $subnets = PVE::Network::SDN::Vnets::get_subnets($bridge);
+
+ return if !keys %{$subnets};
+
+ #add new ip first
+ my $new_ipv4_allocated = undef;
+ eval {
+ if (!$net->{ip}) {
+ $net->{ip} = PVE::Network::SDN::Vnets::get_next_free_cidr($bridge,
$hostname, $description);
+ $new_ipv4_allocated = 1;
+ } elsif ($net->{ip} ne 'dhcp' && $net->{ip} ne 'manual') {
+ PVE::Network::SDN::Vnets::add_cidr($bridge, $net->{ip}, $hostname,
$description) if $net->{ip} ne $oldnet->{ip};
+ $new_ipv4_allocated = 1;
+ }
+ };
+ if ($@) {
+ die $@;
+ }
+
+ #then add ip6
+ eval {
+ if (!$net->{ip6}) {
+ $net->{ip6} = PVE::Network::SDN::Vnets::get_next_free_cidr($bridge,
$hostname, $description, 6);
+ } elsif ($net->{ip6} ne 'dhcp' && $net->{ip6} ne 'manual' &&
$net->{ip6} ne 'auto') {
+ PVE::Network::SDN::Vnets::add_cidr($bridge, $net->{ip6}, $hostname,
$description) if $net->{ip6} ne $oldnet->{ip6};
+ }
+ };
+ if ($@) {
+ my $err = $@;
+ #if error, delete previously added ipv4
+ if ($new_ipv4_allocated) {
+ eval {
+ PVE::Network::SDN::Vnets::del_cidr($bridge, $net->{ip},
$hostname, $description);
+ };
+ }
+ die $err;
+ }
+
+ #delete old ip
+ if ($oldnet->{ip} && $oldnet->{ip} ne 'dhcp' && $oldnet->{ip} ne 'manual')
{
+ my $deletebridge = $oldbridge ne $bridge ? $oldbridge : $bridge;
+ eval {
+ PVE::Network::SDN::Vnets::del_cidr($deletebridge, $oldnet->{ip},
$hostname, $description) if !$net->{ip} || $net->{ip} ne $oldnet->{ip};
+ };
+ warn $@ if $@;
+ }
+
+ #delete old ip6
+ if ($oldnet->{ip6} && $oldnet->{ip6} ne 'dhcp' && $oldnet->{ip6} ne
'manual' && $net->{ip6} ne 'auto') {
+ my $deletebridge = $oldbridge ne $bridge ? $oldbridge : $bridge;
+ eval {
+ PVE::Network::SDN::Vnets::del_cidr($deletebridge, $oldnet->{ip6},
$hostname) if !$net->{ip6} || $net->{ip6} ne $oldnet->{ip6};
+ };
+ warn $@ if $@;
+ }
+
+ #update gateway
+ if ($net->{ip} && $net->{ip} ne 'dhcp' && $net->{ip} ne 'manual') {
+ my ($ip, $mask) = split(/\//, $net->{ip});
+ my ($subnetidv4, $subnetv4) =
PVE::Network::SDN::Subnets::find_ip_subnet($ip, $mask, $subnets);
+ $net->{gw} = $subnetv4->{gateway} if $subnetv4->{gateway};
+ }
+
+ if ($net->{ip6} && $net->{ip6} ne 'dhcp' && $net->{ip6} ne 'manual' &&
$net->{ip6} ne 'auto') {
+ my ($ip6, $mask6) = split(/\//, $net->{ip6});
+ my ($subnetidv6, $subnetv6) =
PVE::Network::SDN::Subnets::find_ip_subnet($ip6, $mask6, $subnets);
+ $net->{gw6} = $subnetv6->{gateway} if $subnetv6->{gateway};
+ }
+
+}
+
+sub delete_net_ip {
+ my ($hostname, $net, $description) = @_;
+
+ return if !$have_sdn;
+
+ my $bridge = $net->{bridge};
+ my $subnets = PVE::Network::SDN::Vnets::get_subnets($bridge);
+ return if !keys %{$subnets};
+
+ if ($net->{ip6} && ($net->{ip6} eq 'auto' || $net->{ip6} eq 'manual' ||
$net->{ip6} eq 'dhcp')) {
+ eval {
+ PVE::Network::SDN::Vnets::del_cidr($bridge, $net->{ip6}, $hostname,
$description);
+ };
+ warn $@ if $@;
+ } elsif ($net->{ip} && $net->{ip} ne 'dhcp' && $net->{ip} ne 'manual') {
+ eval {
+ PVE::Network::SDN::Vnets::del_cidr($bridge, $net->{ip}, $hostname,
$description);
+ };
+ warn $@ if $@;
+ }
+}
+
1;
--
2.20.1
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
