Changeset 214

Timestamp:

Feb 18, 2017, 2:21:46 PM (7 years ago)

Author:

g7moreau

Message:

• Normalize human readable port

File:

• trunk/klask (modified) (7 diffs)

trunk/klask

@@ -744 +744 @@
    }
 
-sub get_port_human_readable_short {
+sub normalize_port_human_readable {
    my $sw_port_hr  = shift;
 
+   # Manufacturer abbreviation
    $sw_port_hr =~ s/^Bridge-Aggregation/Br/i;
    $sw_port_hr =~ s/^Port-Channel/Po/i;
@@ -754 +755 @@
    $sw_port_hr =~ s/^FastEthernet/Fa/i;
 
+   # Customer abbreviation
+   $sw_port_hr =~ s/^Ten/Te/i;
+   $sw_port_hr =~ s/^Giga/Gi/i;
+
    return $sw_port_hr;
    }
@@ -772 +777 @@
       );
    my $swport_hr = $swport;
-   $swport_hr = get_port_human_readable_short($result_hr->{$research_hr}) if defined $result_hr;
+   $swport_hr = normalize_port_human_readable($result_hr->{$research_hr}) if defined $result_hr;
    return $swport_hr;
    }
@@ -801 +806 @@
       next LOOP_OID_PORT if not defined $result;
       
-      my $current_port_hr = get_port_human_readable_short($result->{$oid_ifName});
+      my $current_port_hr = normalize_port_human_readable($result->{$oid_ifName});
       printf "PORT2: $oid_ifName => $current_port_hr\n" if $verbose;
-      if ( $current_port_hr =~ m/^$swport_hr$/i ) {
-         print "PORT3: $current_port_hr <-> $swport_hr\n" if $verbose;
+      if ($current_port_hr eq $swport_hr) {
+         print "PORT3: $current_port_hr <-> $port_index\n" if $verbose;
          $swport_num = $port_index;
          last LOOP_OID_PORT;
@@ -817 +822 @@
 #      my ($oid_current) = $snmp_session->var_bind_names;
 #      last if not Net::SNMP::oid_base_match($research_index, $oid_current);
-#      my $current_port_hr = get_port_human_readable_short($snmp_session->var_bind_list->{$oid_current});
+#      my $current_port_hr = normalize_port_human_readable($snmp_session->var_bind_list->{$oid_current});
  #     printf "%s => %s\n", $oid_current, $current_port_hr;  # if $verbose;
 #      if ( $current_port_hr =~ m/$swport_hr/i ) {
@@ -839 +844 @@
 #      );
 #   my $swport_hr = $swport;
-#   $swport_hr = get_port_human_readable_short($result_hr->{$research_hr}) if defined $result_hr;
+#   $swport_hr = normalize_port_human_readable($result_hr->{$research_hr}) if defined $result_hr;
 #   return $swport_hr;
 #   }
@@ -2138 +2143 @@
 
    # Retrieve numeric port value
-   my $port_num = snmp_get_switchport_num($session, $port, $verbose ? 'yes' : '');
+   my $port_num = snmp_get_switchport_num($session, normalize_port_human_readable($port), $verbose ? 'yes' : '');
    die "Error : Port $port not exist on switch $switch_name\n" if $port_num =~ m/^\d+$/;