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 }, { data_type => "text", is_nullable => 1 },
"speed", "speed",
{ data_type => "text", is_nullable => 1 }, { data_type => "text", is_nullable => 1 },
"speed_admin",
{ data_type => "text", is_nullable => 1 },
"name", "name",
{ data_type => "text", is_nullable => 1 }, { data_type => "text", is_nullable => 1 },
"mac", "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 }, { data_type => "boolean", default_value => \"false", is_nullable => 1 },
"ifindex", "ifindex",
{ data_type => "bigint", is_nullable => 1 }, { data_type => "bigint", is_nullable => 1 },
"speed_admin",
{ data_type => "text", is_nullable => 1 },
); );
__PACKAGE__->set_primary_key("port", "ip"); __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 }; || { map {($_->port => $_)} $device->ports->all };
my $raw_speed = $snmp->i_speed_raw || {}; my $raw_speed = $snmp->i_speed_raw || {};
my $speed_admin = $snmp->i_speed_admin || {};
foreach my $idx (keys %$raw_speed) { foreach my $idx (keys %$raw_speed) {
my $port = $interfaces->{$idx} or next; 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 }->{raw_speed} = $raw_speed->{$idx};
$properties{ $port }->{speed_admin} = $speed_admin->{$idx};
} }
my $err_cause = $snmp->i_err_disable_cause || {}; 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_descr = $snmp->i_description;
my $i_mtu = $snmp->i_mtu; my $i_mtu = $snmp->i_mtu;
my $i_speed = $snmp->i_speed; my $i_speed = $snmp->i_speed;
my $i_speed_admin = $snmp->i_speed_admin;
my $i_mac = $snmp->i_mac; my $i_mac = $snmp->i_mac;
my $i_up = $snmp->i_up; my $i_up = $snmp->i_up;
my $i_up_admin = $snmp->i_up_admin; 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}, up_admin => $i_up_admin->{$entry},
mac => $i_mac->{$entry}, mac => $i_mac->{$entry},
speed => $i_speed->{$entry}, speed => $i_speed->{$entry},
speed_admin => $i_speed_admin->{$entry},
mtu => $i_mtu->{$entry}, mtu => $i_mtu->{$entry},
name => Encode::decode('UTF-8', $i_name->{$entry}), name => Encode::decode('UTF-8', $i_name->{$entry}),
duplex => $i_duplex->{$entry}, duplex => $i_duplex->{$entry},

23
share/config.yml
View File

@@ -116,17 +116,18 @@ sidebar_defaults:
c_lastchange: { label: 'Last Change', default: null, idx: 6 } c_lastchange: { label: 'Last Change', default: null, idx: 6 }
c_name: { label: 'Name', default: checked, idx: 7 } c_name: { label: 'Name', default: checked, idx: 7 }
c_speed: { label: 'Speed', default: null, idx: 8 } c_speed: { label: 'Speed', default: null, idx: 8 }
c_error: { label: 'Error Message', default: null, idx: 9 } c_speed_admin: { label: 'Admin Speed', default: null, idx: 9 }
c_mac: { label: 'Port MAC', default: null, idx: 10 } c_error: { label: 'Error Message', default: null, idx: 10 }
c_mtu: { label: 'MTU', default: null, idx: 11 } c_mac: { label: 'Port MAC', default: null, idx: 11 }
c_pvid: { label: 'Native VLAN', default: checked, idx: 12 } c_mtu: { label: 'MTU', default: null, idx: 12 }
c_vmember: { label: 'VLAN Membership', default: checked, idx: 13 } c_pvid: { label: 'Native VLAN', default: checked, idx: 13 }
c_power: { label: 'PoE', default: null, idx: 14 } c_vmember: { label: 'VLAN Membership', default: checked, idx: 14 }
c_ssid: { label: 'SSID', default: null, idx: 15 } c_power: { label: 'PoE', default: null, idx: 15 }
c_nodes: { label: 'Connected Nodes', default: null, idx: 16 } c_ssid: { label: 'SSID', default: null, idx: 16 }
c_neighbors: { label: 'Connected Devices', default: checked, idx: 17 } c_nodes: { label: 'Connected Nodes', default: null, idx: 17 }
c_stp: { label: 'Spanning Tree', default: null, idx: 18 } c_neighbors: { label: 'Connected Devices', default: checked, idx: 18 }
c_up: { label: 'Status', default: null, idx: 19 } c_stp: { label: 'Spanning Tree', default: null, idx: 19 }
c_up: { label: 'Status', default: null, idx: 20 }
mac_format: { default: IEEE } mac_format: { default: IEEE }
n_inventory: { label: 'Inventory Data', default: checked, idx: 0 } n_inventory: { label: 'Inventory Data', default: checked, idx: 0 }
n_detailed_inventory: { label: 'Detailed Inventory', default: null, idx: 1 } n_detailed_inventory: { label: 'Detailed Inventory', default: null, idx: 1 }

2
share/schema_versions/App-Netdisco-DB-59-60-PostgreSQL.sql
View File

@@ -1,5 +1,5 @@
BEGIN; BEGIN;
ALTER TABLE device_port_properties ADD COLUMN "speed_admin" text; ALTER TABLE device_port ADD COLUMN "speed_admin" text;
COMMIT; COMMIT;

4
share/views/ajax/device/ports.tt
View File

@@ -175,6 +175,10 @@
<td>[% row.speed | html_entity %]</td> <td>[% row.speed | html_entity %]</td>
[% END %] [% END %]
[% IF params.c_speed_admin %]
<td>[% row.speed_admin | html_entity %]</td>
[% END %]
[% IF params.c_error %] [% IF params.c_error %]
<td>[% row.error_disable_cause | html_entity %]</td> <td>[% row.error_disable_cause | html_entity %]</td>
[% END %] [% END %]

4
share/views/ajax/device/ports_csv.tt
View File

@@ -91,6 +91,10 @@
[% myport.push(row.speed) %] [% myport.push(row.speed) %]
[% END %] [% END %]
[% IF params.c_speed_admin %]
[% myport.push(row.speed_admin) %]
[% END %]
[% IF params.c_error %] [% IF params.c_error %]
[% myport.push(row.error_disable_cause) %] [% myport.push(row.error_disable_cause) %]
[% END %] [% END %]