zones: move is_ovs helper to pve-common

The is_ovs helper has been moved to pve-common. Update all call sites
to use the new helper in pve-common to determine whether something is
a linux or OVS bridge.

Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
Reviewed-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
FG: add version bumps
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>

4 files changed, 14 insertions, 14 deletions

diff --git a/src/PVE/Network/SDN/Zones/Plugin.pm b/src/PVE/Network/SDN/Zones/Plugin.pm
index 5f49357..83372e7 100644
--- a/src/PVE/Network/SDN/Zones/Plugin.pm
+++ b/src/PVE/Network/SDN/Zones/Plugin.pm
@@ -364,13 +364,6 @@ sub is_vlanaware {
     return PVE::Tools::file_read_firstline("/sys/class/net/$bridge/bridge/vlan_filtering");
 }
 
-sub is_ovs {
-    my ($bridge) = @_;
-
-    my $is_ovs = !-d "/sys/class/net/$bridge/brif";
-    return $is_ovs;
-}
-
 sub get_bridge_ifaces {
     my ($bridge) = @_;
 
diff --git a/src/PVE/Network/SDN/Zones/QinQPlugin.pm b/src/PVE/Network/SDN/Zones/QinQPlugin.pm
index 606c9f9..5806e69 100644
--- a/src/PVE/Network/SDN/Zones/QinQPlugin.pm
+++ b/src/PVE/Network/SDN/Zones/QinQPlugin.pm
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use PVE::Exception qw(raise raise_param_exc);
-
+use PVE::Network;
 use PVE::Network::SDN::Zones::Plugin;
 
 use base('PVE::Network::SDN::Zones::Plugin');
@@ -70,7 +70,7 @@ sub generate_sdn_config {
     PVE::Network::SDN::Zones::Plugin::find_bridge($bridge);
 
     my $vlan_aware = PVE::Network::SDN::Zones::Plugin::is_vlanaware($bridge);
-    my $is_ovs = PVE::Network::SDN::Zones::Plugin::is_ovs($bridge);
+    my $is_ovs = PVE::Network::is_ovs_bridge($bridge);
 
     my @iface_config = ();
     my $zone_notag_uplink = "ln_${zoneid}";
diff --git a/src/PVE/Network/SDN/Zones/VlanPlugin.pm b/src/PVE/Network/SDN/Zones/VlanPlugin.pm
index 155042e..90f16bf 100644
--- a/src/PVE/Network/SDN/Zones/VlanPlugin.pm
+++ b/src/PVE/Network/SDN/Zones/VlanPlugin.pm
@@ -2,6 +2,8 @@ package PVE::Network::SDN::Zones::VlanPlugin;
 
 use strict;
 use warnings;
+
+use PVE::Network;
 use PVE::Network::SDN::Zones::Plugin;
 use PVE::Exception qw(raise raise_param_exc);
 
@@ -66,7 +68,7 @@ sub generate_sdn_config {
     PVE::Network::SDN::Zones::Plugin::find_bridge($bridge);
 
     my $vlan_aware = PVE::Network::SDN::Zones::Plugin::is_vlanaware($bridge);
-    my $is_ovs = PVE::Network::SDN::Zones::Plugin::is_ovs($bridge);
+    my $is_ovs = PVE::Network::is_ovs_bridge($bridge);
 
     my $tag = $vnet->{tag};
     my $alias = $vnet->{alias};
@@ -162,7 +164,7 @@ sub status {
     }
 
     my $vlan_aware = PVE::Network::SDN::Zones::Plugin::is_vlanaware($bridge);
-    my $is_ovs = PVE::Network::SDN::Zones::Plugin::is_ovs($bridge);
+    my $is_ovs = PVE::Network::is_ovs_bridge($bridge);
 
     my $tag = $vnet->{tag};
     my $vnet_uplink = "ln_" . $vnetid;
diff --git a/src/test/run_test_zones.pl b/src/test/run_test_zones.pl
index 86aa0ea..e50dd76 100755
--- a/src/test/run_test_zones.pl
+++ b/src/test/run_test_zones.pl
@@ -54,6 +54,14 @@ foreach my $test (@tests) {
         },
     );
 
+    my $pve_common_network;
+    $pve_common_network = Test::MockModule->new('PVE::Network');
+    $pve_common_network->mock(
+        is_ovs_bridge => sub {
+            return 1 if $interfaces_config->{ifaces}->{vmbr0}->{'type'} eq 'OVSBridge';
+        },
+    );
+
     my $mocked_pve_sdn_controllers;
     $mocked_pve_sdn_controllers = Test::MockModule->new('PVE::Network::SDN::Controllers');
     $mocked_pve_sdn_controllers->mock(
@@ -81,9 +89,6 @@ foreach my $test (@tests) {
         is_vlanaware => sub {
             return $interfaces_config->{ifaces}->{vmbr0}->{'bridge_vlan_aware'};
         },
-        is_ovs => sub {
-            return 1 if $interfaces_config->{ifaces}->{vmbr0}->{'type'} eq 'OVSBridge';
-        },
         get_bridge_ifaces => sub {
             return ('eth0');
         },