From c0d81cf1ef2ce46d70d17e166bbd56203add4733 Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Mon, 27 Apr 2015 17:05:50 +0100
Subject: [PATCH] fix bug in renumbering to an alias

---
 Netdisco/bin/netdisco-do                      | 4 ++--
 Netdisco/lib/App/Netdisco/Core/Discover.pm    | 6 ------
 Netdisco/lib/App/Netdisco/DB/Result/Device.pm | 4 ----
 Netdisco/lib/App/Netdisco/Util/Device.pm      | 4 ++--
 4 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/Netdisco/bin/netdisco-do b/Netdisco/bin/netdisco-do
index 1337ae18..7e9383d8 100755
--- a/Netdisco/bin/netdisco-do
+++ b/Netdisco/bin/netdisco-do
@@ -169,9 +169,9 @@ unless ($action) {
         return ('error', sprintf "Already know new device as: %s.", $new_dev->ip);
     }
 
-    renumber_device($device, $new_dev->ip);
+    renumber_device($device, $new_ip);
     return ('done', sprintf 'Renumbered device %s to %s (%s).',
-      $device->ip, $new_dev->ip, ($device->dns || ''));
+      $device->ip, $new_ip, ($device->dns || ''));
   }
 
   sub psql {
diff --git a/Netdisco/lib/App/Netdisco/Core/Discover.pm b/Netdisco/lib/App/Netdisco/Core/Discover.pm
index 27629725..a5a4938a 100644
--- a/Netdisco/lib/App/Netdisco/Core/Discover.pm
+++ b/Netdisco/lib/App/Netdisco/Core/Discover.pm
@@ -63,12 +63,6 @@ sub set_canonical_ip {
       $new_ip = $revname;
   }
 
-  # check if user has renumbered to an alias
-  if ($new_ip ne $old_ip
-      and $device->device_ips->count({alias => $old_ip})) {
-      $new_ip = $old_ip;
-  }
-
   if (setting('device_identity')) {
   }
 
diff --git a/Netdisco/lib/App/Netdisco/DB/Result/Device.pm b/Netdisco/lib/App/Netdisco/DB/Result/Device.pm
index f93d5dac..820d77b1 100644
--- a/Netdisco/lib/App/Netdisco/DB/Result/Device.pm
+++ b/Netdisco/lib/App/Netdisco/DB/Result/Device.pm
@@ -235,10 +235,6 @@ sub renumber {
     ->search({remote_ip => $old_ip})
     ->update({remote_ip => $new_ip});
 
-  $schema->resultset('DeviceIp')
-    ->search({alias => $old_ip})
-    ->update({alias => $new_ip});
-
   $schema->resultset('Admin')
     ->search({device => $old_ip})
     ->update({device => $new_ip});
diff --git a/Netdisco/lib/App/Netdisco/Util/Device.pm b/Netdisco/lib/App/Netdisco/Util/Device.pm
index 9d63a99d..6a050df3 100644
--- a/Netdisco/lib/App/Netdisco/Util/Device.pm
+++ b/Netdisco/lib/App/Netdisco/Util/Device.pm
@@ -89,7 +89,7 @@ sub delete_device {
     schema('netdisco')->resultset('UserLog')->create({
       username => session('logged_in_user'),
       userip => scalar eval {request->remote_address},
-      event => ("Delete device ". $device->ip),
+      event => (sprintf "Delete device %s", $device->ip),
       details => $log,
     });
 
@@ -122,7 +122,7 @@ sub renumber_device {
     schema('netdisco')->resultset('UserLog')->create({
       username => session('logged_in_user'),
       userip => scalar eval {request->remote_address},
-      event => "Renumbered device from $ip to $new_ip",
+      event => (sprintf "Renumber device %s to %s", $device->ip, $new_ip),
     });
 
     $happy = 1;