From e6d087ef5f1f132bf131f65db39ee9747f1f0d87 Mon Sep 17 00:00:00 2001
From: nick n <39005454+inphobia@users.noreply.github.com>
Date: Thu, 24 Jan 2019 15:12:06 +0100
Subject: [PATCH] fix for #491 (untested) (#492)

* move things to debug logging instead of info

* use message which was discussed

* merge master

* fix for #491. also use doublequotes in sprintf in portcontrol.pm line 59, else $device will not be printed
---
 lib/App/Netdisco/Worker/Plugin/PortControl.pm | 8 ++++----
 lib/App/Netdisco/Worker/Plugin/Power.pm       | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/App/Netdisco/Worker/Plugin/PortControl.pm b/lib/App/Netdisco/Worker/Plugin/PortControl.pm
index f767a874..a2607c9a 100644
--- a/lib/App/Netdisco/Worker/Plugin/PortControl.pm
+++ b/lib/App/Netdisco/Worker/Plugin/PortControl.pm
@@ -17,9 +17,9 @@ register_worker({ phase => 'check' }, sub {
     or return Status->error(sprintf "Unknown port name [%s] on device %s",
                               $job->port, $job->device);
 
-  my $vlan_reconfig_check = vlan_reconfig_check(vars->{'port'});
-  return Status->error("Cannot alter vlan: $vlan_reconfig_check")
-    if $vlan_reconfig_check;
+  my $port_reconfig_check = port_reconfig_check(vars->{'port'});
+  return Status->error("Cannot alter port: $port_reconfig_check")
+    if $port_reconfig_check;
 
   return Status->done('PortControl is able to run');
 });
@@ -56,7 +56,7 @@ sub _action {
   my $rv = $snmp->set_i_up_admin($data, $iid);
 
   if (!defined $rv) {
-      return Status->error(sprintf 'Failed to set [%s] up_admin to [%s] on $device: %s',
+      return Status->error(sprintf "Failed to set [%s] up_admin to [%s] on $device: %s",
                     $pn, $data, ($snmp->error || ''));
   }
 
diff --git a/lib/App/Netdisco/Worker/Plugin/Power.pm b/lib/App/Netdisco/Worker/Plugin/Power.pm
index 81099b48..b6789698 100644
--- a/lib/App/Netdisco/Worker/Plugin/Power.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Power.pm
@@ -19,9 +19,9 @@ register_worker({ phase => 'check' }, sub {
     or return Status->error(sprintf "Unknown port name [%s] on device %s",
                               $job->port, $job->device);
 
-  my $vlan_reconfig_check = vlan_reconfig_check(vars->{'port'});
-  return Status->error("Cannot alter vlan: $vlan_reconfig_check")
-    if $vlan_reconfig_check;
+  my $port_reconfig_check = port_reconfig_check(vars->{'port'});
+  return Status->error("Cannot alter port: $port_reconfig_check")
+    if $port_reconfig_check;
 
   return Status->error("No PoE service on port [$pn] on device $device")
     unless vars->{'port'}->power;
@@ -40,7 +40,7 @@ register_worker({ phase => 'main', driver => 'snmp' }, sub {
 
   # snmp connect using rw community
   my $snmp = App::Netdisco::Transport::SNMP->writer_for($device)
-    or return Status->defer("failed to connect to $device to update vlan");
+    or return Status->defer("failed to connect to $device to set power");
 
   my $powerid = get_powerid($snmp, vars->{'port'})
     or return Status->error("failed to get power ID for [$pn] from $device");