$scfg->{digest} = $cfg->{digest};
if ($scfg->{nodes}) {
- $scfg->{nodes} = PVE::Network::SDN::Zones::Plugin->encode_value($scfg->{type}, 'nodes', $scfg->{nodes});
+ $scfg->{nodes} = PVE::Network::SDN::encode_value($scfg->{type}, 'nodes', $scfg->{nodes});
+ }
+
+ if ($scfg->{exitnodes}) {
+ $scfg->{exitnodes} = PVE::Network::SDN::encode_value($scfg->{type}, 'exitnodes', $scfg->{exitnodes});
}
my $pending = $scfg->{pending};
if ($pending->{nodes}) {
- $pending->{nodes} = PVE::Network::SDN::Zones::Plugin->encode_value($scfg->{type}, 'nodes', $pending->{nodes});
+ $pending->{nodes} = PVE::Network::SDN::encode_value($scfg->{type}, 'nodes', $pending->{nodes});
+ }
+
+ if ($pending->{exitnodes}) {
+ $pending->{exitnodes} = PVE::Network::SDN::encode_value($scfg->{type}, 'exitnodes', $pending->{exitnodes});
}
return $scfg;
use Data::Dumper;
use JSON;
+use PVE::JSONSchema;
+
use PVE::Network::SDN::Vnets;
use PVE::Network::SDN::Zones;
use PVE::Network::SDN::Controllers;
$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";
}
}
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 {
PVE::Network::SDN::Controllers::reload_controller() if $reload;
}
+
+sub decode_value {
+ my ($type, $key, $value) = @_;
+
+ if ($key eq 'nodes') {
+ my $res = {};
+
+ foreach my $node (PVE::Tools::split_list($value)) {
+ if (PVE::JSONSchema::pve_verify_node_name($node)) {
+ $res->{$node} = 1;
+ }
+ }
+
+ return $res;
+ }
+
+ return $value;
+}
+
+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;
+}
+
1;
return $defaultData;
}
-sub decode_value {
- my ($class, $type, $key, $value) = @_;
-
- if ($key eq 'nodes') {
- my $res = {};
-
- foreach my $node (PVE::Tools::split_list($value)) {
- if (PVE::JSONSchema::pve_verify_node_name($node)) {
- $res->{$node} = 1;
- }
- }
-
- return $res;
- }
-
- return $value;
-}
-
-sub encode_value {
- my ($class, $type, $key, $value) = @_;
-
- if ($key eq 'nodes') {
- return join(',', keys(%$value));
- }
-
- return $value;
-}
-
sub parse_section_header {
my ($class, $line) = @_;