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

safety and tidy the port_macs patch

Browse Source
This commit is contained in:
Oliver Gorwits
2019-12-21 20:28:20 +00:00
parent 26d3fbdd40
commit 9a1938ddc9
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/App/Netdisco/Util/PortMAC.pm
View File

@@ -29,9 +29,9 @@ addresses supplied as array reference
=cut =cut
sub get_port_macs { sub get_port_macs {
my ($fw_mac_list) = @_; my ($fw_mac_list) = @_;
my $port_macs = {}; my $port_macs = {};
return {} unless defined $fw_mac_list and ref [] eq ref $fw_mac_list;
my $dp_macs my $dp_macs
= schema('netdisco')->resultset('DevicePort') = schema('netdisco')->resultset('DevicePort')

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

@@ -278,8 +278,7 @@ sub walk_fwtable {
? {} : $snmp->qb_fw_vlan; ? {} : $snmp->qb_fw_vlan;
my $bp_index = $snmp->bp_index; my $bp_index = $snmp->bp_index;
my @fw_mac_list = values %$fw_mac; my $port_macs = get_port_macs( values %$fw_mac );
my $port_macs = get_port_macs(\@fw_mac_list);
# to map forwarding table port to device port we have # to map forwarding table port to device port we have
# fw_port -> bp_index -> interfaces # fw_port -> bp_index -> interfaces