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

minor tidying [skip ci]

Browse Source
This commit is contained in:
Oliver Gorwits
2018-01-31 15:53:33 +00:00
parent 0ff30d5214
commit 7b1ef2b0c1
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/App/Netdisco/Worker/Plugin/Discover/Properties.pm
View File

@@ -25,16 +25,14 @@ register_worker({ phase => 'early', driver => 'snmp' }, sub {
my $interfaces = $snmp->interfaces; my $interfaces = $snmp->interfaces;
my $ip_netmask = $snmp->ip_netmask; my $ip_netmask = $snmp->ip_netmask;
# Get IP Table peer VRF if supported # Get IP Table per VRF if supported
my @vrf_list = _get_vrf_list($device, $snmp);
{ {
my $guard = guard { snmp_comm_reindex($snmp, $device, 0) }; my $guard = guard { snmp_comm_reindex($snmp, $device, 0) };
foreach my $vrf (@vrf_list) { foreach my $vrf (_get_vrf_list($device, $snmp)) {
snmp_comm_reindex($snmp, $device, $vrf); snmp_comm_reindex($snmp, $device, $vrf);
$ip_index = { %$ip_index , %{$snmp->ip_index} }; $ip_index = { %$ip_index, %{$snmp->ip_index} };
$interfaces = { %$interfaces , %{$snmp->interfaces} }; $interfaces = { %$interfaces, %{$snmp->interfaces} };
$ip_netmask = { %$ip_netmask , %{$snmp->ip_netmask} }; $ip_netmask = { %$ip_netmask, %{$snmp->ip_netmask} };
} }
} }
@@ -100,7 +98,6 @@ register_worker({ phase => 'early', driver => 'snmp' }, sub {
$device->set_column( contact => Encode::decode('UTF-8', $snmp->contact) ); $device->set_column( contact => Encode::decode('UTF-8', $snmp->contact) );
$device->set_column( location => Encode::decode('UTF-8', $snmp->location) ); $device->set_column( location => Encode::decode('UTF-8', $snmp->location) );
$device->set_column( snmp_class => $snmp->class ); $device->set_column( snmp_class => $snmp->class );
$device->set_column( last_discover => \'now()' ); $device->set_column( last_discover => \'now()' );