Changeset 86

Timestamp:

Mar 30, 2011, 3:18:26 PM (14 years ago)

Author:

g7moreau

Message:

• Cleanup code

File:

• trunk/klask (modified) (10 diffs)

trunk/klask

@@ -107 +107 @@
    sysContact      => '1.3.6.1.2.1.1.4.0',
    sysLocation     => '1.3.6.1.2.1.1.6.0',
+   searchPort      => '1.3.6.1.2.1.17.4.3.1.2',
    );
 
@@ -330 +331 @@
 ###
 # convertit l'hexa (uniquement 2 chiffres) en decimal
-sub hex_to_dec {
+sub digit_hex_to_dec {
    #00:0F:1F:43:E4:2B
    my $car = '00' . uc shift;
@@ -345 +346 @@
 
 ###
-# convertit l'@ arp en decimal
-sub arp_hex_to_dec {
+# convertit l'@ mac en decimal
+sub mac_address_hex_to_dec {
    #00:0F:1F:43:E4:2B
-   my $arp = shift;
-
-   my @paquets = split m/ : /xms, $arp;
+   my $mac_address = shift;
+
+   my @paquets = split m/ : /xms, $mac_address;
    my $return = q{};
    foreach(@paquets) {
-      $return .= q{.} . hex_to_dec($_);
+      $return .= q{.} . digit_hex_to_dec($_);
       }
    return $return;
@@ -361 +362 @@
 # va rechercher le port et le switch sur lequel est la machine
 sub find_switch_port {
-   my $arp             = shift;
+   my $mac_address     = shift;
    my $switch_proposal = shift || q{};
 
@@ -368 +369 @@
    $ret{switch_port} = '0';
 
-   return %ret if $arp eq 'unknow';;
+   return %ret if $mac_address eq 'unknow';;
 
    my @switch_search = @SWITCH;
@@ -379 +380 @@
       }
 
-   my $research = '1.3.6.1.2.1.17.4.3.1.2' . arp_hex_to_dec($arp);
+   my $research = $OID_NUMBER{searchPort} . mac_address_hex_to_dec($mac_address);
 
    LOOP_ON_SWITCH:
@@ -426 +427 @@
 # va rechercher les port et les switch sur lequel est la machine
 sub find_all_switch_port {
-   my $arp = shift;
+   my $mac_address = shift;
 
    my $ret = {};
 
-   return $ret if $arp eq 'unknow';
-
-   for my $sw (@SWITCH) {
-      next if exists $SWITCH_PORT_COUNT{$sw->{hostname}};
-
-      $SWITCH_PORT_COUNT{$sw->{hostname}} = {};
+   return $ret if $mac_address eq 'unknow';
+
+#   for my $sw (@SWITCH) {
+#      next if exists $SWITCH_PORT_COUNT{$sw->{hostname}};
+#
+#      $SWITCH_PORT_COUNT{$sw->{hostname}} = {};
 #      print "DEBUG: SWITCH_PORT_COUNT defined for $sw->{hostname}\n" if $DEBUG xor 2;
-      }
-
-   my $research = '1.3.6.1.2.1.17.4.3.1.2' . arp_hex_to_dec($arp);
+#      }
+
+   my $research = $OID_NUMBER{searchPort} . mac_address_hex_to_dec($mac_address);
    LOOP_ON_ALL_SWITCH:
    for my $sw (@SWITCH) {
@@ -452 +453 @@
          my $swport = $result->{$research};
 
-#print "DEBUG $arp  $swport --  $sw->{hostname} \n";
-#         if ( $sw->{hostname} eq 'sw10-batE1-3s.hmg.priv' and $swport == 19 ) { $swport = 20; print "DEBUG $swport --  $sw->{hostname} \n";}
-#         if ( $sw->{hostname} eq 'sw8-batE1-3s.hmg.priv'  and $swport == 23 ) { $swport = 24; print "DEBUG $swport --  $sw->{hostname} \n";}
-#         if ( $sw->{hostname} eq 'sw10-batE1-3s.hmg.priv' ) {  print "DEBUG $swport --  $sw->{hostname} \n";}
-#         if ( $sw->{hostname} eq 'sw8-batE1-3s.hmg.priv'  ) {  print "DEBUG $swport --  $sw->{hostname} \n";}
-
          $ret->{$sw->{hostname}} = {};
          $ret->{$sw->{hostname}}{hostname}    = $sw->{hostname};
@@ -463 +458 @@
          $ret->{$sw->{hostname}}{port}        = get_human_readable_port($sw->{model}, $swport);
 
-         $SWITCH_PORT_COUNT{$sw->{hostname}}->{$swport}++;
+#         $SWITCH_PORT_COUNT{$sw->{hostname}}->{$swport}++;
          }
 
@@ -1405 +1400 @@
       }
 
-   my $research = '1.3.6.1.2.1.17.4.3.1.2' . arp_hex_to_dec($mac_address);
+   my $research = $OID_NUMBER{searchPort} . mac_address_hex_to_dec($mac_address);
    print "Klask search OID $research on switch $switch_name\n";