135/snmp-info
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#320 improve duplicate interfaces() fixup

Browse Source 
1. sorts the interfaces as they are processed to make A/B testing easier
2. adds the interface index to the original when a duplicate is seen
3. there may be other de-duplication code in vendor modules, untouched
This commit is contained in:
Oliver Gorwits
2019-04-20 09:07:14 +01:00
parent ad8762a7c4
commit ea9ad92cc4
4 changed files with 66 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/SNMP/Info/Layer2.pm
View File

@@ -145,15 +145,21 @@ sub interfaces {
# Replace the Index with the ifDescr field.
# Check for duplicates in ifDescr, if so uniquely identify by adding
# ifIndex to repeated values
my %seen;
foreach my $iid ( keys %$i_descr ) {
my (%seen, %first_seen_as);
foreach my $iid ( sort keys %$i_descr ) {
my $port = $i_descr->{$iid};
next unless defined $port;
if ( $seen{$port}++ ) {
# (#320) also fixup the port this is a duplicate of
$interfaces->{ $first_seen_as{$port} }
= sprintf( "%s (%d)", $port, $first_seen_as{$port} );
$interfaces->{$iid} = sprintf( "%s (%d)", $port, $iid );
}
else {
$interfaces->{$iid} = $port;
$first_seen_as{$port} = $iid;
}
}
return $interfaces;

10
lib/SNMP/Info/Layer3.pm
View File

@@ -330,15 +330,21 @@ sub interfaces {
# Check for duplicates in ifDescr, if so uniquely identify by adding
# ifIndex to repeated values
my %seen;
foreach my $iid ( keys %$i_descr ) {
my (%seen, %first_seen_as);
foreach my $iid ( sort keys %$i_descr ) {
my $port = $i_descr->{$iid};
next unless defined $port;
if ( $seen{$port}++ ) {
# (#320) also fixup the port this is a duplicate of
$interfaces->{ $first_seen_as{$port} }
= sprintf( "%s (%d)", $port, $first_seen_as{$port} );
$interfaces->{$iid} = sprintf( "%s (%d)", $port, $iid );
}
else {
$interfaces->{$iid} = $port;
$first_seen_as{$port} = $iid;
}
}
return $interfaces;

26
xt/lib/Test/SNMP/Info/Layer2.pm
View File

@@ -47,9 +47,33 @@ sub setup : Tests(setup) {
# Start with a common cache that will serve most tests
my $cache_data = {
'store' => {},
'_i_index' => 1,
'_i_description' => 1,
'store' => {
'i_index' => {1 => 1, 2 => 2, 3 => 3, 4 => 4},
'i_description' => {
1 => 'Unique Interface Name',
2 => 'Duplicate Interface Name',
3 => 'Duplicate Interface Name'
},
},
};
$test->{info}->cache($cache_data);
}
sub duplicates : Tests(2) {
my $test = shift;
my $expected_data = {
1 => 'Unique Interface Name',
2 => 'Duplicate Interface Name (2)',
3 => 'Duplicate Interface Name (3)',
4 => 4,
};
can_ok($test->{info}, 'interfaces');
cmp_deeply($test->{info}->interfaces(),
$expected_data, 'Call to interfaces() removes duplicates');
}
1;

26
xt/lib/Test/SNMP/Info/Layer3.pm
View File

@@ -47,9 +47,33 @@ sub setup : Tests(setup) {
# Start with a common cache that will serve most tests
my $cache_data = {
'store' => {},
'_i_index' => 1,
'_i_description' => 1,
'store' => {
'i_index' => {1 => 1, 2 => 2, 3 => 3, 4 => 4},
'i_description' => {
1 => 'Unique Interface Name',
2 => 'Duplicate Interface Name',
3 => 'Duplicate Interface Name'
},
},
};
$test->{info}->cache($cache_data);
}
sub duplicates : Tests(2) {
my $test = shift;
my $expected_data = {
1 => 'Unique Interface Name',
2 => 'Duplicate Interface Name (2)',
3 => 'Duplicate Interface Name (3)',
4 => 4,
};
can_ok($test->{info}, 'interfaces');
cmp_deeply($test->{info}->interfaces(),
$expected_data, 'Call to interfaces() removes duplicates');
}
1;