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

Merge branch 'og-agg' of ssh://olly_g@git.code.sf.net/p/netdisco/netdisco-ng into og-agg

Browse Source
This commit is contained in:
Oliver Gorwits
2014-01-13 18:45:14 +00:00
parent cf23636ddf 571d57dcc7
commit 3939a2a51c
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Netdisco/META.yml
View File

@@ -71,4 +71,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.021000_002 version: 2.021000_003

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.021000_002'; our $VERSION = '2.021000_003';
BEGIN { BEGIN {
if (not ($ENV{DANCER_APPDIR} || '') if (not ($ENV{DANCER_APPDIR} || '')

6
Netdisco/lib/App/Netdisco/Core/Discover.pm
View File

@@ -733,7 +733,7 @@ sub store_neighbors {
foreach my $n (@$remote_ip) { foreach my $n (@$remote_ip) {
debug sprintf debug sprintf
' [%s] neigh - adding neighbor %s, type [%s], on %s to discovery queue', ' [%s] neigh - adding neighbor %s, type [%s], on %s to discovery queue',
$device->ip, $n, $remote_type, $port; $device->ip, $n, ($remote_type || ''), $port;
push @to_discover, [$n, $remote_type]; push @to_discover, [$n, $remote_type];
} }
} }
@@ -747,7 +747,7 @@ sub store_neighbors {
if (wantarray) { if (wantarray) {
debug sprintf debug sprintf
' [%s] neigh - adding neighbor %s, type [%s], on %s to discovery queue', ' [%s] neigh - adding neighbor %s, type [%s], on %s to discovery queue',
$device->ip, $remote_ip, $remote_type, $port; $device->ip, $remote_ip, ($remote_type || ''), $port;
push @to_discover, [$remote_ip, $remote_type]; push @to_discover, [$remote_ip, $remote_type];
} }
@@ -894,7 +894,7 @@ sub discover_new_neighbors {
if (not is_discoverable($device, $remote_type)) { if (not is_discoverable($device, $remote_type)) {
debug sprintf debug sprintf
' queue - %s, type [%s] excluded by discover_* config', ' queue - %s, type [%s] excluded by discover_* config',
$ip, $remote_type; $ip, ($remote_type || '');
next; next;
} }

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

@@ -243,9 +243,9 @@
self_options) %]&q=[% row.neighbor.dns || row.neighbor.ip | uri %]&f=[% row.remote_port | uri %]"> self_options) %]&q=[% row.neighbor.dns || row.neighbor.ip | uri %]&f=[% row.remote_port | uri %]">
[% row.neighbor.dns.remove(settings.domain_suffix) || row.neighbor.ip | html_entity %] [% row.neighbor.dns.remove(settings.domain_suffix) || row.neighbor.ip | html_entity %]
[% ' - ' IF row.remote_port %][% row.remote_port | html_entity %]</a><br/> [% ' - ' IF row.remote_port %][% row.remote_port | html_entity %]</a><br/>
[% IF params.neigh_id %] [% IF params.neigh_id and (row.remote_id or row.remote_type) %]
([% 'id: '_ row.remote_id IF row.remote_id %] ([% 'id: '_ row.remote_id IF row.remote_id %]
[% ' type: '_ row.remote_type IF row.remote_type %]) [% ' type: '_ row.remote_type IF row.remote_type %])<br/>
[% END %] [% END %]
[% ELSIF row.remote_ip %] [% ELSIF row.remote_ip %]
<i class="icon-unlink text-error"></i>&nbsp; <i class="icon-unlink text-error"></i>&nbsp;
@@ -257,9 +257,9 @@
<a href="[% search_node %]&q=[% row.remote_ip | uri %]"> <a href="[% search_node %]&q=[% row.remote_ip | uri %]">
[% row.remote_ip | html_entity %] [% row.remote_ip | html_entity %]
[% ' - ' IF row.remote_port %][% row.remote_port | html_entity %]</a><br/> [% ' - ' IF row.remote_port %][% row.remote_port | html_entity %]</a><br/>
[% IF params.neigh_id %] [% IF params.neigh_id and (row.remote_id or row.remote_type) %]
([% 'id: '_ row.remote_id IF row.remote_id %] ([% 'id: '_ row.remote_id IF row.remote_id %]
[% ' type: '_ row.remote_type IF row.remote_type %]) [% ' type: '_ row.remote_type IF row.remote_type %])<br/>
[% END %] [% END %]
[% ELSE %] [% ELSE %]
<i class="icon-unlink text-error"></i>&nbsp; (possible uplink) <i class="icon-unlink text-error"></i>&nbsp; (possible uplink)