From d6d877a406a417e2046f5268ccd85cda032705dc Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Sat, 24 Sep 2022 22:35:23 +0100
Subject: [PATCH] rename setting macsuck_no_deviceport to
 macsuck_no_deviceports

---
 Changes                                         | 6 ++++++
 lib/App/Netdisco/Configuration.pm               | 7 +++++--
 lib/App/Netdisco/Worker/Plugin/Macsuck/Nodes.pm | 8 ++++----
 share/config.yml                                | 2 +-
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/Changes b/Changes
index 02f87a5e..783e8481 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,9 @@
+2.057002 - 2022-09-24
+
+  [BUG FIXES]
+
+  * rename setting macsuck_no_deviceport to macsuck_no_deviceports
+
 2.057001 - 2022-09-24
 
   [ENHANCEMENTS]
diff --git a/lib/App/Netdisco/Configuration.pm b/lib/App/Netdisco/Configuration.pm
index 5f09fe42..d2106915 100644
--- a/lib/App/Netdisco/Configuration.pm
+++ b/lib/App/Netdisco/Configuration.pm
@@ -229,9 +229,12 @@ if (ref {} eq ref setting('device_identity')) {
 else { config->{'device_identity'} ||= [] }
 
 if (ref {} eq ref setting('macsuck_no_deviceport')) {
-  config->{'macsuck_no_deviceport'} = [ setting('macsuck_no_deviceport') ];
+  config->{'macsuck_no_deviceports'} = [ setting('macsuck_no_deviceport') ];
 }
-else { config->{'macsuck_no_deviceport'} ||= [] }
+if (ref {} eq ref setting('macsuck_no_deviceports')) {
+  config->{'macsuck_no_deviceports'} = [ setting('macsuck_no_deviceports') ];
+}
+else { config->{'macsuck_no_deviceports'} ||= [] }
 
 if (ref {} eq ref setting('hide_deviceports')) {
   config->{'hide_deviceports'} = [ setting('hide_deviceports') ];
diff --git a/lib/App/Netdisco/Worker/Plugin/Macsuck/Nodes.pm b/lib/App/Netdisco/Worker/Plugin/Macsuck/Nodes.pm
index 8cd69eb6..01d336aa 100644
--- a/lib/App/Netdisco/Worker/Plugin/Macsuck/Nodes.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Macsuck/Nodes.pm
@@ -292,9 +292,9 @@ sub walk_fwtable {
   my $skiplist = {}; # ports through which we can see another device
   my $cache = {};
 
-  my $ignorelist = {}; # ports suppressed by macsuck_no_deviceport
-  if (scalar @{ setting('macsuck_no_deviceport') }) {
-      my @ignoremaps = @{ setting('macsuck_no_deviceport') };
+  my $ignorelist = {}; # ports suppressed by macsuck_no_deviceports
+  if (scalar @{ setting('macsuck_no_deviceports') }) {
+      my @ignoremaps = @{ setting('macsuck_no_deviceports') };
 
       foreach my $map (@ignoremaps) {
           next unless ref {} eq ref $map;
@@ -307,7 +307,7 @@ sub walk_fwtable {
                   next unless check_acl_only($device_ports->{$port}, $map->{$key});
 
                   ++$ignorelist->{$port};
-                  debug sprintf ' [%s] macsuck %s - port suppressed by macsuck_no_deviceport',
+                  debug sprintf ' [%s] macsuck %s - port suppressed by macsuck_no_deviceports',
                     $device->ip, $port;
               }
           }
diff --git a/share/config.yml b/share/config.yml
index c889dfe8..c7faa5be 100644
--- a/share/config.yml
+++ b/share/config.yml
@@ -310,7 +310,7 @@ macsuck_no_vlan:
   - 'SAM-vlan-appliance-management'
   - 'SAM-vlan-management'
 macsuck_no_devicevlan: []
-macsuck_no_deviceport: []
+macsuck_no_deviceports: []
 macsuck_unsupported: []
 macsuck_unsupported_type: []
 macsuck_bleed: false