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

refactor to try device port vlan update again

Browse Source
This commit is contained in:
Oliver Gorwits
2019-04-02 15:31:20 +01:00
parent 223c616cb0
commit db71fffe54
1 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
lib/App/Netdisco/Worker/Plugin/Discover/VLANs.pm
View File

@@ -1,12 +1,14 @@
package App::Netdisco::Worker::Plugin::Discover::VLANs; package App::Netdisco::Worker::Plugin::Discover::VLANs;
use Dancer ':syntax'; use Dancer ':syntax';
use App::Netdisco::Worker::Plugin;
use aliased 'App::Netdisco::Worker::Status';
use App::Netdisco::Transport::SNMP ();
use Dancer::Plugin::DBIC 'schema'; use Dancer::Plugin::DBIC 'schema';
use App::Netdisco::Worker::Plugin;
use App::Netdisco::Transport::SNMP ();
use aliased 'App::Netdisco::Worker::Status';
use List::MoreUtils 'uniq';
register_worker({ phase => 'main', driver => 'snmp' }, sub { register_worker({ phase => 'main', driver => 'snmp' }, sub {
my ($job, $workerconf) = @_; my ($job, $workerconf) = @_;
@@ -22,20 +24,19 @@ register_worker({ phase => 'main', driver => 'snmp' }, sub {
my $device_ports = vars->{'device_ports'} my $device_ports = vars->{'device_ports'}
|| { map {($_->port => $_)} $device->ports->all }; || { map {($_->port => $_)} $device->ports->all };
my $i_vlan = $snmp->i_vlan; my $i_vlan = $snmp->i_vlan;
my $i_vlan_type = $snmp->i_vlan_type; my $i_vlan_type = $snmp->i_vlan_type;
my $interfaces = $snmp->interfaces; my $interfaces = $snmp->interfaces;
my $i_vlan_membership = $snmp->i_vlan_membership; my $i_vlan_membership = $snmp->i_vlan_membership;
my $i_vlan_membership_untagged = $snmp->i_vlan_membership_untagged; my $i_vlan_membership_untagged = $snmp->i_vlan_membership_untagged;
my %p_seen = (); my %p_seen = ();
my @portvlans = (); my @portvlans = ();
my @active_ports = (keys %$i_vlan_membership_untagged, keys %$i_vlan_membership);
# build port vlans suitable for DBIC # build port vlans suitable for DBIC
foreach my $entry (keys %$i_vlan_membership_untagged, keys %$i_vlan_membership) { foreach my $entry (sort uniq @active_ports) {
my %this_port_vlans = ();
my $port = $interfaces->{$entry} or next; my $port = $interfaces->{$entry} or next;
my $type = $i_vlan_type->{$entry};
if (!defined $device_ports->{$port}) { if (!defined $device_ports->{$port}) {
debug sprintf ' [%s] vlans - local port %s already skipped, ignoring', debug sprintf ' [%s] vlans - local port %s already skipped, ignoring',
@@ -43,11 +44,14 @@ register_worker({ phase => 'main', driver => 'snmp' }, sub {
next; next;
} }
foreach my $vlan (@{ $i_vlan_membership_untagged->{$entry} }) { my %this_port_vlans = ();
next unless defined $vlan and $vlan; my $type = $i_vlan_type->{$entry};
next if $this_port_vlans{$vlan};
foreach my $vlan (@{ $i_vlan_membership_untagged->{$entry} || [] }) {
next if $this_port_vlans{$vlan};
my $native = ((defined $i_vlan->{$entry})
and ($vlan eq $i_vlan->{$entry})) ? 't' : 'f';
my $native = ((defined $i_vlan->{$entry}) and ($vlan eq $i_vlan->{$entry})) ? "t" : "f";
push @portvlans, { push @portvlans, {
port => $port, port => $port,
vlan => $vlan, vlan => $vlan,
@@ -61,17 +65,16 @@ register_worker({ phase => 'main', driver => 'snmp' }, sub {
++$p_seen{$vlan}; ++$p_seen{$vlan};
} }
foreach my $vlan (@{ $i_vlan_membership->{$entry} }) { foreach my $vlan (@{ $i_vlan_membership->{$entry} || [] }) {
next unless defined $vlan and $vlan;
next if $this_port_vlans{$vlan}; next if $this_port_vlans{$vlan};
my $native = ((defined $i_vlan->{$entry})
and ($vlan eq $i_vlan->{$entry})) ? 't' : 'f';
my $native = ((defined $i_vlan->{$entry}) and ($vlan eq $i_vlan->{$entry})) ? "t" : "f";
my $egress = ((defined $i_vlan->{$entry}) and ($vlan eq $i_vlan->{$entry})) ? "f" : "t";
push @portvlans, { push @portvlans, {
port => $port, port => $port,
vlan => $vlan, vlan => $vlan,
native => $native, native => $native,
egress_tag => $egress, egress_tag => ($native eq 't' ? 'f' : 't'),
vlantype => $type, vlantype => $type,
last_discover => \'now()', last_discover => \'now()',
}; };