From 38fe6b8e1a64323c081b9e97177aaf97bd9c78fc Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Mon, 9 Dec 2013 00:01:33 +0000 Subject: [PATCH] Respect macsuck_bleed on broken topology detection --- Netdisco/Changes | 6 ++++++ Netdisco/lib/App/Netdisco/Core/Macsuck.pm | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Netdisco/Changes b/Netdisco/Changes index 92e6aae7..8a66bbc9 100644 --- a/Netdisco/Changes +++ b/Netdisco/Changes @@ -1,3 +1,9 @@ +2.020002 - + + [BUG FIXES] + + * Respect macsuck_bleed on broken topology detection + 2.020001 - 2013-12-08 [BUG FIXES] diff --git a/Netdisco/lib/App/Netdisco/Core/Macsuck.pm b/Netdisco/lib/App/Netdisco/Core/Macsuck.pm index 5a2afada..d07c18f9 100644 --- a/Netdisco/lib/App/Netdisco/Core/Macsuck.pm +++ b/Netdisco/lib/App/Netdisco/Core/Macsuck.pm @@ -85,7 +85,7 @@ sub do_macsuck { # reverse sort allows vlan 0 entries to be included only as fallback foreach my $vlan (reverse sort keys %$fwtable) { foreach my $port (keys %{ $fwtable->{$vlan} }) { - if ($device_ports->{$port}->is_uplink) { + if ($device_ports->{$port}->is_uplink and not setting('macsuck_bleed')) { debug sprintf ' [%s] macsuck - port %s is uplink, topo broken - skipping.', $device->ip, $port;