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

Merge branch 'master' of https://github.com/netdisco/netdisco

Browse Source
This commit is contained in:
Christian Ramseyer
2019-02-28 09:26:29 +01:00
parent dc9feb747f c2600ac550
commit bf3658f0f3
5 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/App/Netdisco/DB.pm
View File

@@ -11,7 +11,7 @@ __PACKAGE__->load_namespaces(
); );
our # try to hide from kwalitee our # try to hide from kwalitee
$VERSION = 53; # schema version used for upgrades, keep as integer $VERSION = 54; # schema version used for upgrades, keep as integer
use Path::Class; use Path::Class;
use File::ShareDir 'dist_dir'; use File::ShareDir 'dist_dir';

2
lib/App/Netdisco/DB/Result/DevicePortProperties.pm
View File

@@ -29,6 +29,8 @@ __PACKAGE__->add_columns(
{ data_type => "bigint", is_nullable => 1 }, { data_type => "bigint", is_nullable => 1 },
"faststart", "faststart",
{ data_type => "boolean", is_nullable => 1 }, { data_type => "boolean", is_nullable => 1 },
"ifindex",
{ data_type => "bigint", is_nullable => 1 },
); );
__PACKAGE__->set_primary_key("port", "ip"); __PACKAGE__->set_primary_key("port", "ip");

4
lib/App/Netdisco/Util/Device.pm
View File

@@ -100,8 +100,8 @@ sub delete_device {
=head2 renumber_device( $current_ip, $new_ip ) =head2 renumber_device( $current_ip, $new_ip )
Will update all records in Netdisco referring to the device with Will update all records in Netdisco referring to the device with
C<$current_ip> to use C<$new_ip> instead, followed by renumbering the device C<$current_ip> to use C<$new_ip> instead, followed by renumbering the
iteself. device itself.
Returns true if the transaction completes, else returns false. Returns true if the transaction completes, else returns false.

11
lib/App/Netdisco/Worker/Plugin/Discover/PortProperties.pm
View File

@@ -101,6 +101,17 @@ register_worker({ phase => 'main', driver => 'snmp' }, sub {
$properties{ $port }->{remote_serial} = $rem_serial->{ $idx }; $properties{ $port }->{remote_serial} = $rem_serial->{ $idx };
} }
foreach my $idx (keys %$interfaces) {
my $port = $interfaces->{$idx} or next;
if (!defined $device_ports->{$port}) {
debug sprintf ' [%s] properties/ifindex - local port %s already skipped, ignoring',
$device->ip, $port;
next;
}
$properties{ $port }->{ifindex} = $idx;
}
return Status->info(" [$device] no port properties to record") return Status->info(" [$device] no port properties to record")
unless scalar keys %properties; unless scalar keys %properties;

5
share/schema_versions/App-Netdisco-DB-53-54-PostgreSQL.sql Normal file
View File

@@ -0,0 +1,5 @@
BEGIN;
ALTER TABLE device_port_properties ADD COLUMN "ifindex" bigint;
COMMIT;