Changeset 154

Timestamp:

Jun 8, 2016, 7:47:21 PM (8 years ago)

Author:

g7moreau

Message:

• Push switch human readable patch on switch table

File:

• trunk/klask (modified) (11 diffs)

trunk/klask

@@ -425 +425 @@
 
       my $swport = $result->{$research1};
-
-      my $research_hr = $OID_NUMBER{ifName} .'.'. $swport;
-      $result = $session->get_request(
-         -varbindlist => [$research_hr]
-         );
-      my $swport_hr = $swport;
-      $swport_hr = get_port_human_readable_short($result->{$research_hr}) if defined $result;
+      my $swport_hr = snmp_get_swithport_hr($session, $swport);
 
       $session->close;
@@ -467 +461 @@
    return $ret if $mac_address eq 'unknow';
 
-#   for my $sw (@SWITCH) {
-#      next if exists $SWITCH_PORT_COUNT{$sw->{hostname}};
-#
-#      $SWITCH_PORT_COUNT{$sw->{hostname}} = {};
-#      print "DEBUG: SWITCH_PORT_COUNT defined for $sw->{hostname}\n" if $DEBUG xor 2;
-#      }
-
    my $research1 = $OID_NUMBER{searchPort1} . mac_address_hex_to_dec($mac_address);
    my $research2 = $OID_NUMBER{searchPort2} .'.'. $vlan_id . mac_address_hex_to_dec($mac_address);
@@ -493 +480 @@
       if (defined $result and $result->{$research1} ne 'noSuchInstance') {
          my $swport = $result->{$research1};
+         my $swport_hr = snmp_get_swithport_hr($session, $swport);
 
          $ret->{$sw->{hostname}} = {};
@@ -498 +486 @@
          $ret->{$sw->{hostname}}{description} = $sw->{description};
          $ret->{$sw->{hostname}}{port}        = get_human_readable_port($sw->{model}, $swport);
+         $ret->{$sw->{hostname}}{port_hr}     = $swport_hr;
 
 #         $SWITCH_PORT_COUNT{$sw->{hostname}}->{$swport}++;
@@ -679 +668 @@
 
    return $sw_port_hr;
+   }
+
+sub snmp_get_swithport_hr {
+   my ($snmp_session, $swport) = @_;
+   
+   my $research_hr = $OID_NUMBER{ifName} .'.'. $swport;
+   $result = $snmp_session->get_request(
+      -varbindlist => [$research_hr]
+      );
+   my $swport_hr = $swport;
+   $swport_hr = get_port_human_readable_short($result->{$research_hr}) if defined $result;
+   return $swport_hr;
    }
 
@@ -1323 +1324 @@
       my $mac_sort = sprintf '%04i-%s', 9999, $mac_address;
 
-      my ( $host_short ) = sprintf '%s %3s' , split(m/ \. /xms, $db_switch_parent{$sw}->{switch}, 1), $db_switch_parent{$sw}->{port};
+      my ( $host_short ) = sprintf '%s %3s' , split(m/ \. /xms, $db_switch_parent{$sw}->{switch}, 1), $db_switch_parent{$sw}->{port_hr};
 
       print <<"END_HTML";
@@ -1329 +1330 @@
    <td sorttable_customkey="$switch_hostname_sort">$sw</td>
    <td class="bklask-port">$db_switch_output_port{$sw}</>
-   <td>+--> $db_switch_parent{$sw}->{port}</td>
+   <td>+--> $db_switch_parent{$sw}->{port_hr}</td>
    <td sorttable_customkey="$host_short">$db_switch_parent{$sw}->{switch}</>
    <td sorttable_customkey="$ip_sort">$ipv4_address</td>
@@ -2002 +2003 @@
          next ALL_SWITCH_CONNECTED if $switch->{port} eq '0';
 
-         $db_switch_output_port{$switch->{hostname}} = $switch->{port};
-         print "VERBOSE_2: output port $switch->{hostname} : $switch->{port}\n" if $verbose;
+         $db_switch_output_port{$switch->{hostname}} = $switch->{port_hr};
+         print "VERBOSE_2: output port $switch->{hostname} : $switch->{port_hr}\n" if $verbose;
          }
       }
@@ -2055 +2056 @@
 
          my $switch = $where{$ip}->{$switch_detected};
-         print "VERBOSE_6: $db_switch_ip_hostnamefq{$ip} -> $switch->{hostname} : $switch->{port}\n" if $verbose;
+         print "VERBOSE_6: $db_switch_ip_hostnamefq{$ip} -> $switch->{hostname} : $switch->{port_hr}\n" if $verbose;
 
          next if $switch->{port}     eq '0';
-         next if $switch->{port}     eq $db_switch_output_port{$switch->{hostname}};
+         next if $switch->{port_hr}  eq $db_switch_output_port{$switch->{hostname}};
          next if $switch->{hostname} eq $db_switch_ip_hostnamefq{$ip}; # $computerdb->{$ip}{hostname};
 
@@ -2131 +2132 @@
    for my $sw (sort keys %db_switch_output_port) {
       if (exists $db_switch_parent{$sw}) {
-         printf "%-28s  %2s  +-->  %2s  %-25s\n", $sw, $db_switch_output_port{$sw}, $db_switch_parent{$sw}->{port}, $db_switch_parent{$sw}->{switch};
+         printf "%-28s  %2s  +-->  %2s  %-25s\n", $sw, $db_switch_output_port{$sw}, $db_switch_parent{$sw}->{port_hr}, $db_switch_parent{$sw}->{switch};
          }
       else {
@@ -2199 +2200 @@
    for my $sw (sort keys %db_switch_output_port) {
       if (exists $db_switch_parent{$sw}) {
-         printf "%-28s  %2s  +-->  %2s  %-25s\n", $sw, $db_switch_output_port{$sw}, $db_switch_parent{$sw}->{port}, $db_switch_parent{$sw}->{switch};
+         printf "%-28s  %2s  +-->  %2s  %-25s\n", $sw, $db_switch_output_port{$sw}, $db_switch_parent{$sw}->{port_hr}, $db_switch_parent{$sw}->{switch};
          }
       else {