also delete manual topo on device delete

This commit is contained in:
Oliver Gorwits
2013-09-09 00:32:44 +01:00
parent 8b98f9f4a6
commit 4f667a4f3a

View File

@@ -551,7 +551,7 @@ sub delete {
DeviceModule DeviceModule
/) { /) {
$schema->resultset($set)->search( $schema->resultset($set)->search(
{ ip => { '-in' => $devices->as_query }}, { ip => { '-in' => $devices->as_query } },
)->delete; )->delete;
} }
@@ -560,8 +560,15 @@ sub delete {
action => { '-like' => 'queued%' }, action => { '-like' => 'queued%' },
})->delete; })->delete;
$schema->resultset('Topology')->search({
-or => [
{ dev1 => { '-in' => $devices->as_query } },
{ dev2 => { '-in' => $devices->as_query } },
],
})->delete;
$schema->resultset('DevicePort')->search( $schema->resultset('DevicePort')->search(
{ ip => { '-in' => $devices->as_query }}, { ip => { '-in' => $devices->as_query } },
)->delete(@_); )->delete(@_);
# now let DBIC do its thing # now let DBIC do its thing