Changeset 240

Timestamp:

Sep 7, 2017, 5:18:53 PM (7 years ago)

Author:

g7moreau

Message:

• Begin Aggregator port support

File:

• trunk/klask (modified) (3 diffs)

trunk/klask

@@ -179 +179 @@
    poeState        => '1.3.6.1.2.1.105.1.1.1.3.1',    # 1.3.6.1.2.1.105.1.1.1.3.1.NoPort = 1 (poe up)  = 2 (poe down) - Cisco and Zyxel
    NApoeState      => '1.3.6.1.4.1.266.20.3.1.1.21',  # .NoPort = 2 (poe off)  = 8 (poe atHighPower) - Nexans
+   ifAggregator    => '1.2.840.10006.300.43.1.2.1.1.12', # dot3adAggPortSelectedAggID - 0 not part of an  Aggregator - Ciso Dell HP Comware -  See https://stackoverflow.com/questions/14960157/how-to-map-portchannel-to-interfaces-via-snmp https://gist.github.com/bldewolf/6314435
    );
 
@@ -812 +813 @@
    my $swport_hr = $swport;
    $swport_hr = normalize_port_human_readable($result_hr->{$research_hr}) if defined $result_hr;
+
+   # Aggregator port
+   if ($swport_hr =~ m/^(Trk|Br|Po)/) {
+      my $research_index = $OID_NUMBER{ifAggregator}; # base OID
+      my @args = ( -varbindlist =>  [$research_index]);
+      LOOP_ON_OID_PORT:
+      while ( defined $snmp_session->get_next_request(@args) ) {
+         my ($oid_current) = $snmp_session->var_bind_names;
+         last LOOP_ON_OID_PORT if  not Net::SNMP::oid_base_match($research_index, $oid_current);
+
+         # IEEE8023-LAG-MIB::dot3adAggPortSelectedAggID.28 = INTEGER: 337
+         # IEEE8023-LAG-MIB::dot3adAggPortAttachedAggID.28 = INTEGER: 337
+         my $port_aggregator = $snmp_session->var_bind_list->{$oid_current};
+         my ($port_index) = reverse split /\./, $oid_current; # last number
+
+         # prepare next loop item
+         @args = (-varbindlist => [$oid_current]);
+
+         next LOOP_ON_OID_PORT if $port_aggregator == 0;
+         next LOOP_ON_OID_PORT if not $port_aggregator == $swport;
+
+         my $port_name = snmp_get_switchport_hr($snmp_session, $port_index);
+         $swport_hr .= ":$port_name";
+         }
+      }
    return $swport_hr;
    }
@@ -819 +845 @@
 sub snmp_get_switchport_num {
    my ($snmp_session, $swport_hr, $verbose) = @_;
+
+   # Split for Aggregator port
+   ($swport_hr) = split /:/, $swport_hr;
 
    my $swport_num = $swport_hr;