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

#506 relax device renumber so it works for an alias

Browse Source
This commit is contained in:
Oliver Gorwits
2019-03-02 22:41:40 +00:00
parent 7a8bcb094e
commit ef560fb59a
4 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/App/Netdisco/DB/Result/Device.pm
View File

@@ -277,6 +277,8 @@ sub renumber {
->update({ip => $new_ip}); ->update({ip => $new_ip});
} }
$schema->resultset('DeviceSkip')
->search({device => $new_ip})->delete;
$schema->resultset('DeviceSkip') $schema->resultset('DeviceSkip')
->search({device => $old_ip}) ->search({device => $old_ip})
->update({device => $new_ip}); ->update({device => $new_ip});

6
lib/App/Netdisco/Worker/Plugin.pm
View File

@@ -74,9 +74,9 @@ register 'register_worker' => sub {
push @newuserconf, dclone $stanza; push @newuserconf, dclone $stanza;
} }
# per-device action but no device creds available # # per-device action but no device creds available
return $job->add_status( Status->info('skip: driver or action not applicable') ) # return $job->add_status( Status->info('skip: driver or action not applicable') )
if 0 == scalar @newuserconf; # if 0 == scalar @newuserconf;
} }
# back up and restore device_auth # back up and restore device_auth

8
lib/App/Netdisco/Worker/Plugin/Renumber.pm
View File

@@ -28,10 +28,10 @@ register_worker({ phase => 'main' }, sub {
my $old_ip = $device->ip; my $old_ip = $device->ip;
my $new_ip = NetAddr::IP->new($extra); my $new_ip = NetAddr::IP->new($extra);
my $new_dev = get_device($new_ip->addr); #my $new_dev = get_device($new_ip->addr);
if ($new_dev and $new_dev->in_storage and ($new_dev->ip ne $device->ip)) { #if ($new_dev and $new_dev->in_storage and ($new_dev->ip ne $device->ip)) {
return Status->error(sprintf "Already know new device as: %s.", $new_dev->ip); # return Status->error(sprintf "Already know new device as: %s.", $new_dev->ip);
} #}
renumber_device($device, $new_ip); renumber_device($device, $new_ip);
return Status->done(sprintf 'Renumbered device %s to %s (%s).', return Status->done(sprintf 'Renumbered device %s to %s (%s).',

6
lib/App/Netdisco/Worker/Runner.pm
View File

@@ -49,9 +49,9 @@ sub run {
push @newuserconf, dclone $stanza; push @newuserconf, dclone $stanza;
} }
# per-device action but no device creds available # # per-device action but no device creds available
return $job->add_status( Status->defer('deferred job with no device creds') ) # return $job->add_status( Status->defer('deferred job with no device creds') )
if 0 == scalar @newuserconf; # if 0 == scalar @newuserconf;
} }
# back up and restore device_auth # back up and restore device_auth