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

[#161] Updated IOS-XR SSHCollector

Browse Source
This commit is contained in:
Oliver Gorwits
2014-11-13 23:51:10 +00:00
parent 51fa835e16
commit f58e7c1753
2 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Netdisco/Changes
View File

@@ -1,5 +1,9 @@
2.029013_001 - 2014-11-13 2.029013_001 - 2014-11-13
[ENHANCEMENTS]
* [#161] Updated IOS-XR SSHCollector
[BUG FIXES] [BUG FIXES]
* Fix for latest DBIx::Class (deploy) * Fix for latest DBIx::Class (deploy)

28
Netdisco/lib/App/Netdisco/SSHCollector/Platform/IOSXR.pm
View File

@@ -8,7 +8,7 @@ App::Netdisco::SSHCollector::Platform::IOSXR
=head1 DESCRIPTION =head1 DESCRIPTION
Collect ARP entries from Cisco IOS XR devices. Collect ARP entries from Cisco IOSXR devices.
=cut =cut
@@ -16,7 +16,6 @@ use strict;
use warnings; use warnings;
use Dancer ':script'; use Dancer ':script';
use Expect;
use Moo; use Moo;
=head1 PUBLIC METHODS =head1 PUBLIC METHODS
@@ -36,28 +35,19 @@ sub arpnip {
my ($self, $hostlabel, $ssh, @args) = @_; my ($self, $hostlabel, $ssh, @args) = @_;
debug "$hostlabel $$ arpnip()"; debug "$hostlabel $$ arpnip()";
my @data = $ssh->capture("show arp vrf all");
my ($pty, $pid) = $ssh->open2pty or die "unable to run remote command"; chomp @data;
my $expect = Expect->init($pty);
my ($pos, $error, $match, $before, $after);
my $prompt = qr/#/;
($pos, $error, $match, $before, $after) = $expect->expect(10, -re, $prompt);
$expect->send("terminal length 0\n");
($pos, $error, $match, $before, $after) = $expect->expect(5, -re, $prompt);
my @arpentries; my @arpentries;
$expect->send("show arp vrf all\n");
($pos, $error, $match, $before, $after) = $expect->expect(5, -re, $prompt);
# 0.0.0.0 00:00:00 0000.0000.0000 Dynamic ARPA GigabitEthernet0/0/0/0 # 0.0.0.0 00:00:00 0000.0000.0000 Dynamic ARPA GigabitEthernet0/0/0/0
for (split(/\n/, $before)){ foreach (@data) {
my ($ip, $age, $mac, $state, $t, $iface) = split(/\s+/); my ($ip, $age, $mac, $state, $t, $iface) = split(/\s+/);
if ($ip =~ m/(\d{1,3}\.){3}\d{1,3}/ && $mac =~ m/[0-9a-f.]+/i) {
push(@arpentries, { ip => $ip, mac => $mac }); if ($ip =~ m/(\d{1,3}\.){3}\d{1,3}/
&& $mac =~ m/([0-9a-f]{4}\.){2}[0-9a-f]{4}/i) {
push(@arpentries, { ip => $ip, mac => $mac });
} }
} }