Changeset 244 for trunk/klask

Timestamp:

Sep 7, 2017, 10:53:00 PM (7 years ago)

Author:

g7moreau

Message:

• Small code cleanning

File:

• trunk/klask (modified) (9 diffs)

trunk/klask

@@ -507 +507 @@
 
       my $swport_num = $result->{$research1};
-      my $swport_hr = get_human_readable_port($sw->{model}, snmp_get_switchport_hr($session, $swport_num));
+      my $swport_hr = get_human_readable_port($sw->{model}, snmp_get_switchport_num2hr($session, $swport_num));
 
       $session->close;
@@ -563 +563 @@
       if (defined $result and $result->{$research1} ne 'noSuchInstance') {
          my $swport_num = $result->{$research1};
-         my $swport_hr = get_human_readable_port($sw->{model}, snmp_get_switchport_hr($session, $swport_num));
+         my $swport_hr = get_human_readable_port($sw->{model}, snmp_get_switchport_num2hr($session, $swport_num));
 
          SWITCH_PORT_IGNORE:
@@ -799 +799 @@
 
 #---------------------------------------------------------------
-sub snmp_get_switchport_hr {
-   my ($snmp_session, $swport_num, $flag) = @_;
+sub snmp_get_switchport_num2hr {
+   my ($snmp_session, $swport_num) = @_;
 
    # On H3C, port number and port index are not the same
    # Double SNMP request to get the name
-   $flag ||= 'distinct';
+
+   my $research_index = $OID_NUMBER{ifIndex} .'.'. $swport_num;
+   my $result_index = $snmp_session->get_request(
+      -varbindlist => [$research_index]
+      );
+
    my $swport_index = $swport_num;
-
-   if ($flag eq 'distinct') {
-      my $research_index = $OID_NUMBER{ifIndex} .'.'. $swport_num;
-      my $result_index = $snmp_session->get_request(
-         -varbindlist => [$research_index]
-         );
-      $swport_index = $result_index->{$research_index} if defined $result_index;
-      }
+   $swport_index = $result_index->{$research_index} if defined $result_index;
+
+   return snmp_get_switchport_index2hr($snmp_session, $swport_index);
+   }
+
+#---------------------------------------------------------------
+sub snmp_get_switchport_index2hr {
+   my ($snmp_session, $swport_index) = @_;
 
    my $research_hr = $OID_NUMBER{ifName} .'.'. $swport_index;
@@ -842 +847 @@
          next LOOP_ON_OID_PORT if not $port_aggregator_index == $swport_index;
 
-         my $current_port_name = snmp_get_switchport_hr($snmp_session, $current_port_index, 'index');
+         my $current_port_name = snmp_get_switchport_index2hr($snmp_session, $current_port_index);
          $swport_hr .= ":$current_port_name";
          }
@@ -851 +856 @@
 #---------------------------------------------------------------
 # Reverse search port number
-sub snmp_get_switchport_num {
+sub snmp_get_switchport_hr2num {
    my ($snmp_session, $swport_hr, $verbose) = @_;
 
@@ -2324 +2329 @@
 
    # Retrieve numeric port value
-   my $port_num = snmp_get_switchport_num($session, normalize_port_human_readable($port), $verbose ? 'yes' : '');
+   my $port_num = snmp_get_switchport_hr2num($session, normalize_port_human_readable($port), $verbose ? 'yes' : '');
    die "Error : Port $port does not exist on switch $switch_name\n" if not $port_num =~ m/^\d+$/;
 
@@ -2369 +2374 @@
 
    # Retrieve numeric port value
-   my $port_num = snmp_get_switchport_num($session, normalize_port_human_readable($port), $verbose ? 'yes' : '');
+   my $port_num = snmp_get_switchport_hr2num($session, normalize_port_human_readable($port), $verbose ? 'yes' : '');
    die "Error : Port $port does not exist on switch $switch_name\n" if not $port_num =~ m/^\d+$/;
 
@@ -2412 +2417 @@
 
    # Retrieve numeric port value
-   my $port_num = snmp_get_switchport_num($session, normalize_port_human_readable($port), $verbose ? 'yes' : '');
+   my $port_num = snmp_get_switchport_hr2num($session, normalize_port_human_readable($port), $verbose ? 'yes' : '');
    die "Error : Port $port does not exist on switch $switch_name\n" if not $port_num =~ m/^\d+$/;
 
@@ -2480 +2485 @@
       if (defined $result and $result->{$research1} ne 'noSuchInstance') {
          my $swport_num = $result->{$research1};
-         my $swport_hr = get_human_readable_port($sw->{model}, snmp_get_switchport_hr($session, $swport_num));
+         my $swport_hr = get_human_readable_port($sw->{model}, snmp_get_switchport_num2hr($session, $swport_num));
          print "Klask find MAC $mac_address on switch $sw_name port $swport_hr\n";
          }