Changeset 138 for trunk/klask

Timestamp:

Apr 3, 2014, 8:09:01 PM (10 years ago)

Author:

g7moreau

Message:

• Return all IP for a mac address
• Add obtion version when search on swit

File:

• trunk/klask (modified) (11 diffs)

trunk/klask

@@ -707 +707 @@
    my $kind;
 
-   my $ret = GetOptions(
+   GetOptions(
       'kind=s'   => \$kind,
       );
@@ -775 +775 @@
             $computerdb->{$ip}{mac_address},
             $date;
-         next LOOP_ON_MAC;
+         #next LOOP_ON_MAC;
          }
 
@@ -989 +989 @@
    my $database_has_changed;
 
-   my $ret = GetOptions(
+   GetOptions(
       'day|d=i'   => \$days_to_clean,
       'verbose|v' => \$verbose,
@@ -1084 +1084 @@
    my $format = 'txt';
 
-   my $ret = GetOptions(
+   GetOptions(
       'format|f=s'  => \$format,
       );
@@ -1576 +1576 @@
    my $verbose;
 
-   my $ret = GetOptions(
+   GetOptions(
       'day|d=i'      => \$days_to_dead,
       'format|f=s'   => \$format,
@@ -1733 +1733 @@
 
 sub cmd_search_mac_on_switch {
-   my $switch_name = shift || q{};
-   my $mac_address = shift || q{};
+   @ARGV = @_;
+
+   my $verbose;
+
+   GetOptions(
+      'verbose|v' => \$verbose,
+      );
+
+   my $switch_name = shift @ARGV || q{};
+   my $mac_address = shift @ARGV || q{};
 
    if ($switch_name eq q{} or $mac_address eq q{}) {
@@ -1740 +1748 @@
       }
 
+   $mac_address = normalize_mac_address($mac_address);
    $switch_name = join(',', map {$_->{hostname}} @SWITCH ) if $switch_name eq q{*};
 
@@ -1760 +1769 @@
       my $research1 = $OID_NUMBER{searchPort1} . mac_address_hex_to_dec($mac_address);
       my $research2 = $OID_NUMBER{searchPort2} . mac_address_hex_to_dec($mac_address);
-      print "Klask search OID $research1 on switch $sw_name\n";
-      print "Klask search OID $research2 on switch $sw_name\n";
+      print "Klask search OID $research1 on switch $sw_name\n" if $verbose;
+      print "Klask search OID $research2 on switch $sw_name\n" if $verbose;
 
       my ($session, $error) = Net::SNMP->session( %session );
@@ -1781 +1790 @@
          }
       else {
-         print "Klask do not find MAC $mac_address on switch $sw_name\n";
+         print "Klask do not find MAC $mac_address on switch $sw_name\n" if $verbose;
          }
 
@@ -1794 +1803 @@
    my $verbose;
 
-   my $ret = GetOptions(
+   GetOptions(
       'verbose|v' => \$verbose,
       );
@@ -1996 +2005 @@
    my $format = 'txt';
 
-   my $ret = GetOptions(
+   GetOptions(
       'format|f=s'  => \$format,
       );