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

do not set master neigh if master is a slave

Browse Source
This commit is contained in:
Oliver Gorwits
2014-01-13 13:57:31 +00:00
parent 5b2a0a0a4b
commit fe3e8e3ef2
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -792,6 +792,7 @@ sub store_neighbors {
my $master = schema('netdisco')->resultset('DevicePort') my $master = schema('netdisco')->resultset('DevicePort')
->single({ip => $device->ip, port => $portrow->slave_of})) { ->single({ip => $device->ip, port => $portrow->slave_of})) {
if (not ($portrow->is_master or defined $master->slave_of)) {
# TODO needs refactoring - this is quite expensive # TODO needs refactoring - this is quite expensive
my $peer = schema('netdisco')->resultset('DevicePort')->find({ my $peer = schema('netdisco')->resultset('DevicePort')->find({
ip => $portrow->neighbor->ip, ip => $portrow->neighbor->ip,
@@ -806,6 +807,7 @@ sub store_neighbors {
}); });
} }
} }
}
return @to_discover; return @to_discover;
} }