Changeset 64 for trunk

Timestamp:

Sep 8, 2009, 4:55:39 PM (15 years ago)

Author:

g7moreau

Message:

• Change Class Filehandle by FileHandle?
• Change one regular expression. Suppres /x, why ?
• Change numerical_port function to tale acocunt of HP2424 switch

File:

• trunk/klask (modified) (5 diffs)

trunk/klask

@@ -10 +10 @@
 
 use Readonly;
-use Filehandle;
+use FileHandle;
 use Net::SNMP;
 #use YAML;
@@ -144 +144 @@
    my $cmd = shift;
 
-   my $fh = new Filehandle;
+   my $fh     = new FileHandle;
+   my $result = '';
    open $fh, q{-|}, "$cmd" or die "Can't exec $cmd\n";
-   my $result = <$fh>;
+   $result .= <$fh>;
    close $fh;
    chomp $result;
@@ -234 +235 @@
 
    for my $sw_kind (keys %SWITCH_KIND) {
-      next if not $sw_snmp_description =~ m/$SWITCH_KIND{$sw_kind}->{match}/xms;
+      next if not $sw_snmp_description =~ m/$SWITCH_KIND{$sw_kind}->{match}/ms; # option xms break search, why ?
 
       return $SWITCH_KIND{$sw_kind}->{model};
@@ -481 +482 @@
    my $sw_port  = shift;
 
-   return $sw_port if not $sw_model eq 'HP8000M';
-
-   my $reste = (($sw_port - 1) % 8) + 1;
-   my $major = int (($sw_port - 1) / 8);
-
-   return "$INTERNAL_PORT_MAP{$major}$reste";
+   if ($sw_model eq 'HP8000M') {
+
+      my $reste = (($sw_port - 1) % 8) + 1;
+      my $major = int (($sw_port - 1) / 8);
+      return "$INTERNAL_PORT_MAP{$major}$reste";
+      }
+
+   if ($sw_model eq 'HP2424M') {
+      if ($sw_port > 24) {
+         
+         my $reste = $sw_port - 24;
+         return "A$reste";
+         }
+      }
+
+   if ($sw_model eq 'HP1600M') {
+      if ($sw_port > 16) {
+         
+         my $reste = $sw_port - 16;
+         return "A$reste";
+         }
+      }
+
+   return $sw_port;
    }
 
@@ -493 +512 @@
    my $sw_port  = shift;
 
-   return $sw_port if not $sw_model eq 'HP8000';
-
-   my $letter = substr $sw_port, 0, 1;
-
-#   return $port if $letter =~ m/\d/;
-
-   my $reste =  substr $sw_port, 1;
-
-   return $INTERNAL_PORT_MAP_REV{$letter} * 8 + $reste;
+   if ($sw_model eq 'HP8000M') {
+
+      my $letter = substr $sw_port, 0, 1;
+      my $reste =  substr $sw_port, 1;
+
+      return $INTERNAL_PORT_MAP_REV{$letter} * 8 + $reste;
+      }
+
+   if ($sw_model eq 'HP2424M') {
+      if ($sw_port =~ m/^A/xms ) {
+
+         my $reste =  substr $sw_port, 1;
+
+         return 24 + $reste;
+         }
+      }
+
+   if ($sw_model eq 'HP1600M') {
+      if ($sw_port =~ m/^A/xms ) {
+
+         my $reste =  substr $sw_port, 1;
+
+         return 16 + $reste;
+         }
+      }
+
+   return $sw_port;
    }