Changeset 124 for trunk/klask

Timestamp:

Apr 21, 2013, 10:56:00 AM (12 years ago)

Author:

g7moreau

Message:

• I think double OID search is now OK !

File:

• trunk/klask (modified) (4 diffs)

trunk/klask

@@ -348 +348 @@
 
       my $result = $session->get_request(
-         -varbindlist => [$research1, $research2]
+         -varbindlist => [$research1]
          );
-      if (not(defined $result and ($result->{$research1} ne 'noSuchInstance' or $result->{$research2} ne 'noSuchInstance'))) {
+      if (not defined $result) {
+         $result = $session->get_request(
+            -varbindlist => [$research2]
+            );
+         $result->{$research1} = $result->{$research2} if defined $result;
+         }
+
+      if (not (defined $result and $result->{$research1} ne 'noSuchInstance')) {
          $session->close;
          next LOOP_ON_SWITCH;
@@ -356 +363 @@
 
          my $swport = $result->{$research1};
-         $swport = $result->{$research2} if $result->{$research1} eq 'noSuchInstance';
          $session->close;
 
@@ -409 +415 @@
 
       my $result = $session->get_request(
-         -varbindlist => [$research1, $research2]
+         -varbindlist => [$research1]
          );
-
-      if(defined $result and ($result->{$research1} ne 'noSuchInstance' or $result->{$research2} ne 'noSuchInstance')){
+      if (not defined $result) {
+         $result = $session->get_request(
+            -varbindlist => [$research2]
+            );
+         $result->{$research1} = $result->{$research2} if defined $result;
+         }
+
+      if (defined $result and $result->{$research1} ne 'noSuchInstance') {
          my $swport = $result->{$research1};
-         $swport = $result->{$research2} if $result->{$research1} eq 'noSuchInstance';
 
          $ret->{$sw->{hostname}} = {};
@@ -1524 +1535 @@
 
       my $result = $session->get_request(
-         -varbindlist => [$research1, $research2]
+         -varbindlist => [$research1]
          );
-
-      if (defined $result and ($result->{$research1} ne 'noSuchInstance' or $result->{$research2} ne 'noSuchInstance')) {
+      if (not defined $result) {
+         $result = $session->get_request(
+            -varbindlist => [$research2]
+            );
+         $result->{$research1} = $result->{$research2} if defined $result;
+         }
+
+      if (defined $result and $result->{$research1} ne 'noSuchInstance') {
          my $swport = $result->{$research1};
-         $swport = $result->{$research2} if $result->{$research1} eq 'noSuchInstance';
          print "Klask find MAC $mac_address on switch $sw_name port $swport\n";
          }