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

more bug fixes

Browse Source
This commit is contained in:
Oliver Gorwits
2013-06-09 14:09:27 +01:00
parent dfeacd12e2
commit 23d0e1b0e7
7 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Netdisco/META.yml
View File

@@ -60,4 +60,4 @@ resources:
homepage: http://netdisco.org/ homepage: http://netdisco.org/
license: http://opensource.org/licenses/bsd-license.php license: http://opensource.org/licenses/bsd-license.php
repository: git://git.code.sf.net/p/netdisco/netdisco-ng repository: git://git.code.sf.net/p/netdisco/netdisco-ng
version: 2.007000_004 version: 2.007000_005

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

@@ -7,7 +7,7 @@ use 5.010_000;
use File::ShareDir 'dist_dir'; use File::ShareDir 'dist_dir';
use Path::Class; use Path::Class;
our $VERSION = '2.007000_004'; our $VERSION = '2.007000_005';
BEGIN { BEGIN {
if (not length ($ENV{DANCER_APPDIR} || '') if (not length ($ENV{DANCER_APPDIR} || '')

2
Netdisco/lib/App/Netdisco/Daemon/Worker/Interactive/PortActions.pm
View File

@@ -101,7 +101,7 @@ sub set_power {
my $ip = $job->device; my $ip = $job->device;
my $pn = $job->port; my $pn = $job->port;
(my $data = $job->subaction) =~ s/-\w+//; (my $data = $job->subaction) =~ s/-\w+//; # remove -other
# snmp connect using rw community # snmp connect using rw community
my $info = snmp_connect_rw($ip) my $info = snmp_connect_rw($ip)

1
Netdisco/lib/App/Netdisco/Manual/Configuration.pod
View File

@@ -286,7 +286,6 @@ Value: List of Strings. Default:
- 'Virtual-Template\d+' - 'Virtual-Template\d+'
- 'Virtual-Access\d+' - 'Virtual-Access\d+'
- '(E|T)\d \d\/\d\/\d' - '(E|T)\d \d\/\d\/\d'
- 'Vlan1'
If present, device ports whose names match fully any of the items in this list If present, device ports whose names match fully any of the items in this list
will be ignored by the discovery process. will be ignored by the discovery process.

2
Netdisco/lib/App/Netdisco/Web/PortControl.pm
View File

@@ -8,7 +8,7 @@ ajax '/ajax/portcontrol' => sub {
send_error('Forbidden', 403) send_error('Forbidden', 403)
unless var('user')->port_control; unless var('user')->port_control;
send_error('No device/port/field', 400) send_error('No device/port/field', 400)
unless param('device') and param('port') and param('field'); unless param('device') and (param('port') or param('field'));
my $log = sprintf 'd:[%s] p:[%s] f:[%s]. a:[%s] v[%s]', my $log = sprintf 'd:[%s] p:[%s] f:[%s]. a:[%s] v[%s]',
param('device'), (param('port') || ''), param('field'), param('device'), (param('port') || ''), param('field'),

1
Netdisco/share/config.yml
View File

@@ -73,7 +73,6 @@ ignore_interfaces:
- 'Virtual-Template\d+' - 'Virtual-Template\d+'
- 'Virtual-Access\d+' - 'Virtual-Access\d+'
- '(E|T)\d \d\/\d\/\d' - '(E|T)\d \d\/\d\/\d'
- 'Vlan1'
ignore_private_nets: false ignore_private_nets: false
reverse_sysname: false reverse_sysname: false
vlanctl: true vlanctl: true

6
Netdisco/share/views/ajax/device/ports.tt
View File

@@ -213,10 +213,10 @@
<span class="label label-important">N</span> <span class="label label-important">N</span>
<a href="[% search_node %]&q=[% row.remote_ip | uri %]"> <a href="[% search_node %]&q=[% row.remote_ip | uri %]">
[% row.remote_ip | html_entity %] (port: [% row.remote_port | html_entity %] [% row.remote_ip | html_entity %] (port: [% row.remote_port | html_entity %]
[% ' id: '_ row.remote_type IF row.remote_type%] [% ' id: '_ row.remote_id IF row.remote_id %]
[% ' type: '_ row.remote_id IF row.remote_id%])</a> [% ' type: '_ row.remote_type IF row.remote_type %])</a>
[% ELSE %] [% ELSE %]
<span class="label label-important">N</span> (probable neighbor) <span class="label label-important">N</span> (possible uplink)
[% END %] [% END %]
[% END %] [% END %]
[% IF params.c_nodes %] [% IF params.c_nodes %]