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

#549 clean manual topology after device ports change

Browse Source
This commit is contained in:
Oliver Gorwits
2019-04-01 13:23:51 +01:00
parent e2ca54b3c0
commit 8c974fd256
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/App/Netdisco/Worker/Plugin/Discover/Neighbors.pm
View File

@@ -314,6 +314,18 @@ sub set_manual_topology {
schema('netdisco')->resultset('DevicePort') schema('netdisco')->resultset('DevicePort')
->search({ip => $device->ip})->update({manual_topo => \'false'}); ->search({ip => $device->ip})->update({manual_topo => \'false'});
# clear outdated manual topology links
my $old_links = schema('netdisco')->resultset('Topology')->search({
-or => [
{ dev1 => $device->ip,
port1 => { '-not_in' => $device->ports->get_column('port')->as_query } },
{ dev2 => $device->ip,
port2 => { '-not_in' => $device->ports->get_column('port')->as_query } },
],
})->delete;
debug sprintf ' [%s] neigh - removed %d outdated manual topology links',
$device->ip, $old_links;
my $topo_links = schema('netdisco')->resultset('Topology') my $topo_links = schema('netdisco')->resultset('Topology')
->search({-or => [dev1 => $device->ip, dev2 => $device->ip]}); ->search({-or => [dev1 => $device->ip, dev2 => $device->ip]});
debug sprintf ' [%s] neigh - setting manual topology links', $device->ip; debug sprintf ' [%s] neigh - setting manual topology links', $device->ip;