evpn : remove "ip route add vrf vrf_myzone unreachable default metric 4278198272...

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

diff --git a/PVE/Network/SDN.pm b/PVE/Network/SDN.pm
index 3cd73ffb4b1615256e36df23fbe112582da3a3cb..d3399ceef858d759a28cecd47086bb0beb5de6ba 100644 (file)
--- a/PVE/Network/SDN.pm
+++ b/PVE/Network/SDN.pm
@@ -77,7 +77,7 @@ sub status {
     return($zone_status, $vnet_status);
 }
 
-sub config {
+sub running_config {
     return cfs_read_file($running_cfg);
 }
 
@@ -96,10 +96,15 @@ sub pending_config {
            $pending->{$id}->{$key} = $running_object->{$key};
            if(!keys %{$config_object}) {
                $pending->{$id}->{state} = "deleted";
-           } elsif ($running_object->{$key} ne $config_object->{$key}) {
+           } elsif (!defined($config_object->{$key})) {
+               $pending->{$id}->{"pending"}->{$key} = 'deleted';
+               $pending->{$id}->{state} = "changed";
+           } elsif (PVE::Network::SDN::encode_value(undef, $key, $running_object->{$key})
+                        ne PVE::Network::SDN::encode_value(undef, $key, $config_object->{$key})) {
                $pending->{$id}->{state} = "changed";
            }
        }
+       $pending->{$id}->{"pending"} = {} if $pending->{$id}->{state} && !defined($pending->{$id}->{"pending"});
     }
 
    foreach my $id (sort keys %{$config_objects}) {
@@ -107,8 +112,8 @@ sub pending_config {
        my $config_object = $config_objects->{$id};
 
        foreach my $key (sort keys %{$config_object}) {
-           my $config_value = $config_object->{$key} if $config_object->{$key};
-           my $running_value = $running_object->{$key} if $running_object->{$key};
+           my $config_value = PVE::Network::SDN::encode_value(undef, $key, $config_object->{$key}) if $config_object->{$key};
+           my $running_value = PVE::Network::SDN::encode_value(undef, $key, $running_object->{$key}) if $running_object->{$key};
            if($key eq 'type' || $key eq 'vnet') {
                $pending->{$id}->{$key} = $config_value;
            } else {
@@ -120,6 +125,7 @@ sub pending_config {
                $pending->{$id}->{state} = "changed";
            }
        }
+       $pending->{$id}->{"pending"} = {} if  $pending->{$id}->{state} && !defined($pending->{$id}->{"pending"});
    }
 
    return {ids => $pending};
@@ -170,7 +176,7 @@ sub get_local_vnets {
 
     my $nodename = PVE::INotify::nodename();
 
-    my $cfg = PVE::Network::SDN::config();
+    my $cfg = PVE::Network::SDN::running_config();
     my $vnets_cfg = $cfg->{vnets};
     my $zones_cfg = $cfg->{zones};
 
@@ -182,6 +188,8 @@ sub get_local_vnets {
 
        my $vnet = PVE::Network::SDN::Vnets::sdn_vnets_config($vnets_cfg, $vnetid);
        my $zoneid = $vnet->{zone};
+       my $comments = $vnet->{alias};
+
        my $privs = [ 'SDN.Audit', 'SDN.Allocate' ];
 
        next if !$zoneid;
@@ -190,7 +198,9 @@ sub get_local_vnets {
        my $zone_config = PVE::Network::SDN::Zones::sdn_zones_config($zones_cfg, $zoneid);
 
        next if defined($zone_config->{nodes}) && !$zone_config->{nodes}->{$nodename};
-       $vnets->{$vnetid} = { type => 'vnet', active => '1' };
+       my $ipam = $zone_config->{ipam} ? 1 : 0;
+       my $vlanaware = $vnet->{vlanaware} ? 1 : 0;
+       $vnets->{$vnetid} = { type => 'vnet', active => '1', ipam => $ipam, vlanaware => $vlanaware, comments => $comments };
     }
 
     return $vnets;
@@ -210,5 +220,64 @@ sub generate_controller_config {
     PVE::Network::SDN::Controllers::reload_controller() if $reload;
 }
 
-1;
+sub encode_value {
+    my ($type, $key, $value) = @_;
+
+    if ($key eq 'nodes' || $key eq 'exitnodes') {
+        if(ref($value) eq 'HASH') {
+            return join(',', sort keys(%$value));
+        } else {
+            return $value;
+        }
+    }
+
+    return $value;
+}
+
+
+#helpers
+sub api_request {
+    my ($method, $url, $headers, $data) = @_;
+
+    my $encoded_data = to_json($data) if $data;
+
+    my $req = HTTP::Request->new($method,$url, $headers, $encoded_data);
+
+    my $ua = LWP::UserAgent->new(protocols_allowed => ['http', 'https'], timeout => 30);
+    my $proxy = undef;
+
+    if ($proxy) {
+        $ua->proxy(['http', 'https'], $proxy);
+    } else {
+        $ua->env_proxy;
+    }
 
+    $ua->ssl_opts(verify_hostname => 0, SSL_verify_mode => 0x00);
+
+    my $response = $ua->request($req);
+    my $code = $response->code;
+
+    if ($code !~ /^2(\d+)$/) {
+        my $msg = $response->message || 'unknown';
+        die "Invalid response from server: $code $msg\n";
+    }
+
+    my $raw = '';
+    if (defined($response->decoded_content)) {
+       $raw = $response->decoded_content;
+    } else {
+       $raw = $response->content;
+    }
+
+    return if $raw eq '';
+
+    my $json = '';
+    eval {
+       $json = from_json($raw);
+    };
+    die "api response is not a json" if $@;
+
+    return $json;
+}
+
+1;