catch errors on sdn config generation

[pve-network.git] / PVE / Network / SDN / Zones.pm

diff --git a/PVE/Network/SDN/Zones.pm b/PVE/Network/SDN/Zones.pm
index 8f12976fa64a7b1ae5c694372420fa6cc149d441..552b334bba9249c8f6dc963e99cd3863f980992f 100644 (file)
--- a/PVE/Network/SDN/Zones.pm
+++ b/PVE/Network/SDN/Zones.pm
@@ -25,6 +25,7 @@ PVE::Network::SDN::Zones::EvpnPlugin->register();
 PVE::Network::SDN::Zones::FaucetPlugin->register();
 PVE::Network::SDN::Zones::Plugin->init();
 
+my $local_network_sdn_file = "/etc/network/interfaces.d/sdn";
 
 sub sdn_zones_config {
     my ($cfg, $id, $noerr) = @_;
@@ -72,6 +73,7 @@ sub complete_sdn_zone {
 
 sub generate_etc_network_config {
 
+    my $version = PVE::Cluster::cfs_read_file('sdn/.version');
     my $vnet_cfg = PVE::Cluster::cfs_read_file('sdn/vnets.cfg');
     my $zone_cfg = PVE::Cluster::cfs_read_file('sdn/zones.cfg');
     my $controller_cfg = PVE::Cluster::cfs_read_file('sdn/controllers.cfg');
@@ -83,35 +85,40 @@ sub generate_etc_network_config {
     my $config = {};
     my $nodename = PVE::INotify::nodename();
 
-    foreach my $id (keys %{$vnet_cfg->{ids}}) {
+    for my $id (sort keys %{$vnet_cfg->{ids}}) {
        my $vnet = $vnet_cfg->{ids}->{$id};
        my $zone = $vnet->{zone};
 
-       if(!$zone) {
-           warn "can't generate vnet $vnet : zone $zone don't exist";
+       if (!$zone) {
+           warn "can't generate vnet '$id': no zone assigned!\n";
            next;
        }
 
        my $plugin_config = $zone_cfg->{ids}->{$zone};
 
        if (!defined($plugin_config)) {
-           warn "can't generate vnet $vnet : zone $zone don't exist";
+           warn "can't generate vnet '$id': zone $zone don't exist\n";
            next;
        }
 
        next if defined($plugin_config->{nodes}) && !$plugin_config->{nodes}->{$nodename};
 
-       my $controller = undef;
-       if($plugin_config->{controller}) {
-           my $controllerid = $plugin_config->{controller};
-           $controller = $controller_cfg->{ids}->{$controllerid};
+       my $controller;
+       if (my $controllerid = $plugin_config->{controller}) {
+           $controller = $controller_cfg->{ids}->{$controllerid};
        }
 
        my $plugin = PVE::Network::SDN::Zones::Plugin->lookup($plugin_config->{type});
-       $plugin->generate_sdn_config($plugin_config, $zone, $id, $vnet, $controller, $interfaces_config, $config);
+       eval {
+           $plugin->generate_sdn_config($plugin_config, $zone, $id, $vnet, $controller, $interfaces_config, $config);
+       };
+       if($@) {
+           warn "zone $zone : vnet $id : $@";
+           next;
+       }
     }
 
-    my $raw_network_config = "";
+    my $raw_network_config = "\#version:$version\n";
     foreach my $iface (sort keys %$config) {
        $raw_network_config .= "\n";
        $raw_network_config .= "auto $iface\n";
@@ -128,13 +135,22 @@ sub write_etc_network_config {
     my ($rawconfig) = @_;
 
     return if !$rawconfig;
-    my $sdn_interfaces_file = "/etc/network/interfaces.d/sdn";
 
-    my $writefh = IO::File->new($sdn_interfaces_file,">");
+    my $writefh = IO::File->new($local_network_sdn_file,">");
     print $writefh $rawconfig;
     $writefh->close();
 }
 
+sub read_etc_network_config_version {
+    my $versionstr = PVE::Tools::file_read_firstline($local_network_sdn_file);
+
+    return if !defined($versionstr);
+
+    if ($versionstr =~ m/^\#version:(\d+)$/) {
+       return $1;
+    }
+}
+
 sub ifquery_check {
 
     my $cmd = ['ifquery', '-a', '-c', '-o','json'];
@@ -164,27 +180,19 @@ sub ifquery_check {
 # improve me : move status code inside plugins ?
 sub status {
 
-    my $cluster_vnet_file = "/etc/pve/sdn/vnets.cfg";
-    my $cluster_zone_file = "/etc/pve/sdn/zones.cfg";
-    my $local_sdn_file = "/etc/network/interfaces.d/sdn";
     my $err_config = undef;
 
-    return if !-e $cluster_vnet_file && !-e $cluster_zone_file;
+    my $local_version = PVE::Network::SDN::Zones::read_etc_network_config_version();
+    my $sdn_version = PVE::Cluster::cfs_read_file('sdn/.version');
 
-    if (!-e $local_sdn_file) {
+    return if !$sdn_version;
 
+    if (!$local_version) {
        $err_config = "local sdn network configuration is not yet generated, please reload";
        warn "$err_config\n";
-    } else {
-       # fixme : use some kind of versioning info?
-       my $cluster_vnet_timestamp = (stat($cluster_vnet_file))[9];
-       my $cluster_zone_timestamp = (stat($cluster_zone_file))[9];
-       my $local_sdn_timestamp = (stat($local_sdn_file))[9];
-
-       if ($local_sdn_timestamp < $cluster_vnet_timestamp || $local_sdn_timestamp < $cluster_zone_timestamp) {
-           $err_config = "local sdn network configuration is too old, please reload";
-           warn "$err_config\n";
-       }
+    } elsif ($local_version < $sdn_version) {
+       $err_config = "local sdn network configuration is too old, please reload";
+       warn "$err_config\n";
     }
 
     my $status = ifquery_check();
@@ -212,18 +220,6 @@ sub status {
     return($zone_status, $vnet_status);
 }
 
-sub get_bridge_vlan {
-    my ($vnetid) = @_;
-
-    my $vnet = PVE::Network::SDN::Vnets::get_vnet($vnetid);
-
-    return ($vnetid, undef) if !$vnet; # fallback for classic bridge
-
-    my $plugin_config = get_plugin_config($vnet);
-    my $plugin = PVE::Network::SDN::Zones::Plugin->lookup($plugin_config->{type});
-    return $plugin->get_bridge_vlan($plugin_config, $vnetid, $vnet->{tag});
-}
-
 sub tap_create {
     my ($iface, $bridge) = @_;
 
@@ -268,7 +264,7 @@ sub tap_plug {
        if $plugin_config->{nodes} && !defined($plugin_config->{nodes}->{$nodename});
 
     my $plugin = PVE::Network::SDN::Zones::Plugin->lookup($plugin_config->{type});
-    $plugin->tap_plug($plugin_config, $vnet, $iface, $bridge, $firewall, $rate);
+    $plugin->tap_plug($plugin_config, $vnet, $tag, $iface, $bridge, $firewall, $trunks, $rate);
 }
 
 1;