Changeset 118

Timestamp:

Apr 5, 2013, 2:34:31 PM (12 years ago)

Author:

g7moreau

Message:

• Add nexans micro swicth
• Regex variable for float computer

File:

• trunk/klask (modified) (9 diffs)

trunk/klask

@@ -94 +94 @@
    J9021A => { model => 'HP2810-24G', match => 'ProCurve J9021A Switch 2810-24G' },
    J9022A => { model => 'HP2810-48G', match => 'ProCurve J9022A Switch 2810-48G' },
+   J8692A => { model => 'HP3500-24G', match => 'ProCurve J8692A Switch 3500yl-24G' },
    J4903A => { model => 'HP2824',     match => 'J4903A.+?Switch 2824,'           },
    J4110A => { model => 'HP8000M',    match => 'HP J4110A ProCurve Switch 8000M' },
    BS350T => { model => 'BS350T',     match => 'BayStack 350T HW'                },
+   N3483G => { model => 'NA3483-6G',  match => 'GigaSwitch V3 TP SFP-I 48V ES3'  },
    );
 
@@ -109 +111 @@
 Readonly my $RE_MAC_ADDRESS  => qr{ [0-9,A-Z]{2} : [0-9,A-Z]{2} : [0-9,A-Z]{2} : [0-9,A-Z]{2} : [0-9,A-Z]{2} : [0-9,A-Z]{2} }xms;
 Readonly my $RE_IPv4_ADDRESS => qr{ [0-9]{1,3} \. [0-9]{1,3} \. [0-9]{1,3} \. [0-9]{1,3} }xms;
+
+Readonly my $RE_FLOAT_HOSTNAME => qr{ ^float }xms;
 
 
@@ -507 +511 @@
       }
 
+   if ($sw_model eq 'HP3500-24G') {
+      if ($sw_port > 289) {
+         
+         my $reste = $sw_port - 289;
+         return "Trk$reste";
+         }
+      }
+
    return $sw_port;
    }
@@ -546 +558 @@
 
          return 48 + $reste;
+         }
+      }
+
+   if ($sw_model eq 'HP3500-24G') {
+      if ($sw_port =~ m/^Trk/xms ) {
+
+         my $reste =  substr $sw_port, 3;
+
+         return 289 + $reste;
          }
       }
@@ -891 +912 @@
             )
             and (
-               not $mactimedb{$ip_mac}->{hostname_fq} =~ m/^float/
-               or $ip_hostname_fq =~ m/^float/
+               not $mactimedb{$ip_mac}->{hostname_fq} =~ m/$RE_FLOAT_HOSTNAME/
+               or $ip_hostname_fq =~ m/$RE_FLOAT_HOSTNAME/
                )) {
             print "remove ip $ip\n" if $verbose;
@@ -907 +928 @@
             )
             and (
-               not $ip_hostname_fq =~ m/^float/
-               or $mactimedb{$ip_mac}->{hostname_fq} =~ m/^float/
+               not $ip_hostname_fq =~ m/$RE_FLOAT_HOSTNAME/
+               or $mactimedb{$ip_mac}->{hostname_fq} =~ m/$RE_FLOAT_HOSTNAME/
                )) {
             print "remove ip ".$mactimedb{$ip_mac}->{ip}."\n" if $verbose;
@@ -1231 +1252 @@
 
       if (
-         ($ip_hostname_fq =~ m/^float/ and $ip_timestamp > $swithportdb{$swpt}->{timestamp} + (15 * 24 * 3600))
+         ($ip_hostname_fq =~ m/$RE_FLOAT_HOSTNAME/ and $ip_timestamp > $swithportdb{$swpt}->{timestamp} + (15 * 24 * 3600))
          or
-         ($ip_hostname_fq !~ m/^float/ and (
-            ($swithportdb{$swpt}->{hostname_fq} =~ m/^float/ and $ip_timestamp > $swithportdb{$swpt}->{timestamp} - (15 * 24 * 3600))
+         ($ip_hostname_fq !~ m/$RE_FLOAT_HOSTNAME/ and (
+            ($swithportdb{$swpt}->{hostname_fq} =~ m/$RE_FLOAT_HOSTNAME/ and $ip_timestamp > $swithportdb{$swpt}->{timestamp} - (15 * 24 * 3600))
             or
-            ($swithportdb{$swpt}->{hostname_fq} !~ m/^float/ and $ip_timestamp > $swithportdb{$swpt}->{timestamp})
+            ($swithportdb{$swpt}->{hostname_fq} !~ m/$RE_FLOAT_HOSTNAME/ and $ip_timestamp > $swithportdb{$swpt}->{timestamp})
             ))
          ) {
@@ -1251 +1272 @@
    foreach my $swpt (keys %swithportdb) {
       next if $swpt =~ m/^\s*0$/;
-      next if $swithportdb{$swpt}->{hostname_fq} !~ m/^float/;
+      next if $swithportdb{$swpt}->{hostname_fq} !~ m/$RE_FLOAT_HOSTNAME/;
 
       my $src_ip = $swithportdb{$swpt}->{ip};
@@ -1257 +1278 @@
       foreach my $ip (keys %{$computerdb}) {
          next if $computerdb->{$ip}{mac_address} ne  $swithportdb{$swpt}->{mac_address};
-         next if $computerdb->{$ip}{hostname_fq} =~ m/^float/;
+         next if $computerdb->{$ip}{hostname_fq} =~ m/$RE_FLOAT_HOSTNAME/;
          next if $computerdb->{$ip}{timestamp} < $src_timestamp;