135/snmp-info
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* better handling of i_vlan_membership()

Browse Source 
* make funcs() for ALD related functions to ensure mib loaded
This commit is contained in:
Justin Hunter
2016-09-19 14:46:27 -07:00
parent 4753f30c53
commit 36cba5ce18
1 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Info/Layer3/Juniper.pm
View File

@@ -49,6 +49,7 @@ $VERSION = '3.33';
'JUNIPER-MIB' => 'jnxBoxAnatomy', 'JUNIPER-MIB' => 'jnxBoxAnatomy',
'JUNIPER-VIRTUALCHASSIS-MIB' => 'jnxVirtualChassisMemberTable', 'JUNIPER-VIRTUALCHASSIS-MIB' => 'jnxVirtualChassisMemberTable',
'JUNIPER-VLAN-MIB' => 'jnxVlanMIBObjects', 'JUNIPER-VLAN-MIB' => 'jnxVlanMIBObjects',
'JUNIPER-L2ALD-MIB' => 'jnxL2aldVlanFdbId',
); );
%GLOBALS = ( %SNMP::Info::Layer3::GLOBALS, %GLOBALS = ( %SNMP::Info::Layer3::GLOBALS,
@@ -73,6 +74,9 @@ $VERSION = '3.33';
'e_contents_type' => 'jnxContentsType', 'e_contents_type' => 'jnxContentsType',
'e_containers_type' => 'jnxContainersType', 'e_containers_type' => 'jnxContainersType',
'e_hwver' => 'jnxContentsRevision', 'e_hwver' => 'jnxContentsRevision',
'v_fdb_id' => 'jnxL2aldVlanFdbId',
'v_vlan_tag' => 'jnxL2aldVlanTag',
); );
%MUNGE = ( %SNMP::Info::Layer3::MUNGE, %MUNGE = ( %SNMP::Info::Layer3::MUNGE,
@@ -256,18 +260,33 @@ sub _vlan_hoa {
return $vlan_hoa; return $vlan_hoa;
} }
sub i_vlan_membership {
my $juniper = shift;
my $partial = shift;
my $res;
my $dot1qVlanStaticEgressPorts = $juniper->dot1qVlanCurrentEgressPorts($partial) || $juniper->dot1qVlanStaticEgressPorts($partial);
my $bp_index = $juniper->bp_index();
foreach my $vlan (keys %$dot1qVlanStaticEgressPorts) {
my @bp_indexes = split /,/, $dot1qVlanStaticEgressPorts->{$vlan};
push @{$res->{$bp_index->{$_}}}, $vlan for @bp_indexes;
}
return $res;
}
sub qb_fw_vlan { sub qb_fw_vlan {
my $juniper = shift; my $juniper = shift;
my $qb_fw_vlan = $juniper->SUPER::qb_fw_vlan(); my $qb_fw_vlan = $juniper->SUPER::qb_fw_vlan();
my $jnxL2aldVlanFdbId = $juniper->jnxL2aldVlanFdbId(); my $v_fdb_id = $juniper->v_fdb_id();
my $jnxL2aldVlanTag = $juniper->jnxL2aldVlanTag(); my $v_vlan_tag = $juniper->v_vlan_tag();
return $qb_fw_vlan unless $jnxL2aldVlanFdbId && $jnxL2aldVlanTag; return $qb_fw_vlan unless $v_fdb_id && $v_vlan_tag;
my %fdb_id_to_tag = reverse %$jnxL2aldVlanFdbId; my %fdb_id_to_tag = reverse %$v_fdb_id;
foreach my $key (keys %$qb_fw_vlan) { foreach my $key (keys %$qb_fw_vlan) {
my $v = $qb_fw_vlan->{$key}; my $v = $qb_fw_vlan->{$key};
$qb_fw_vlan->{$key} = $jnxL2aldVlanTag->{$fdb_id_to_tag{$v}}; $qb_fw_vlan->{$key} = $v_vlan_tag->{$fdb_id_to_tag{$v}};
} }
return $qb_fw_vlan; return $qb_fw_vlan;