[pve-devel] [PATCH v3 container 2/4] lxc: Avoid open-coding normal vs SDN-specific tap_plug()
Christoph Heiss
c.heiss at proxmox.com
Tue Feb 21 09:05:48 CET 2023
This pattern is used in multiple places, thus just extract it into a sub
on its own.
No functional changes.
Signed-off-by: Christoph Heiss <c.heiss at proxmox.com>
---
Might not be the best place for net_tap_plug(), putting this logic
inside PVE::Network would probably make more sense. But that would
entail a (bigger) refactoring, since it then also must be done for all
other tap_*() and veth_*() subroutines (and maybe some other things?)
for consistency..
In any case, that definitely would be too much for this series. I can do
that, but I'd do it as a follow-up series.
Changes v1 -> v2:
* New patch
Changes v2 -> v3:
* Add prototype to net_tap_plug()
src/PVE/LXC.pm | 28 ++++++++++++++++------------
src/lxcnetaddbr | 15 ++-------------
2 files changed, 18 insertions(+), 25 deletions(-)
diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm
index cbbb82d..d419124 100644
--- a/src/PVE/LXC.pm
+++ b/src/PVE/LXC.pm
@@ -918,6 +918,18 @@ sub vm_stop_cleanup {
warn $@ if $@; # avoid errors - just warn
}
+sub net_tap_plug : prototype($$$$$$;$) {
+ my ($iface, $bridge, $tag, $firewall, $trunks, $rate, $opts) = @_;
+
+ if ($have_sdn) {
+ PVE::Network::SDN::Zones::tap_plug($iface, $bridge, $tag, $firewall, $trunks, $rate);
+ PVE::Network::SDN::Zones::add_bridge_fdb($iface, $opts->{mac}, $bridge, $firewall)
+ if defined($opts->{mac});
+ } else {
+ PVE::Network::tap_plug($iface, $bridge, $tag, $firewall, $trunks, $rate, $opts);
+ }
+}
+
sub update_net {
my ($vmid, $conf, $opt, $newnet, $netid, $rootdir) = @_;
@@ -957,14 +969,7 @@ sub update_net {
}
my ($bridge, $mac, $firewall, $rate) = $newnet->@{'bridge', 'hwaddr', 'firewall', 'rate'};
- if ($have_sdn) {
- PVE::Network::SDN::Zones::tap_plug(
- $veth, $bridge, $newnet->{tag}, $firewall, $newnet->{trunks}, $rate);
- PVE::Network::SDN::Zones::add_bridge_fdb($veth, $mac, $bridge, $firewall);
- } else {
- PVE::Network::tap_plug(
- $veth, $bridge, $newnet->{tag}, $firewall, $newnet->{trunks}, $rate, { mac => $mac });
- }
+ PVE::LXC::net_tap_plug($veth, $bridge, $newnet->{tag}, $firewall, $newnet->{trunks}, $rate, { mac => $mac });
# This includes the rate:
foreach (qw(bridge tag firewall rate)) {
@@ -995,13 +1000,12 @@ sub hotplug_net {
if ($have_sdn) {
PVE::Network::SDN::Zones::veth_create($veth, $vethpeer, $newnet->{bridge}, $newnet->{hwaddr});
- PVE::Network::SDN::Zones::tap_plug($veth, $newnet->{bridge}, $newnet->{tag}, $newnet->{firewall}, $newnet->{trunks}, $newnet->{rate});
- PVE::Network::SDN::Zones::add_bridge_fdb($veth, $newnet->{hwaddr}, $newnet->{bridge}, $newnet->{firewall});
} else {
PVE::Network::veth_create($veth, $vethpeer, $newnet->{bridge}, $newnet->{hwaddr});
- PVE::Network::tap_plug($veth, $newnet->{bridge}, $newnet->{tag}, $newnet->{firewall}, $newnet->{trunks}, $newnet->{rate});
- PVE::Network::add_bridge_fdb($veth, $newnet->{hwaddr}, $newnet->{firewall}); # early returns if brport has learning on
}
+ PVE::LXC::net_tap_plug(
+ $veth, $newnet->{bridge}, $newnet->{tag}, $newnet->{firewall}, $newnet->{trunks},
+ $newnet->{rate}, { mac => $newnet->{hwaddr} });
# attach peer in container
my $cmd = ['lxc-device', '-n', $vmid, 'add', $vethpeer, "$eth" ];
diff --git a/src/lxcnetaddbr b/src/lxcnetaddbr
index 83052e1..ebd6baa 100755
--- a/src/lxcnetaddbr
+++ b/src/lxcnetaddbr
@@ -7,15 +7,8 @@ exit 0 if $ENV{LXC_NAME} && $ENV{LXC_NAME} !~ /^\d+$/;
use PVE::LXC;
use PVE::Tools qw(run_command);
-use PVE::Network;
use PVE::ProcFSTools;
-my $have_sdn;
-eval {
- require PVE::Network::SDN::Zones;
- $have_sdn = 1;
-};
-
die "got unexpected argument count\n" if scalar(@ARGV) != 5;
my ($vmid, $arg2, $arg3, $type, $iface) = @ARGV;
@@ -48,6 +41,7 @@ my $firewall = $net->{firewall};
my $bridge = $net->{bridge};
my $trunks = $net->{trunks};
my $rate = $net->{rate};
+my $hwaddr = $net->{hwaddr};
die "missing bridge configuration" if !$bridge;
@@ -61,12 +55,7 @@ if (-d "/sys/class/net/$iface") {
PVE::Tools::run_command("/sbin/ip link set dev $iface up mtu $bridgemtu");
PVE::Tools::run_command("/sbin/ip addr add 0.0.0.0/0 dev $iface");
- if ($have_sdn) {
- PVE::Network::SDN::Zones::tap_plug($iface, $bridge, $tag, $firewall, $trunks, $rate);
- PVE::Network::SDN::Zones::add_bridge_fdb($iface, $net->{hwaddr}, $bridge, $firewall);
- } else {
- PVE::Network::tap_plug($iface, $bridge, $tag, $firewall, $trunks, $rate, { mac => $net->{hwaddr}});
- }
+ PVE::LXC::net_tap_plug($iface, $bridge, $tag, $firewall, $trunks, $rate, { mac => $hwaddr });
}
exit 0;
--
2.39.1
More information about the pve-devel
mailing list