fix zones on_update_hook

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>

diff --git a/PVE/API2/Network/SDN/Zones.pm b/PVE/API2/Network/SDN/Zones.pm
index 16c90cc3174af236b01d534529f2bbe18e98d4de..00380dc5cb567b8a9be94788221f56d36ee0e60d 100644 (file)
--- a/PVE/API2/Network/SDN/Zones.pm
+++ b/PVE/API2/Network/SDN/Zones.pm
@@ -142,17 +142,18 @@ __PACKAGE__->register_method ({
         PVE::Network::SDN::Zones::lock_sdn_zones_config(
            sub {
 
-               my $cfg = PVE::Network::SDN::Zones::config();
+               my $zone_cfg = PVE::Network::SDN::Zones::config();
+               my $controller_cfg = PVE::Network::SDN::Controllers::config();
 
                my $scfg = undef;
-               if ($scfg = PVE::Network::SDN::Zones::sdn_zones_config($cfg, $id, 1)) {
+               if ($scfg = PVE::Network::SDN::Zones::sdn_zones_config($zone_cfg, $id, 1)) {
                    die "sdn zone object ID '$id' already defined\n";
                }
 
-               $cfg->{ids}->{$id} = $opts;
-               $plugin->on_update_hook($id, $cfg);
+               $zone_cfg->{ids}->{$id} = $opts;
+               $plugin->on_update_hook($id, $zone_cfg, $controller_cfg);
 
-               PVE::Network::SDN::Zones::write_config($cfg);
+               PVE::Network::SDN::Zones::write_config($zone_cfg);
 
            }, "create sdn zone object failed");
 
@@ -201,11 +202,12 @@ __PACKAGE__->register_method ({
         PVE::Network::SDN::Zones::lock_sdn_zones_config(
         sub {
 
-           my $cfg = PVE::Network::SDN::Zones::config();
+           my $zone_cfg = PVE::Network::SDN::Zones::config();
+           my $controller_cfg = PVE::Network::SDN::Controllers::config();
 
-           PVE::SectionConfig::assert_if_modified($cfg, $digest);
+           PVE::SectionConfig::assert_if_modified($zone_cfg, $digest);
 
-           my $scfg = PVE::Network::SDN::Zones::sdn_zones_config($cfg, $id);
+           my $scfg = PVE::Network::SDN::Zones::sdn_zones_config($zone_cfg, $id);
 
            my $plugin = PVE::Network::SDN::Zones::Plugin->lookup($scfg->{type});
            my $opts = $plugin->check_config($id, $param, 0, 1);
@@ -214,9 +216,9 @@ __PACKAGE__->register_method ({
                $scfg->{$k} = $opts->{$k};
            }
 
-           $plugin->on_update_hook($id, $cfg);
+           $plugin->on_update_hook($id, $zone_cfg, $controller_cfg);
 
-           PVE::Network::SDN::Zones::write_config($cfg);
+           PVE::Network::SDN::Zones::write_config($zone_cfg);
 
            }, "update sdn zone object failed");
 

diff --git a/PVE/Network/SDN/Zones/EvpnPlugin.pm b/PVE/Network/SDN/Zones/EvpnPlugin.pm
index 012274f42b934abd93d453ea62d0620d1b165148..11192265cf4fd68895b0c2aa4e81368cde861caf 100644 (file)
--- a/PVE/Network/SDN/Zones/EvpnPlugin.pm
+++ b/PVE/Network/SDN/Zones/EvpnPlugin.pm
@@ -12,12 +12,6 @@ sub type {
     return 'evpn';
 }
 
-sub plugindata {
-    return {
-        role => 'transport',
-    };
-}
-
 sub properties {
     return {
        'vrf' => {
@@ -133,41 +127,32 @@ sub generate_sdn_config {
 }
 
 sub on_update_hook {
-    my ($class, $transportid, $sdn_cfg) = @_;
-
-    # verify that router exist
-    if (defined($sdn_cfg->{ids}->{$transportid}->{controller})) {
-       my $controller = $sdn_cfg->{ids}->{$transportid}->{controller};
-       if (!defined($sdn_cfg->{ids}->{$controller})) {
-           die "controller $controller don't exist";
-       } else {
-           die "$controller is not a evpn controller type" if $sdn_cfg->{ids}->{$controller}->{type} ne 'evpn';
-       }
+    my ($class, $zoneid, $zone_cfg, $controller_cfg) = @_;
+
+    # verify that controller exist
+    my $controller = $zone_cfg->{ids}->{$zoneid}->{controller};
+    if (!defined($controller_cfg->{ids}->{$controller})) {
+       die "controller $controller don't exist";
+    } else {
+       die "$controller is not a evpn controller type" if $controller_cfg->{ids}->{$controller}->{type} ne 'evpn';
+    }
 
-       #vrf && vrf-vxlan need to be defined with controller
-       my $vrf = $sdn_cfg->{ids}->{$transportid}->{vrf};
-       if (!defined($vrf)) {
-           die "missing vrf option";
-       } else {
-           # verify that vrf is not already declared in another transport
-           foreach my $id (keys %{$sdn_cfg->{ids}}) {
-               next if $id eq $transportid;
-               die "vrf $vrf is already declared in $id"
-                       if (defined($sdn_cfg->{ids}->{$id}->{vrf}) && $sdn_cfg->{ids}->{$id}->{vrf} eq $vrf);
-           }
-       }
+    #vrf && vrf-vxlan need to be defined
+    my $vrf = $zone_cfg->{ids}->{$zoneid}->{vrf};
 
-       my $vrfvxlan = $sdn_cfg->{ids}->{$transportid}->{'vrf-vxlan'};
-       if (!defined($vrfvxlan)) {
-           die "missing vrf-vxlan option";
-       } else {
-           # verify that vrf-vxlan is not already declared in another transport
-           foreach my $id (keys %{$sdn_cfg->{ids}}) {
-               next if $id eq $transportid;
-               die "vrf-vxlan $vrfvxlan is already declared in $id"
-                       if (defined($sdn_cfg->{ids}->{$id}->{'vrf-vxlan'}) && $sdn_cfg->{ids}->{$id}->{'vrf-vxlan'} eq $vrfvxlan);
-           }
-       }
+    # verify that vrf is not already declared in another zone
+    foreach my $id (keys %{$zone_cfg->{ids}}) {
+       next if $id eq $zoneid;
+       die "vrf $vrf is already declared in $id"
+               if (defined($zone_cfg->{ids}->{$id}->{vrf}) && $zone_cfg->{ids}->{$id}->{vrf} eq $vrf);
+    }
+
+    my $vrfvxlan = $zone_cfg->{ids}->{$zoneid}->{'vrf-vxlan'};
+    # verify that vrf-vxlan is not already declared in another zone
+    foreach my $id (keys %{$zone_cfg->{ids}}) {
+       next if $id eq $zoneid;
+       die "vrf-vxlan $vrfvxlan is already declared in $id"
+               if (defined($zone_cfg->{ids}->{$id}->{'vrf-vxlan'}) && $zone_cfg->{ids}->{$id}->{'vrf-vxlan'} eq $vrfvxlan);
     }
 }
 

diff --git a/PVE/Network/SDN/Zones/FaucetPlugin.pm b/PVE/Network/SDN/Zones/FaucetPlugin.pm
index 2a196bd92835aaa2a87f683e2d965e0135d93616..bece4e4a04a2cd93ef5b79391df38180c992a1cb 100644 (file)
--- a/PVE/Network/SDN/Zones/FaucetPlugin.pm
+++ b/PVE/Network/SDN/Zones/FaucetPlugin.pm
@@ -10,12 +10,6 @@ sub type {
     return 'faucet';
 }
 
-sub plugindata {
-    return {
-       role => 'transport',
-    };
-}
-
 sub properties {
     return {
         'dp-id' => {

diff --git a/PVE/Network/SDN/Zones/Plugin.pm b/PVE/Network/SDN/Zones/Plugin.pm
index 62db9cd90aa7b13e0bfe59f74dc2bbc4433b613f..c252dfc20536fd8a1fd6c0a1a2dc6910ae8aad42 100644 (file)
--- a/PVE/Network/SDN/Zones/Plugin.pm
+++ b/PVE/Network/SDN/Zones/Plugin.pm
@@ -130,7 +130,7 @@ sub on_delete_hook {
 }
 
 sub on_update_hook {
-    my ($class, $sdnid, $scfg) = @_;
+    my ($class, $zoneid, $zone_cfg, $controller_cfg) = @_;
 
     # do nothing by default
 }