135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Skip VLANs undef or zero (reported by Brian van Baekel)

Browse Source
This commit is contained in:
Oliver Gorwits
2015-07-30 16:17:09 +01:00
parent 02135958d3
commit a23bb7a632
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Netdisco/Changes
View File

@@ -1,3 +1,9 @@
2.032007 - 2015-0
[BUG FIXES]
* Skip VLANs undef or zero (reported by Brian van Baekel)
2.032006 - 2015-07-18 2.032006 - 2015-07-18
[BUG FIXES] [BUG FIXES]

2
Netdisco/lib/App/Netdisco/Core/Discover.pm
View File

@@ -416,6 +416,7 @@ sub store_vlans {
my @devicevlans; my @devicevlans;
foreach my $entry (keys %$v_name) { foreach my $entry (keys %$v_name) {
my $vlan = $v_index->{$entry}; my $vlan = $v_index->{$entry};
next unless defined $vlan and $vlan;
++$v_seen{$vlan}; ++$v_seen{$vlan};
push @devicevlans, { push @devicevlans, {
@@ -440,6 +441,7 @@ sub store_vlans {
my $type = $i_vlan_type->{$entry}; my $type = $i_vlan_type->{$entry};
foreach my $vlan (@{ $i_vlan_membership->{$entry} }) { foreach my $vlan (@{ $i_vlan_membership->{$entry} }) {
next unless defined $vlan and $vlan;
next if ++$port_vseen{$vlan} > 1; next if ++$port_vseen{$vlan} > 1;
my $native = ((defined $i_vlan->{$entry}) and ($vlan eq $i_vlan->{$entry})) ? "t" : "f"; my $native = ((defined $i_vlan->{$entry}) and ($vlan eq $i_vlan->{$entry})) ? "t" : "f";