Changeset 79

Timestamp:

Mar 29, 2011, 5:37:45 PM (14 years ago)

Author:

g7moreau

Message:

• Add verbose option to updatesw

File:

• trunk/klask (modified) (7 diffs)

trunk/klask

@@ -22 +22 @@
 # apt-get install snmp fping libnet-cidr-lite-perl libnet-netmask-perl libnet-snmp-perl libnetaddr-ip-perl libyaml-perl
 # libcrypt-des-perl libcrypt-hcesha-perl libdigest-hmac-perl 
-# arping fping bind9-host arpwatch
+# arping net-tools fping bind9-host arpwatch
 
 my $KLASK_VAR      = '/var/cache/klask';
@@ -445 +445 @@
 
 #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' 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";}
@@ -1420 +1420 @@
 
 sub cmd_updatesw {
+   my @options = @_;
+
+   my $verbose;
+
+   my $ret = GetOptionsFromArray(\@options,
+      'verbose|v' => \$verbose,
+      );
 
    init_switch_names('yes');    #nomme les switchs
@@ -1434 +1441 @@
       next DETECT_ALL_ROUTER if $resol_arp{mac_address} eq 'unknow';
       $where{$resol_arp{ipv4_address}} = find_all_switch_port($resol_arp{mac_address}); # retrouve les emplacements des routeurs
+      print "VERBOSE_1: Router detected $resol_arp{ipv4_address} - $resol_arp{mac_address}\n" if $verbose;
       }
 
@@ -1449 +1457 @@
 
          $db_switch_output_port{$switch->{hostname}} = $switch->{port};
+         print "VERBOSE_2: output port $switch->{hostname} : $switch->{port}\n" if $verbose;
          }
       }
@@ -1491 +1500 @@
       for my $switch_detected ( keys %{$where{$ip}} ) {
 
-         next DETECTED_SWITCH if not exists $SWITCH_PORT_COUNT{ $db_switch_ip_hostname{$ip}};
+         next DETECTED_SWITCH if not exists $SWITCH_PORT_COUNT{ $db_switch_ip_hostname{$ip} };
 
          my $switch = $where{$ip}->{$switch_detected};
@@ -1502 +1511 @@
          $db_switch_link_with{ $db_switch_ip_hostname{$ip} } ||= {};
          $db_switch_link_with{ $db_switch_ip_hostname{$ip} }->{ $switch->{hostname} } = $switch->{port};
+         print "VERBOSE_3: $db_switch_ip_hostname{$ip} -> $switch->{hostname} : $switch->{port}\n" if $verbose;
 #print "DEBUG :  $db_switch_ip_hostname{$ip} / $switch->{hostname} : $switch->{port}\n" if $switch->{hostname} !~ m/sw3-batA0-3s/;
          }