Changeset 170 for trunk/klask

Timestamp:

Jul 18, 2016, 6:11:38 PM (8 years ago)

Author:

g7moreau

Message:

• Add verbose description on switch

File:

• trunk/klask (modified) (6 diffs)

trunk/klask

@@ -1 +1 @@
 #!/usr/bin/perl -w
 #
-# Copyright (C) 2005-2016 Gabriel Moreau.
+# Copyright (C) 2005-2016 Gabriel Moreau
 #
 # $Id$
@@ -103 +103 @@
    J4903A           => { type => 1, model => 'HP2824',         match => 'J4903A.+?Switch 2824,'             },
    J4110A           => { type => 1, model => 'HP8000M',        match => 'HP J4110A ProCurve Switch 8000M'   },
-   JE074A           => { type => 2, model => 'HP5120-24G',     match => 'HP Comware.+?A5120-24G EI'         },
-   JE069A           => { type => 2, model => 'HP5120-48G',     match => 'HP Comware.+?A5120-48G EI Switch with 2 Interface Slots'   },
-   JD377A           => { type => 2, model => 'HP5500-24G',     match => 'HP Comware.+?A5500-24G EI'         },
-   JD374A           => { type => 2, model => 'HP5500-24F',     match => 'HP Comware.+?A5500-24G-SFP EI'     },
+   JE074A           => { type => 2, model => 'HP5120-24G',     match => 'HP Comware.+?A5120-24G EI Switch with 2 Interface Slots'      },
+   JE069A           => { type => 2, model => 'HP5120-48G',     match => 'HP Comware.+?A5120-48G EI Switch with 2 Interface Slots'      },
+   JD377A           => { type => 2, model => 'HP5500-24G',     match => 'HP Comware.+?A5500-24G EI Switch with 2 Interface Slots'      },
+   JD374A           => { type => 2, model => 'HP5500-24F',     match => 'HP Comware.+?A5500-24G-SFP EI Switch with 2 Interface Slots'  },
    # BayStack
    BS350T           => { type => 1, model => 'BS350T',         match => 'BayStack 350T HW'                  },
@@ -293 +293 @@
 # va rechercher le nom des switchs pour savoir qui est qui
 sub init_switch_names {
-   my $verbose = shift;
+   my ($verbose, $verb_description) = @_;
 
    printf "%-26s                %-25s %s\n",'Switch','Description','Type' if $verbose;
@@ -324 +324 @@
          );
       $sw->{description} = $result->{$OID_NUMBER{sysName}} || $sw->{hostname};
-      $sw->{model} = get_switch_model( $result->{$OID_NUMBER{sysDescription}});
+      $sw->{model} = get_switch_model($result->{$OID_NUMBER{sysDescription}});
+      if ($verb_description) {
+         my $desc = $result->{$OID_NUMBER{sysDescription}};
+         $desc =~ s/[\n\r]/ /g;
+         print "   description: $desc\n"
+         }
       #$sw->{location} = $result->{"1.3.6.1.2.1.1.6.0"} || $sw->{hostname};
       #$sw->{contact} = $result->{"1.3.6.1.2.1.1.4.0"} || $sw->{hostname};
@@ -866 +871 @@
 
 sub cmd_updatedb {
-   my @network = @_;
+   @ARGV = @_;
+
+   my ($verbose, $verb_description);
+
+   GetOptions(
+      'verbose|v' => \$verbose,
+      'verb_description|d' => \$verb_description,
+      );
+
+   my @network = @ARGV;
       @network = get_list_network() if not @network;
 
@@ -884 +898 @@
    my $detected_computer = 0;
 
-   init_switch_names('yes');    #nomme les switchs
+   init_switch_names('yes', $verb_description);    #nomme les switchs
 
    { # Remplis le champs portignore des ports d'inter-connection pour chaque switch