From 508e7f77a09beab9dc088dbaac83b49d2d5fa7f4 Mon Sep 17 00:00:00 2001
From: "Eric A. Miller" <emiller@cpan.org>
Date: Tue, 19 Jan 2016 23:24:00 -0500
Subject: [PATCH] Add support for channelized interfaces in L3::Passport.

Channelized interfaces are 40G or 100G ports split into multiple 10G sub ports, reported as Slot.Port.Sub-Port.  Note: Currently ifDescr reports the interface correctly as Slot/Port/Sub-Port on channelized interfaces but ifName misreports as just Slot/Port.
---
 ChangeLog               |  1 +
 Info/Layer3/Passport.pm | 24 ++++++++++++++++--------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2b8078bc..7891c9dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@ version 3.31 ()
 
   * Support for CiscoSB OS and Version (D. Tuecks)
   * SONMP support for Enhanced Topology Table
+  * Add support for channelized interfaces in L3::Passport
 
   [BUG FIXES]
 
diff --git a/Info/Layer3/Passport.pm b/Info/Layer3/Passport.pm
index 8c2cfc5a..faca9aa2 100644
--- a/Info/Layer3/Passport.pm
+++ b/Info/Layer3/Passport.pm
@@ -1,6 +1,6 @@
 # SNMP::Info::Layer3::Passport
 #
-# Copyright (c) 2012 Eric Miller
+# Copyright (c) 2016 Eric Miller
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -174,6 +174,7 @@ sub interfaces {
     my $partial  = shift;
 
     my $i_index      = $passport->i_index($partial);
+    my $i_descr      = $passport->orig_i_description($partial) || {};
     my $model        = $passport->model();
     my $index_factor = $passport->index_factor();
     my $port_offset  = $passport->port_offset();
@@ -203,7 +204,7 @@ sub interfaces {
             $if{$index} = 'Cpu.Virtual';
         }
 
-        elsif ( ( $iid == 64 ) and ( $model =~ /^VSP[48]/ ) ) {
+        elsif ( ( $iid == 64 ) and ( $model =~ /^VSP[478]/ ) ) {
             $if{$index} = 'Mgmt.1';
         }
 
@@ -231,11 +232,18 @@ sub interfaces {
         }
 
         else {
-            my $port = ( $index % $index_factor ) + $port_offset;
-            my $slot = int( $index / $index_factor ) + $slot_offset;
+            if ($model =~ /VSP/ and $i_descr->{$iid} and $i_descr->{$iid} =~ m<Port\s+(\d+(?:/\d+)*)>) {
+                my $ps = $1;
+                $ps =~ s|/|.|g;
+                $if{$iid} = $ps;
+            }
+            else {
+                my $port = ( $index % $index_factor ) + $port_offset;
+                my $slot = int( $index / $index_factor ) + $slot_offset;
 
-            my $slotport = "$slot.$port";
-            $if{$iid} = $slotport;
+                my $slotport = "$slot.$port";
+                $if{$iid} = $slotport;
+            }
         }
 
     }
@@ -388,7 +396,7 @@ sub i_name {
             $i_name{$iid} = 'CPU Virtual Management IP';
         }
 
-        elsif ( ( $iid == 64 ) and ( $model =~ /^VSP[48]/ ) ) {
+        elsif ( ( $iid == 64 ) and ( $model =~ /^VSP[478]/ ) ) {
             $i_name{$iid} = 'Mgmt Port';
         }
 
@@ -591,7 +599,7 @@ sub slot_offset {
     my $model        = $passport->model();
     # Newer VSP 4K and 8K start at an index of 192 ~ slot 3 but really slot 1
     return -2
-        if ( defined $model and $model =~ /^VSP[48]/ );
+        if ( defined $model and $model =~ /^VSP[478]/ );
 
     return 0;
 }