perltidy
This commit is contained in:
@@ -5,21 +5,21 @@
|
||||
#
|
||||
# Copyright (c) 2002,2003 Regents of the University of California
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions are met:
|
||||
#
|
||||
#
|
||||
# * Redistributions of source code must retain the above copyright notice,
|
||||
# this list of conditions and the following disclaimer.
|
||||
# * Redistributions in binary form must reproduce the above copyright
|
||||
# notice, this list of conditions and the following disclaimer in the
|
||||
# documentation and/or other materials provided with the distribution.
|
||||
# * Neither the name of the University of California, Santa Cruz nor the
|
||||
# names of its contributors may be used to endorse or promote products
|
||||
# * Neither the name of the University of California, Santa Cruz nor the
|
||||
# names of its contributors may be used to endorse or promote products
|
||||
# derived from this software without specific prior written permission.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
||||
# LIABLE FOR # ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
@@ -37,74 +37,83 @@ use Exporter;
|
||||
use SNMP::Info::Layer3;
|
||||
use SNMP::Info::MAU;
|
||||
|
||||
@SNMP::Info::Layer3::Extreme::ISA = qw/SNMP::Info::Layer3 SNMP::Info::MAU Exporter/;
|
||||
@SNMP::Info::Layer3::Extreme::ISA
|
||||
= qw/SNMP::Info::Layer3 SNMP::Info::MAU Exporter/;
|
||||
@SNMP::Info::Layer3::Extreme::EXPORT_OK = qw//;
|
||||
|
||||
use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
|
||||
|
||||
$VERSION = '1.09';
|
||||
|
||||
%MIBS = ( %SNMP::Info::Layer3::MIBS,
|
||||
%SNMP::Info::MAU::MIBS,
|
||||
'EXTREME-BASE-MIB' => 'extremeAgent',
|
||||
'EXTREME-SYSTEM-MIB' => 'extremeSystem',
|
||||
'EXTREME-FDB-MIB' => 'extremeSystem',
|
||||
'EXTREME-VLAN-MIB' => 'extremeVlan',
|
||||
);
|
||||
%MIBS = (
|
||||
%SNMP::Info::Layer3::MIBS,
|
||||
%SNMP::Info::MAU::MIBS,
|
||||
'EXTREME-BASE-MIB' => 'extremeAgent',
|
||||
'EXTREME-SYSTEM-MIB' => 'extremeSystem',
|
||||
'EXTREME-FDB-MIB' => 'extremeSystem',
|
||||
'EXTREME-VLAN-MIB' => 'extremeVlan',
|
||||
);
|
||||
|
||||
%GLOBALS = (
|
||||
%SNMP::Info::Layer3::GLOBALS,
|
||||
%SNMP::Info::MAU::GLOBALS,
|
||||
'serial1' => 'extremeSystemID.0',
|
||||
'temp' => 'extremeCurrentTemperature',
|
||||
'ps1_status_old' => 'extremePrimaryPowerOperational.0',
|
||||
'ps1_status_new' => 'extremePowerSupplyStatus.1',
|
||||
'ps2_status_old' => 'extremeRedundantPowerStatus.0',
|
||||
'ps2_status_new' => 'extremePowerSupplyStatus.2',
|
||||
'mac' => 'dot1dBaseBridgeAddress',
|
||||
);
|
||||
%SNMP::Info::Layer3::GLOBALS,
|
||||
%SNMP::Info::MAU::GLOBALS,
|
||||
'serial1' => 'extremeSystemID.0',
|
||||
'temp' => 'extremeCurrentTemperature',
|
||||
'ps1_status_old' => 'extremePrimaryPowerOperational.0',
|
||||
'ps1_status_new' => 'extremePowerSupplyStatus.1',
|
||||
'ps2_status_old' => 'extremeRedundantPowerStatus.0',
|
||||
'ps2_status_new' => 'extremePowerSupplyStatus.2',
|
||||
'mac' => 'dot1dBaseBridgeAddress',
|
||||
);
|
||||
|
||||
%FUNCS = (
|
||||
%SNMP::Info::Layer3::FUNCS,
|
||||
%SNMP::Info::MAU::FUNCS,
|
||||
'fan_state' => 'extremeFanOperational',
|
||||
# EXTREME-FDB-MIB:extremeFdbMacFdbTable
|
||||
'ex_fw_mac' => 'extremeFdbMacFdbMacAddress',
|
||||
'ex_fw_port' => 'extremeFdbMacFdbPortIfIndex',
|
||||
'ex_fw_status' => 'extremeFdbMacFdbStatus',
|
||||
# EXTREME-VLAN-MIB:extremeVlanIfTable
|
||||
'ex_vlan_descr' => 'extremeVlanIfDescr',
|
||||
'ex_vlan_global_id' => 'extremeVlanIfGlobalIdentifier',
|
||||
# EXTREME-VLAN-MIB:extremeVlanEncapsIfTable
|
||||
'ex_vlan_encap_tag' => 'extremeVlanEncapsIfTag',
|
||||
);
|
||||
%FUNCS = (
|
||||
%SNMP::Info::Layer3::FUNCS,
|
||||
%SNMP::Info::MAU::FUNCS,
|
||||
'fan_state' => 'extremeFanOperational',
|
||||
|
||||
# EXTREME-FDB-MIB:extremeFdbMacFdbTable
|
||||
'ex_fw_mac' => 'extremeFdbMacFdbMacAddress',
|
||||
'ex_fw_port' => 'extremeFdbMacFdbPortIfIndex',
|
||||
'ex_fw_status' => 'extremeFdbMacFdbStatus',
|
||||
|
||||
# EXTREME-VLAN-MIB:extremeVlanIfTable
|
||||
'ex_vlan_descr' => 'extremeVlanIfDescr',
|
||||
'ex_vlan_global_id' => 'extremeVlanIfGlobalIdentifier',
|
||||
|
||||
# EXTREME-VLAN-MIB:extremeVlanEncapsIfTable
|
||||
'ex_vlan_encap_tag' => 'extremeVlanEncapsIfTag',
|
||||
);
|
||||
|
||||
%MUNGE = (
|
||||
# Inherit all the built in munging
|
||||
%SNMP::Info::Layer3::MUNGE,
|
||||
%SNMP::Info::MAU::MUNGE,
|
||||
'ex_fw_mac' => \&SNMP::Info::munge_mac,
|
||||
'ps1_status_old' => \&munge_true_ok,
|
||||
'ps1_status_new' => \&munge_power_stat,
|
||||
'ps2_status_old' => \&munge_power_stat,
|
||||
'ps2_status_new' => \&munge_power_stat,
|
||||
'fan_state' => \&munge_true_ok,
|
||||
);
|
||||
|
||||
# Inherit all the built in munging
|
||||
%SNMP::Info::Layer3::MUNGE,
|
||||
%SNMP::Info::MAU::MUNGE,
|
||||
'ex_fw_mac' => \&SNMP::Info::munge_mac,
|
||||
'ps1_status_old' => \&munge_true_ok,
|
||||
'ps1_status_new' => \&munge_power_stat,
|
||||
'ps2_status_old' => \&munge_power_stat,
|
||||
'ps2_status_new' => \&munge_power_stat,
|
||||
'fan_state' => \&munge_true_ok,
|
||||
);
|
||||
|
||||
# Method OverRides
|
||||
|
||||
*SNMP::Info::Layer3::Extreme::i_duplex = \&SNMP::Info::MAU::mau_i_duplex;
|
||||
*SNMP::Info::Layer3::Extreme::i_duplex_admin = \&SNMP::Info::MAU::mau_i_duplex_admin;
|
||||
*SNMP::Info::Layer3::Extreme::i_duplex = \&SNMP::Info::MAU::mau_i_duplex;
|
||||
*SNMP::Info::Layer3::Extreme::i_duplex_admin
|
||||
= \&SNMP::Info::MAU::mau_i_duplex_admin;
|
||||
|
||||
sub model {
|
||||
my $extreme = shift;
|
||||
my $id = $extreme->id();
|
||||
|
||||
unless (defined $id){
|
||||
print " SNMP::Info::Layer3::Extreme::model() - Device does not support sysObjectID\n" if $extreme->debug();
|
||||
my $id = $extreme->id();
|
||||
|
||||
unless ( defined $id ) {
|
||||
print
|
||||
" SNMP::Info::Layer3::Extreme::model() - Device does not support sysObjectID\n"
|
||||
if $extreme->debug();
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
my $model = &SNMP::translateObj($id);
|
||||
|
||||
return $id unless defined $model;
|
||||
@@ -122,10 +131,10 @@ sub os {
|
||||
|
||||
sub os_ver {
|
||||
my $extreme = shift;
|
||||
my $descr = $extreme->description();
|
||||
my $descr = $extreme->description();
|
||||
return unless defined $descr;
|
||||
|
||||
if ($descr =~ m/Version ([\d.]*)/){
|
||||
if ( $descr =~ m/Version ([\d.]*)/ ) {
|
||||
return $1;
|
||||
}
|
||||
|
||||
@@ -139,15 +148,16 @@ sub os_ver {
|
||||
# assigned for router interfaces, so we use ifDescr
|
||||
# for those.
|
||||
sub interfaces {
|
||||
my $extreme = shift;
|
||||
my $partial = shift;
|
||||
my $i_name = $extreme->orig_i_name($partial);
|
||||
my $extreme = shift;
|
||||
my $partial = shift;
|
||||
my $i_name = $extreme->orig_i_name($partial);
|
||||
my $i_description = $extreme->orig_i_description($partial);
|
||||
my $interfaces = {};
|
||||
foreach my $idx (keys %$i_name) {
|
||||
if ($i_name->{$idx} =~ /\([0-9.]+\)/) {
|
||||
my $interfaces = {};
|
||||
foreach my $idx ( keys %$i_name ) {
|
||||
if ( $i_name->{$idx} =~ /\([0-9.]+\)/ ) {
|
||||
$interfaces->{$idx} = $i_description->{$idx};
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
$interfaces->{$idx} = $i_name->{$idx};
|
||||
}
|
||||
}
|
||||
@@ -159,12 +169,14 @@ sub interfaces {
|
||||
sub i_ignore {
|
||||
my $extreme = shift;
|
||||
my $partial = shift;
|
||||
|
||||
|
||||
my $i_description = $extreme->i_description($partial) || {};
|
||||
|
||||
my %i_ignore;
|
||||
foreach my $if (keys %$i_description) {
|
||||
if ($i_description->{$if} =~ /^(802.1Q Encapsulation Tag \d+|VLAN \d+|lo\d+)/i){
|
||||
foreach my $if ( keys %$i_description ) {
|
||||
if ( $i_description->{$if}
|
||||
=~ /^(802.1Q Encapsulation Tag \d+|VLAN \d+|lo\d+)/i )
|
||||
{
|
||||
$i_ignore{$if}++;
|
||||
}
|
||||
}
|
||||
@@ -175,11 +187,11 @@ sub i_ignore {
|
||||
# Either way, Extreme uses a 1:1 mapping of bridge interface ID to
|
||||
# ifIndex.
|
||||
sub bp_index {
|
||||
my $extreme = shift;
|
||||
my $extreme = shift;
|
||||
my $if_index = $extreme->i_index();
|
||||
|
||||
my %bp_index;
|
||||
foreach my $iid (keys %$if_index){
|
||||
foreach my $iid ( keys %$if_index ) {
|
||||
$bp_index{$iid} = $iid;
|
||||
}
|
||||
return \%bp_index;
|
||||
@@ -188,8 +200,8 @@ sub bp_index {
|
||||
sub munge_true_ok {
|
||||
my $val = shift;
|
||||
return unless defined($val);
|
||||
return "OK" if ($val eq 'true');
|
||||
return "Not OK" if ($val eq 'false');
|
||||
return "OK" if ( $val eq 'true' );
|
||||
return "Not OK" if ( $val eq 'false' );
|
||||
return $val;
|
||||
}
|
||||
|
||||
@@ -202,27 +214,27 @@ sub munge_power_stat {
|
||||
}
|
||||
|
||||
sub ps1_status {
|
||||
my $extreme = shift;
|
||||
my $extreme = shift;
|
||||
my $ps1_status = $extreme->ps1_status_new();
|
||||
return $ps1_status || $extreme->ps1_status_old();
|
||||
}
|
||||
|
||||
sub ps2_status {
|
||||
my $extreme = shift;
|
||||
my $extreme = shift;
|
||||
my $ps2_status = $extreme->ps2_status_new();
|
||||
return $ps2_status || $extreme->ps2_status_old();
|
||||
}
|
||||
|
||||
sub fan {
|
||||
my $extreme = shift;
|
||||
my $extreme = shift;
|
||||
my $fan_state = $extreme->fan_state();
|
||||
my $ret = "";
|
||||
my $s = "";
|
||||
foreach my $i (sort {$a <=> $b} keys %$fan_state) {
|
||||
my $ret = "";
|
||||
my $s = "";
|
||||
foreach my $i ( sort { $a <=> $b } keys %$fan_state ) {
|
||||
$ret .= $s . $i . ": " . $fan_state->{$i};
|
||||
$s = ", ";
|
||||
}
|
||||
return if ($s eq "");
|
||||
return if ( $s eq "" );
|
||||
return $ret;
|
||||
}
|
||||
|
||||
@@ -231,7 +243,7 @@ sub fan {
|
||||
# these tables, so we use the BRIDGE-MIB tables.
|
||||
sub fw_mac {
|
||||
my $extreme = shift;
|
||||
my $fw_mac = $extreme->ex_fw_mac;
|
||||
my $fw_mac = $extreme->ex_fw_mac;
|
||||
return $fw_mac if defined($fw_mac);
|
||||
return $extreme->orig_fw_mac();
|
||||
}
|
||||
@@ -244,7 +256,7 @@ sub fw_port {
|
||||
}
|
||||
|
||||
sub fw_status {
|
||||
my $extreme = shift;
|
||||
my $extreme = shift;
|
||||
my $fw_status = $extreme->ex_fw_status;
|
||||
return $fw_status if defined($fw_status);
|
||||
return $extreme->orig_fw_status();
|
||||
@@ -260,35 +272,38 @@ sub fw_status {
|
||||
# To represent this, we use a negative version of the
|
||||
# internal VLAN ID (the deprecated extremeVlanIfGlobalIdentifier)
|
||||
sub _if2tag {
|
||||
my $extreme = shift;
|
||||
my $partial = shift;
|
||||
my $stack = shift || $extreme->ifStackStatus($partial);
|
||||
my $encap_tag = $extreme->ex_vlan_encap_tag();
|
||||
my $extreme = shift;
|
||||
my $partial = shift;
|
||||
my $stack = shift || $extreme->ifStackStatus($partial);
|
||||
my $encap_tag = $extreme->ex_vlan_encap_tag();
|
||||
my $vlan_descr = $extreme->ex_vlan_descr();
|
||||
|
||||
my $stackmap = {};
|
||||
foreach my $idx (keys %$stack) {
|
||||
my ($higher, $lower) = split(/\./, $idx);
|
||||
foreach my $idx ( keys %$stack ) {
|
||||
my ( $higher, $lower ) = split( /\./, $idx );
|
||||
$stackmap->{$higher}->{$lower} = $stack->{$idx};
|
||||
}
|
||||
|
||||
my %if2tag = ();
|
||||
my $missed = 0;
|
||||
foreach my $if (keys %$vlan_descr) {
|
||||
foreach my $if ( keys %$vlan_descr ) {
|
||||
$if2tag{$if} = -1;
|
||||
foreach my $tagif (keys %$encap_tag) {
|
||||
if (defined($stackmap->{$if}->{$tagif}) && $stackmap->{$if}->{$tagif} eq 'active') {
|
||||
foreach my $tagif ( keys %$encap_tag ) {
|
||||
if ( defined( $stackmap->{$if}->{$tagif} )
|
||||
&& $stackmap->{$if}->{$tagif} eq 'active' )
|
||||
{
|
||||
$if2tag{$if} = $encap_tag->{$tagif};
|
||||
}
|
||||
}
|
||||
if ($if2tag{$if} == -1) {
|
||||
if ( $if2tag{$if} == -1 ) {
|
||||
$missed++;
|
||||
}
|
||||
}
|
||||
if ($missed) {
|
||||
my $global_id = $extreme->ex_vlan_global_id();
|
||||
foreach my $if (keys %if2tag) {
|
||||
$if2tag{$if} = -$global_id->{$if} if ($if2tag{$if} == -1 && defined($global_id->{$if}));
|
||||
foreach my $if ( keys %if2tag ) {
|
||||
$if2tag{$if} = -$global_id->{$if}
|
||||
if ( $if2tag{$if} == -1 && defined( $global_id->{$if} ) );
|
||||
}
|
||||
}
|
||||
return \%if2tag;
|
||||
@@ -308,23 +323,24 @@ sub v_index {
|
||||
}
|
||||
|
||||
sub i_vlan {
|
||||
my $extreme = shift;
|
||||
my $partial = shift;
|
||||
my $stack = $extreme->ifStackStatus($partial);
|
||||
my $encap_tag = $extreme->ex_vlan_encap_tag();
|
||||
my $extreme = shift;
|
||||
my $partial = shift;
|
||||
my $stack = $extreme->ifStackStatus($partial);
|
||||
my $encap_tag = $extreme->ex_vlan_encap_tag();
|
||||
my $vlan_descr = $extreme->ex_vlan_descr();
|
||||
my $stackmap = {};
|
||||
foreach my $idx (keys %$stack) {
|
||||
my ($higher, $lower) = split(/\./, $idx);
|
||||
my $stackmap = {};
|
||||
foreach my $idx ( keys %$stack ) {
|
||||
my ( $higher, $lower ) = split( /\./, $idx );
|
||||
$stackmap->{$higher}->{$lower} = $stack->{$idx};
|
||||
}
|
||||
my $if2tag = $extreme->_if2tag($partial, $stack);
|
||||
my $if2tag = $extreme->_if2tag( $partial, $stack );
|
||||
|
||||
#
|
||||
# Now that we've done all that mapping work, we can map the
|
||||
# ifStack indexes.
|
||||
my %i_vlan = ();
|
||||
foreach my $if (keys %$if2tag) {
|
||||
foreach my $lowif (keys %{$stackmap->{$if}}) {
|
||||
foreach my $if ( keys %$if2tag ) {
|
||||
foreach my $lowif ( keys %{ $stackmap->{$if} } ) {
|
||||
$i_vlan{$lowif} = $if2tag->{$if};
|
||||
}
|
||||
}
|
||||
@@ -332,31 +348,33 @@ sub i_vlan {
|
||||
}
|
||||
|
||||
sub i_vlan_membership {
|
||||
my $extreme = shift;
|
||||
my $partial = shift;
|
||||
my $stack = $extreme->ifStackStatus($partial);
|
||||
my $encap_tag = $extreme->ex_vlan_encap_tag();
|
||||
my $extreme = shift;
|
||||
my $partial = shift;
|
||||
my $stack = $extreme->ifStackStatus($partial);
|
||||
my $encap_tag = $extreme->ex_vlan_encap_tag();
|
||||
my $vlan_descr = $extreme->ex_vlan_descr();
|
||||
my $stackmap = {};
|
||||
foreach my $idx (keys %$stack) {
|
||||
my ($higher, $lower) = split(/\./, $idx);
|
||||
my $stackmap = {};
|
||||
foreach my $idx ( keys %$stack ) {
|
||||
my ( $higher, $lower ) = split( /\./, $idx );
|
||||
$stackmap->{$higher}->{$lower} = $stack->{$idx};
|
||||
}
|
||||
my $if2tag = $extreme->_if2tag($partial, $stack);
|
||||
my $if2tag = $extreme->_if2tag( $partial, $stack );
|
||||
|
||||
#
|
||||
# Now that we've done all that mapping work, we can map the
|
||||
# ifStack indexes.
|
||||
my %i_vlan_membership = ();
|
||||
foreach my $if (keys %$if2tag) {
|
||||
foreach my $lowif (keys %{$stackmap->{$if}}) {
|
||||
push(@{$i_vlan_membership{$lowif}}, $if2tag->{$if});
|
||||
foreach my $if ( keys %$if2tag ) {
|
||||
foreach my $lowif ( keys %{ $stackmap->{$if} } ) {
|
||||
push( @{ $i_vlan_membership{$lowif} }, $if2tag->{$if} );
|
||||
}
|
||||
}
|
||||
|
||||
#
|
||||
# Now add all the tagged ports.
|
||||
foreach my $if (keys %$encap_tag) {
|
||||
foreach my $lowif (keys %{$stackmap->{$if}}) {
|
||||
push(@{$i_vlan_membership{$lowif}}, $encap_tag->{$if});
|
||||
foreach my $if ( keys %$encap_tag ) {
|
||||
foreach my $lowif ( keys %{ $stackmap->{$if} } ) {
|
||||
push( @{ $i_vlan_membership{$lowif} }, $encap_tag->{$if} );
|
||||
}
|
||||
}
|
||||
return \%i_vlan_membership;
|
||||
@@ -368,12 +386,12 @@ sub i_vlan_membership {
|
||||
|
||||
sub set_i_vlan {
|
||||
my $extreme = shift;
|
||||
return $extreme->_extreme_set_i_vlan(0, @_);
|
||||
return $extreme->_extreme_set_i_vlan( 0, @_ );
|
||||
}
|
||||
|
||||
sub set_i_pvid {
|
||||
my $extreme = shift;
|
||||
return $extreme->_extreme_set_i_vlan(1, @_);
|
||||
return $extreme->_extreme_set_i_vlan( 1, @_ );
|
||||
}
|
||||
|
||||
# set_i_vlan implicitly turns off any encapsulation
|
||||
@@ -384,98 +402,127 @@ sub set_i_pvid {
|
||||
# off any encapsulation.
|
||||
sub _extreme_set_i_vlan {
|
||||
my $extreme = shift;
|
||||
my ($is_pvid, $vlan_id, $ifindex) = @_;
|
||||
my ( $is_pvid, $vlan_id, $ifindex ) = @_;
|
||||
my $encap_tag = $extreme->ex_vlan_encap_tag();
|
||||
|
||||
# The inverted stack MIB would make this easier, since
|
||||
# we need to find the vlan interface
|
||||
# that's stacked above $ifindex.
|
||||
my $cur_stack = $extreme->ifStackStatus();
|
||||
|
||||
#
|
||||
# create inverted stack
|
||||
my $invstack;
|
||||
foreach my $idx (keys %$cur_stack) {
|
||||
my ($higher, $lower) = split(/\./, $idx);
|
||||
foreach my $idx ( keys %$cur_stack ) {
|
||||
my ( $higher, $lower ) = split( /\./, $idx );
|
||||
$invstack->{$lower}->{$higher} = $cur_stack->{$idx};
|
||||
}
|
||||
|
||||
# create vlan tag -> encap interface map
|
||||
my %encapif = reverse %$encap_tag;
|
||||
|
||||
# now find encap interface from tag
|
||||
my $encapidx = $encapif{$vlan_id};
|
||||
if (!defined($encapidx)) {
|
||||
$extreme->error_throw("can't map $vlan_id to encapsulation interface");
|
||||
if ( !defined($encapidx) ) {
|
||||
$extreme->error_throw(
|
||||
"can't map $vlan_id to encapsulation interface");
|
||||
return;
|
||||
}
|
||||
|
||||
# now find vlan interface stacked above encap
|
||||
my @abovevlan = keys %{$invstack->{$encapidx}};
|
||||
if (@abovevlan != 1) {
|
||||
$extreme->error_throw("can't map encap interface $encapidx for $vlan_id to encapsulation interface");
|
||||
my @abovevlan = keys %{ $invstack->{$encapidx} };
|
||||
if ( @abovevlan != 1 ) {
|
||||
$extreme->error_throw(
|
||||
"can't map encap interface $encapidx for $vlan_id to encapsulation interface"
|
||||
);
|
||||
return;
|
||||
}
|
||||
my $vlanidx = $abovevlan[0];
|
||||
my $rv;
|
||||
|
||||
# Delete old VLAN mapping
|
||||
foreach my $oldidx (keys %{$invstack->{$ifindex}}) {
|
||||
if ($is_pvid && defined($encap_tag->{$oldidx})) {
|
||||
next; # Don't delete tagged mappings
|
||||
foreach my $oldidx ( keys %{ $invstack->{$ifindex} } ) {
|
||||
if ( $is_pvid && defined( $encap_tag->{$oldidx} ) ) {
|
||||
next; # Don't delete tagged mappings
|
||||
}
|
||||
$rv = $extreme->set_ifStackStatus("destroy", $oldidx . "." . $ifindex);
|
||||
$rv = $extreme->set_ifStackStatus( "destroy",
|
||||
$oldidx . "." . $ifindex );
|
||||
unless ($rv) {
|
||||
$extreme->error_throw("Unable to remove $ifindex from old VLAN index $oldidx");
|
||||
$extreme->error_throw(
|
||||
"Unable to remove $ifindex from old VLAN index $oldidx");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
# Add new VLAN mapping
|
||||
$rv = $extreme->set_ifStackStatus("createAndGo", $vlanidx . "." . $ifindex);
|
||||
$rv = $extreme->set_ifStackStatus( "createAndGo",
|
||||
$vlanidx . "." . $ifindex );
|
||||
unless ($rv) {
|
||||
$extreme->error_throw("Unable to add new VLAN index $vlanidx to ifIndex $ifindex");
|
||||
$extreme->error_throw(
|
||||
"Unable to add new VLAN index $vlanidx to ifIndex $ifindex");
|
||||
return;
|
||||
}
|
||||
# XXX invalidate cache of ifstack?
|
||||
# XXX Info.pm library function for this?
|
||||
# XXX set_ should do invalidation?
|
||||
# $store = $extreme->store(); delete $store->{ifStackStatus}; $extreme->store($store);
|
||||
# $extreme->{_ifStackStatus} = 0;
|
||||
|
||||
# XXX invalidate cache of ifstack?
|
||||
# XXX Info.pm library function for this?
|
||||
# XXX set_ should do invalidation?
|
||||
# $store = $extreme->store(); delete $store->{ifStackStatus}; $extreme->store($store);
|
||||
# $extreme->{_ifStackStatus} = 0;
|
||||
return $rv;
|
||||
}
|
||||
|
||||
sub set_remove_i_vlan_tagged {
|
||||
my $extreme = shift;
|
||||
my ($vlan_id, $ifindex) = @_;
|
||||
my ( $vlan_id, $ifindex ) = @_;
|
||||
my $encap_tag = $extreme->ex_vlan_encap_tag();
|
||||
|
||||
# create vlan tag -> encap interface map
|
||||
my %encapif = reverse %$encap_tag;
|
||||
|
||||
# now find encap interface from tag
|
||||
my $encapidx = $encapif{$vlan_id};
|
||||
if (!defined($encapidx)) {
|
||||
$extreme->error_throw("can't map $vlan_id to encapsulation interface");
|
||||
if ( !defined($encapidx) ) {
|
||||
$extreme->error_throw(
|
||||
"can't map $vlan_id to encapsulation interface");
|
||||
return;
|
||||
}
|
||||
my $rv = $extreme->set_ifStackStatus("destroy", $encapidx . "." . $ifindex);
|
||||
my $rv = $extreme->set_ifStackStatus( "destroy",
|
||||
$encapidx . "." . $ifindex );
|
||||
unless ($rv) {
|
||||
$extreme->error_throw("Unable to delete VLAN encap ifIndex $encapidx for VLAN $vlan_id from ifIndex $ifindex");
|
||||
$extreme->error_throw(
|
||||
"Unable to delete VLAN encap ifIndex $encapidx for VLAN $vlan_id from ifIndex $ifindex"
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
# invalidate cache of ifstack?
|
||||
return $rv;
|
||||
}
|
||||
|
||||
sub set_add_i_vlan_tagged {
|
||||
my $extreme = shift;
|
||||
my ($vlan_id, $ifindex) = @_;
|
||||
my ( $vlan_id, $ifindex ) = @_;
|
||||
my $encap_tag = $extreme->ex_vlan_encap_tag();
|
||||
|
||||
# create vlan tag -> encap interface map
|
||||
my %encapif = reverse %$encap_tag;
|
||||
|
||||
# now find encap interface from tag
|
||||
my $encapidx = $encapif{$vlan_id};
|
||||
if (!defined($encapidx)) {
|
||||
$extreme->error_throw("can't map $vlan_id to encapsulation interface");
|
||||
if ( !defined($encapidx) ) {
|
||||
$extreme->error_throw(
|
||||
"can't map $vlan_id to encapsulation interface");
|
||||
return;
|
||||
}
|
||||
my $rv = $extreme->set_ifStackStatus("createAndGo", $encapidx . "." . $ifindex);
|
||||
my $rv = $extreme->set_ifStackStatus( "createAndGo",
|
||||
$encapidx . "." . $ifindex );
|
||||
unless ($rv) {
|
||||
$extreme->error_throw("Unable to add VLAN encap ifIndex $encapidx for VLAN $vlan_id to ifIndex $ifindex");
|
||||
$extreme->error_throw(
|
||||
"Unable to add VLAN encap ifIndex $encapidx for VLAN $vlan_id to ifIndex $ifindex"
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
# invalidate cache of ifstack?
|
||||
return $rv;
|
||||
}
|
||||
@@ -698,8 +745,8 @@ Returns VLAN names
|
||||
Returns reference to hash of bridge port table entries map back to interface
|
||||
identifier (iid)
|
||||
|
||||
Returns (C<ifIndex>) for both key and value since we're using F<EXTREME-FDB-MIB>
|
||||
rather than F<BRIDGE-MIB>.
|
||||
Returns (C<ifIndex>) for both key and value since we're using
|
||||
F<EXTREME-FDB-MIB> rather than F<BRIDGE-MIB>.
|
||||
|
||||
=back
|
||||
|
||||
|
||||
Reference in New Issue
Block a user