Changeset 122

Timestamp:

Apr 21, 2013, 10:23:07 AM (11 years ago)

Author:

g7moreau

Message:

• Error in test. Need to be improve !

File:

• trunk/klask (modified) (3 diffs)

trunk/klask

@@ -97 +97 @@
    J4903A => { model => 'HP2824',     match => 'J4903A.+?Switch 2824,'           },
    J4110A => { model => 'HP8000M',    match => 'HP J4110A ProCurve Switch 8000M' },
-   JD374A => { model => 'HP5500-24F', match => 'HP Comware.+?A5500-24G-SFP EI',    mibflag => 2  },
+   JD374A => { model => 'HP5500-24F', match => 'HP Comware.+?A5500-24G-SFP EI'   },
    BS350T => { model => 'BS350T',     match => 'BayStack 350T HW'                },
    N3483G => { model => 'NA3483-6G',  match => 'GigaSwitch V3 TP SFP-I 48V ES3'  },
@@ -350 +350 @@
          -varbindlist => [$research1, $research2]
          );
-      if (not defined $result or $result->{$research1} eq 'noSuchInstance' or $result->{$research2} eq 'noSuchInstance') {
+      if (not(defined $result and ($result->{$research1} ne 'noSuchInstance' or $result->{$research2} ne 'noSuchInstance'))) {
          $session->close;
          next LOOP_ON_SWITCH;
@@ -1526 +1526 @@
          );
 
-      if (not defined $result or $result->{$research1} eq 'noSuchInstance' or $result->{$research2} eq 'noSuchInstance') {
+      if (not(defined $result and ($result->{$research1} ne 'noSuchInstance' or $result->{$research2} ne 'noSuchInstance'))) {
          print "Klask do not find MAC $mac_address on switch $sw_name\n";
          $session->close;