Changeset 196

Timestamp:

Jan 5, 2017, 11:32:18 AM (8 years ago)

Author:

g7moreau

Message:

• Better verbose mode for updatesw, begin delete broken switch

File:

• trunk/klask (modified) (18 diffs)

trunk/klask

@@ -7 +7 @@
 use strict;
 use warnings;
-use version; our $VERSION = qv('0.5.6');
+use version; our $VERSION = qv('0.5.7');
 
 use Readonly;
@@ -34 +34 @@
 my $KLASK_CFG = YAML::Syck::LoadFile("$KLASK_CFG_FILE");
 
-my %DEFAULT = %{ $KLASK_CFG->{default} };
-my @SWITCH  = @{ $KLASK_CFG->{switch}  };
-
-my %switch_level = ();
+my %DEFAULT     = %{$KLASK_CFG->{default}};
+my @SWITCH_LIST = @{$KLASK_CFG->{switch}};
+
+my %SWITCH_LEVEL = ();
 my %SWITCH_DB    = ();
 LEVEL_OF_EACH_SWITCH:
-for my $sw (@SWITCH){
-   $switch_level{$sw->{hostname}} = $sw->{level} || $DEFAULT{switch_level}  || 2;
+for my $sw (@SWITCH_LIST){
+   $SWITCH_LEVEL{$sw->{hostname}} = $sw->{level} || $DEFAULT{switch_level}  || 2;
    $SWITCH_DB{$sw->{hostname}} = $sw;
    }
-@SWITCH = reverse sort { $switch_level{$a->{hostname}} <=> $switch_level{$b->{hostname}} } @{$KLASK_CFG->{switch}};
-
-my %SWITCH_PORT_COUNT = ();
+@SWITCH_LIST = reverse sort { $SWITCH_LEVEL{$a->{hostname}} <=> $SWITCH_LEVEL{$b->{hostname}} } @{$KLASK_CFG->{switch}};
+
+#my %SWITCH_PORT_COUNT = ();
 
 my %CMD_DB = (
@@ -270 +270 @@
 #      }
    if ($ret{mac_address} eq 'unknow') {
-      # Another chance to have mac_address
+      # Last chance to have the mac_address
       my $cmd_arp  = shell_command "ip neigh show to $ret{ipv4_address} dev $ret{interface}";
       if ( $cmd_arp =~ m{ ^$RE_IPv4_ADDRESS \s lladdr \s ( $RE_MAC_ADDRESS ) \s }xms ) {
@@ -313 +313 @@
 
    INIT_EACH_SWITCH:
-   for my $sw (@SWITCH) {
+   for my $sw (@SWITCH_LIST) {
       my %session = ( -hostname   => $sw->{hostname} );
          $session{-version} = $sw->{version}   || 1;
@@ -337 +337 @@
             ]
          );
+      if (!defined $result) {
+         printf {*STDERR} "ERROR: %s.\n", $session->error();
+         $session->close();
+         # Remove bad switch
+         @SWITCH_LIST = grep { $_->{hostname} ne $sw->{hostname} } @SWITCH_LIST;
+         delete $SWITCH_LEVEL{$sw->{hostname}} if exists $SWITCH_LEVEL{$sw->{hostname}};
+         delete $SWITCH_DB{$sw->{hostname}}    if exists $SWITCH_DB{$sw->{hostname}};
+         next INIT_EACH_SWITCH;
+         }
+
       $sw->{description} = $result->{$OID_NUMBER{sysName}} || $sw->{hostname};
       $sw->{model} = get_switch_model($result->{$OID_NUMBER{sysDescription}});
@@ -358 +368 @@
 
       # Ligne à virer car on récupère maintenant le modèle du switch
-      my ($desc, $type) = split m/ : /xms, $sw->{description}, 2;
+      #my ($desc, $type) = split m/ : /xms, $sw->{description}, 2;
       printf "%-26s 0--------->>>> %-25s %s\n", $sw->{hostname}, $desc, $sw->{model} if $verbose;
       }
@@ -424 +434 @@
    return %ret if $mac_address eq 'unknow';;
 
-   my @switch_search = @SWITCH;
+   my @switch_search = @SWITCH_LIST;
    if ($switch_proposal ne q{}) {
-      for my $sw (@SWITCH) {
+      for my $sw (@SWITCH_LIST) {
          next if $sw->{hostname} ne $switch_proposal;
          unshift @switch_search, $sw;
@@ -495 +505 @@
    my $research2 = $OID_NUMBER{searchPort2} .'.'. $vlan_id . mac_address_hex_to_dec($mac_address);
    LOOP_ON_ALL_SWITCH:
-   for my $sw (@SWITCH) {
+   for my $sw (@SWITCH_LIST) {
       my ($session, $error) = Net::SNMP->session( %{$sw->{local_session}} );
       print "$error \n" if $error;
@@ -949 +959 @@
       $db_switch_chained_port{$sw_connect} .= "$port_connect:";
       }
-   for my $sw (@SWITCH){
+   for my $sw (@SWITCH_LIST){
       push @{$sw->{portignore}}, $db_switch_output_port{$sw->{hostname}}  if exists $db_switch_output_port{$sw->{hostname}};
       if ( exists $db_switch_chained_port{$sw->{hostname}} ) {
@@ -1003 +1013 @@
 
          # do not search on switch inter-connection
-         if (exists $switch_level{$resol_arp{hostname_fq}}) {
+         if (exists $SWITCH_LEVEL{$resol_arp{hostname_fq}}) {
             $computer_not_detected{$one_computer} = $current_net;
             next LOOP_ON_COMPUTER;
@@ -1616 +1626 @@
       }
 
-   $switch_name = join(',', map {$_->{hostname}} @SWITCH ) if $switch_name eq q{*};
+   $switch_name = join(',', map {$_->{hostname}} @SWITCH_LIST ) if $switch_name eq q{*};
 
    for my $sw_name (split /,/, $switch_name) {
@@ -1772 +1782 @@
       }
 
-   $switch_name = join(',', map {$_->{hostname}} @SWITCH ) if $switch_name eq q{*};
+   $switch_name = join(',', map {$_->{hostname}} @SWITCH_LIST ) if $switch_name eq q{*};
 
    for my $sw_name (split /,/, $switch_name) {
@@ -1825 +1835 @@
       my $sw_location = q{};
       LOOP_ON_ALL_SWITCH:
-      for my $sw (@SWITCH) {
+      for my $sw (@SWITCH_LIST) {
          next LOOP_ON_ALL_SWITCH if $sw_hostname ne $sw->{hostname};
          $sw_location = $sw->{location};
@@ -2021 +2031 @@
 
    $mac_address = normalize_mac_address($mac_address);
-   $switch_name = join(',', map {$_->{hostname}} @SWITCH ) if $switch_name eq q{*};
+   $switch_name = join(',', map {$_->{hostname}} @SWITCH_LIST ) if $switch_name eq q{*};
 
    for my $sw_name (split /,/, $switch_name) {
@@ -2088 +2098 @@
 
    DETECT_ALL_ROUTER:
-#   for my $one_computer ('194.254.66.254') {
    for my $one_router ( get_list_main_router(get_list_network()) ) {
+      print "Info: router loop $one_router\n" if $verbose;
       my %resol_arp = resolve_ip_arp_host($one_router, q{*}, q{low}); # resolution arp
 
@@ -2121 +2131 @@
    my @list_all_switch = ();
    my @list_switch_ipv4 = ();
-   for my $sw (@SWITCH){
+   for my $sw (@SWITCH_LIST){
       push @list_all_switch, $sw->{hostname};
       }
@@ -2130 +2140 @@
    for my $one_computer (@list_all_switch) {
       my %resol_arp = resolve_ip_arp_host($one_computer, q{*}, q{low}); # arp resolution
+      print "Info: switch loop $one_computer\n" if $verbose;
       next ALL_SWITCH if $resol_arp{mac_address} eq 'unknow';
 
@@ -2348 +2359 @@
 
    my %db_building= ();
-   for my $sw (@SWITCH) {
+   for my $sw (@SWITCH_LIST) {
       my ($building, $location) = split m/ \/ /xms, $sw->{location}, 2;
       $db_building{$building} ||= {};