diff options
| -rw-r--r-- | debian/control | 4 | ||||
| -rw-r--r-- | src/PVE/Network/SDN/Zones/Plugin.pm | 7 | ||||
| -rw-r--r-- | src/PVE/Network/SDN/Zones/QinQPlugin.pm | 4 | ||||
| -rw-r--r-- | src/PVE/Network/SDN/Zones/VlanPlugin.pm | 6 | ||||
| -rwxr-xr-x | src/test/run_test_zones.pl | 11 |
5 files changed, 16 insertions, 16 deletions
diff --git a/debian/control b/debian/control index 9ddbb13..b6e758d 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Homepage: https://www.proxmox.com Package: libpve-network-perl Architecture: all -Depends: libpve-common-perl (>= 5.0-45), +Depends: libpve-common-perl (>= 9.0.2), pve-cluster (>= 8.0.10), libio-socket-ssl-perl, libnet-subnet-perl, @@ -32,7 +32,7 @@ Description: Proxmox VE's SDN (Software Defined Network) stack Package: libpve-network-api-perl Architecture: all -Depends: libpve-common-perl (>= 5.0-45), +Depends: libpve-common-perl (>= 9.0.2), pve-firewall (>= 5.1.0~), pve-cluster (>= 8.0.9), libpve-network-perl (= ${binary:Version}), 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'); }, |