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

#443 attempt to handle IPs and Names in show arp output - darknicht66

Browse Source
This commit is contained in:
Oliver Gorwits
2018-10-19 15:31:31 +01:00
parent ffa2aefd8d
commit 847d7e16e3
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/App/Netdisco/SSHCollector/Platform/ASA.pm
View File

@@ -78,6 +78,10 @@ sub arpnip {
$prompt = qr/#/; $prompt = qr/#/;
($pos, $error, $match, $before, $after) = $expect->expect(10, -re, $prompt); ($pos, $error, $match, $before, $after) = $expect->expect(10, -re, $prompt);
$expect->send("show names\n");
($pos, $error, $match, $before, $after) = $expect->expect(60, -re, $prompt);
my @names = split(m/\n/, $before);
$expect->send("terminal pager 2147483647\n"); $expect->send("terminal pager 2147483647\n");
($pos, $error, $match, $before, $after) = $expect->expect(5, -re, $prompt); ($pos, $error, $match, $before, $after) = $expect->expect(5, -re, $prompt);
@@ -94,7 +98,18 @@ sub arpnip {
foreach my $line (@lines) { foreach my $line (@lines) {
if ($line =~ $linereg) { if ($line =~ $linereg) {
my ($ip, $mac) = ($1, $2); my ($ip, $mac) = ($1, $2);
push @arpentries, { mac => $mac, ip => $ip }; if ($ip !~ m/[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}/) {
foreach my $name (@names) {
if ($name =~ qr/name\s([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3})\s([\w-]*)/x) {
if ($ip eq $2) {
$ip = $1;
}
}
}
}
if ($ip =~ m/[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}/) {
push @arpentries, { mac => $mac, ip => $ip };
}
} }
} }