zones : tap_plug: add support for disable bridge learning

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

diff --git a/PVE/Network/SDN.pm b/PVE/Network/SDN.pm
index 256a7c8b4e518e5d31fe24f2f3bba11fcf1de48d..b95dd5bd46bcc0a6dbe0dc2442c7d16ac4986c18 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);
 }
 
@@ -104,6 +104,7 @@ sub pending_config {
                $pending->{$id}->{state} = "changed";
            }
        }
+       $pending->{$id}->{"pending"} = {} if $pending->{$id}->{state} && !defined($pending->{$id}->{"pending"});
     }
 
    foreach my $id (sort keys %{$config_objects}) {
@@ -124,6 +125,7 @@ sub pending_config {
                $pending->{$id}->{state} = "changed";
            }
        }
+       $pending->{$id}->{"pending"} = {} if  $pending->{$id}->{state} && !defined($pending->{$id}->{"pending"});
    }
 
    return {ids => $pending};
@@ -174,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};
 
@@ -191,12 +193,14 @@ sub get_local_vnets {
        my $privs = [ 'SDN.Audit', 'SDN.Allocate' ];
 
        next if !$zoneid;
-       next if !$rpcenv->check_any($authuser, "/sdn/zones/$zoneid", $privs, 1);
+       next if !$rpcenv->check_any($authuser, "/sdn/zones/$zoneid", $privs, 1) && !$rpcenv->check_any($authuser, "/sdn/vnets/$vnetid", $privs, 1);
 
        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', comments => $comments };
+       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;
@@ -230,5 +234,50 @@ sub encode_value {
     return $value;
 }
 
-1;
 
+#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;