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

rename setting macsuck_no_deviceport to macsuck_no_deviceports

Browse Source
This commit is contained in:
Oliver Gorwits
2022-09-24 22:35:23 +01:00
parent 0754fa53fc
commit d6d877a406
4 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Changes
View File

@@ -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 2.057001 - 2022-09-24
[ENHANCEMENTS] [ENHANCEMENTS]

7
lib/App/Netdisco/Configuration.pm
View File

@@ -229,9 +229,12 @@ if (ref {} eq ref setting('device_identity')) {
else { config->{'device_identity'} ||= [] } else { config->{'device_identity'} ||= [] }
if (ref {} eq ref setting('macsuck_no_deviceport')) { 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')) { if (ref {} eq ref setting('hide_deviceports')) {
config->{'hide_deviceports'} = [ setting('hide_deviceports') ]; config->{'hide_deviceports'} = [ setting('hide_deviceports') ];

8
lib/App/Netdisco/Worker/Plugin/Macsuck/Nodes.pm
View File

@@ -292,9 +292,9 @@ sub walk_fwtable {
my $skiplist = {}; # ports through which we can see another device my $skiplist = {}; # ports through which we can see another device
my $cache = {}; my $cache = {};
my $ignorelist = {}; # ports suppressed by macsuck_no_deviceport my $ignorelist = {}; # ports suppressed by macsuck_no_deviceports
if (scalar @{ setting('macsuck_no_deviceport') }) { if (scalar @{ setting('macsuck_no_deviceports') }) {
my @ignoremaps = @{ setting('macsuck_no_deviceport') }; my @ignoremaps = @{ setting('macsuck_no_deviceports') };
foreach my $map (@ignoremaps) { foreach my $map (@ignoremaps) {
next unless ref {} eq ref $map; next unless ref {} eq ref $map;
@@ -307,7 +307,7 @@ sub walk_fwtable {
next unless check_acl_only($device_ports->{$port}, $map->{$key}); next unless check_acl_only($device_ports->{$port}, $map->{$key});
++$ignorelist->{$port}; ++$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; $device->ip, $port;
} }
} }

2
share/config.yml
View File

@@ -310,7 +310,7 @@ macsuck_no_vlan:
- 'SAM-vlan-appliance-management' - 'SAM-vlan-appliance-management'
- 'SAM-vlan-management' - 'SAM-vlan-management'
macsuck_no_devicevlan: [] macsuck_no_devicevlan: []
macsuck_no_deviceport: [] macsuck_no_deviceports: []
macsuck_unsupported: [] macsuck_unsupported: []
macsuck_unsupported_type: [] macsuck_unsupported_type: []
macsuck_bleed: false macsuck_bleed: false