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

Add speed_admin to device ports tab (#650) (#653)

Browse Source 
* Add speed_admin to device ports tab (#650)

* move from device_port_properties to device_port table, and tidy up
This commit is contained in:
Christian Ramseyer
2019-09-23 14:58:26 +02:00
committed by Oliver Gorwits
parent 26960bdd34
commit 8ffdff3bbc
8 changed files with 45 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,6 +37,8 @@ __PACKAGE__->add_columns(
{ data_type => "text", is_nullable => 1 },
"speed",
{ data_type => "text", is_nullable => 1 },
"speed_admin",
{ data_type => "text", is_nullable => 1 },
"name",
{ data_type => "text", is_nullable => 1 },
"mac",

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

@@ -31,8 +31,6 @@ __PACKAGE__->add_columns(
{ data_type => "boolean", default_value => \"false", is_nullable => 1 },
"ifindex",
{ data_type => "bigint", is_nullable => 1 },
"speed_admin",
{ data_type => "text", is_nullable => 1 },
);
__PACKAGE__->set_primary_key("port", "ip");

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

@@ -26,7 +26,6 @@ register_worker({ phase => 'main', driver => 'snmp' }, sub {
|| { map {($_->port => $_)} $device->ports->all };
my $raw_speed = $snmp->i_speed_raw || {};
my $speed_admin = $snmp->i_speed_admin || {};
foreach my $idx (keys %$raw_speed) {
my $port = $interfaces->{$idx} or next;
@@ -37,7 +36,6 @@ register_worker({ phase => 'main', driver => 'snmp' }, sub {
}
$properties{ $port }->{raw_speed} = $raw_speed->{$idx};
$properties{ $port }->{speed_admin} = $speed_admin->{$idx};
}
my $err_cause = $snmp->i_err_disable_cause || {};

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

@@ -124,6 +124,7 @@ register_worker({ phase => 'early', driver => 'snmp' }, sub {
my $i_descr = $snmp->i_description;
my $i_mtu = $snmp->i_mtu;
my $i_speed = $snmp->i_speed;
my $i_speed_admin = $snmp->i_speed_admin;
my $i_mac = $snmp->i_mac;
my $i_up = $snmp->i_up;
my $i_up_admin = $snmp->i_up_admin;
@@ -221,6 +222,7 @@ register_worker({ phase => 'early', driver => 'snmp' }, sub {
up_admin => $i_up_admin->{$entry},
mac => $i_mac->{$entry},
speed => $i_speed->{$entry},
speed_admin => $i_speed_admin->{$entry},
mtu => $i_mtu->{$entry},
name => Encode::decode('UTF-8', $i_name->{$entry}),
duplex => $i_duplex->{$entry},