}
}
+sub find_bridge {
+ my ($bridge) = @_;
+
+ die "can't find bridge $bridge" if !-d "/sys/class/net/$bridge";
+}
+
+sub is_vlanaware {
+ my ($bridge) = @_;
+
+ 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) = @_;
+
+ my @bridge_ifaces = ();
+ my $dir = "/sys/class/net/$bridge/brif";
+ PVE::Tools::dir_glob_foreach($dir, '(((eth|bond)\d+|en[^.]+)(\.\d+)?)', sub {
+ push @bridge_ifaces, $_[0];
+ });
+
+ return @bridge_ifaces;
+}
1;
my $vlanprotocol = $plugin_config->{'vlan-protocol'};
my $ctag = $vnet->{tag};
my $alias = $vnet->{alias};
- die "can't find bridge $bridge" if !-d "/sys/class/net/$bridge";
- my $vlan_aware = PVE::Tools::file_read_firstline("/sys/class/net/$bridge/bridge/vlan_filtering");
- my $is_ovs = !-d "/sys/class/net/$bridge/brif";
+ 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 @iface_config = ();
my $vnet_bridge_ports = "";
#eth--->eth.x(svlan)--->eth.x.y(cvlan)---->vnet
- my @bridge_ifaces = ();
- my $dir = "/sys/class/net/$bridge/brif";
- PVE::Tools::dir_glob_foreach($dir, '(((eth|bond)\d+|en[^.]+)(\.\d+)?)', sub {
- push @bridge_ifaces, $_[0];
- });
+ my @bridge_ifaces = PVE::Network::SDN::Zones::Plugin::get_bridge_ifaces($bridge);
foreach my $bridge_iface (@bridge_ifaces) {
return $err_msg;
}
- my $vlan_aware = PVE::Tools::file_read_firstline("/sys/class/net/$bridge/bridge/vlan_filtering");
- my $is_ovs = !-d "/sys/class/net/$bridge/brif";
+ my $vlan_aware = PVE::Network::SDN::Zones::Plugin::is_vlanaware($bridge);
+ my $is_ovs = PVE::Network::SDN::Zones::Plugin::is_ovs($bridge);
my $tag = $vnet->{tag};
my $vnet_uplink = "ln_".$vnetid;
my $address = {};
my $subnets = PVE::Network::SDN::Vnets::get_subnets($vnetid, 1);
+
foreach my $subnetid (sort keys %{$subnets}) {
my $subnet = $subnets->{$subnetid};
my $cidr = $subnet->{cidr};
my ($class, $plugin_config, $zoneid, $vnetid, $vnet, $controller, $controller_cfg, $subnet_cfg, $interfaces_config, $config) = @_;
my $bridge = $plugin_config->{bridge};
- die "can't find bridge $bridge" if !-d "/sys/class/net/$bridge";
+ PVE::Network::SDN::Zones::Plugin::find_bridge($bridge);
- my $vlan_aware = PVE::Tools::file_read_firstline("/sys/class/net/$bridge/bridge/vlan_filtering");
- my $is_ovs = !-d "/sys/class/net/$bridge/brif";
+ my $vlan_aware = PVE::Network::SDN::Zones::Plugin::is_vlanaware($bridge);
+ my $is_ovs = PVE::Network::SDN::Zones::Plugin::is_ovs($bridge);
my $tag = $vnet->{tag};
my $alias = $vnet->{alias};
my $bridgevlan = $bridge."v".$tag;
- my @bridge_ifaces = ();
- my $dir = "/sys/class/net/$bridge/brif";
- PVE::Tools::dir_glob_foreach($dir, '(((eth|bond)\d+|en[^.]+)(\.\d+)?)', sub {
- push @bridge_ifaces, $_[0];
- });
+ my @bridge_ifaces = PVE::Network::SDN::Zones::Plugin::get_bridge_ifaces($bridge);
my $bridge_ports = "";
foreach my $bridge_iface (@bridge_ifaces) {
return $err_msg;
}
- my $vlan_aware = PVE::Tools::file_read_firstline("/sys/class/net/$bridge/bridge/vlan_filtering");
- my $is_ovs = !-d "/sys/class/net/$bridge/brif";
+ my $vlan_aware = PVE::Network::SDN::Zones::Plugin::is_vlanaware($bridge);
+ my $is_ovs = PVE::Network::SDN::Zones::Plugin::is_ovs($bridge);
my $tag = $vnet->{tag};
my $vnet_uplink = "ln_".$vnetid;