do not set master neigh if master is a slave

2014-01-13 13:57:31 +00:00
parent 5b2a0a0a4b
commit fe3e8e3ef2
1 changed files with 13 additions and 11 deletions
--- a/Netdisco/lib/App/Netdisco/Core/Discover.pm
+++ b/Netdisco/lib/App/Netdisco/Core/Discover.pm
@@ -792,6 +792,7 @@ sub store_neighbors {
          my $master = schema('netdisco')->resultset('DevicePort')
              ->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
              my $peer = schema('netdisco')->resultset('DevicePort')->find({
                  ip   => $portrow->neighbor->ip,
@@ -806,6 +807,7 @@ sub store_neighbors {
              });
          }
      }
+  }

  return @to_discover;
 }