From 4566729d4e63207aa7f0f219ba3290611f40dbe9 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Mon, 9 Mar 2020 07:32:06 +0100 Subject: [PATCH] Revert "Network: tap_create|plug : sdn : use bridge_vlan" With revert "network: followup: move graceful require SDN out from subs" squashed. This reverts commit c02d6d1c96a97cbdfb47d0ff28bca833bce2f91a. This reverts commit 35f2791ffa3f855c8f24a10f1f09f1262e3d9fab. Signed-off-by: Thomas Lamprecht --- src/PVE/Network.pm | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/src/PVE/Network.pm b/src/PVE/Network.pm index f5bf349..98a58fa 100644 --- a/src/PVE/Network.pm +++ b/src/PVE/Network.pm @@ -13,12 +13,6 @@ use Net::IP; use POSIX qw(ECONNREFUSED); use Socket qw(NI_NUMERICHOST NI_NUMERICSERV); -my $have_sdn; -eval { - require PVE::Network::SDN::Zones; - $have_sdn = 1; -}; - # host network related utility functions our $PHYSICAL_NIC_RE = qr/(?:eth\d+|en[^:.]+|ib\d+)/; @@ -278,11 +272,6 @@ my $activate_interface = sub { sub tap_create { my ($iface, $bridge) = @_; - if ($have_sdn) { - my ($bridgesdn, undef) = PVE::Network::SDN::Zones::get_bridge_vlan($bridge); - $bridge = $bridgesdn if $bridgesdn; - } - die "unable to get bridge setting\n" if !$bridge; my $bridgemtu = &$read_bridge_mtu($bridge); @@ -297,11 +286,6 @@ sub tap_create { sub veth_create { my ($veth, $vethpeer, $bridge, $mac) = @_; - if ($have_sdn) { - my ($bridgesdn, undef) = PVE::Network::SDN::Zones::get_bridge_vlan($bridge); - $bridge = $bridgesdn if $bridgesdn; - } - die "unable to get bridge setting\n" if !$bridge; my $bridgemtu = &$read_bridge_mtu($bridge); @@ -393,12 +377,6 @@ my $cleanup_firewall_bridge = sub { sub tap_plug { my ($iface, $bridge, $tag, $firewall, $trunks, $rate) = @_; - if ($have_sdn) { - my ($bridgesdn, $tag) = PVE::Network::SDN::Zones::get_bridge_vlan($bridge); - $bridge = $bridgesdn if $bridgesdn; - $trunks = undef; - } - #cleanup old port config from any openvswitch bridge eval {run_command("/usr/bin/ovs-vsctl del-port $iface", outfunc => sub {}, errfunc => sub {}) }; -- 2.39.2