Changeset 304 for trunk

Timestamp:

Oct 11, 2017, 9:39:15 PM (7 years ago)

Author:

g7moreau

Message:

• Better switch description and error in init proc

File:

• trunk/klask (modified) (2 diffs)

trunk/klask

@@ -362 +362 @@
 
 #---------------------------------------------------------------
-# va rechercher le nom des switchs pour savoir qui est qui
+# Get switch name and switch model
 sub init_switch_names {
    my ($verbose, $verb_description, $check_hostname, $check_location) = @_;
@@ -394 +394 @@
       $sw->{'description'} = $result->{$OID_NUMBER{'sysName'}} || $sw->{'hostname'};
       $sw->{model} = get_switch_model($result->{$OID_NUMBER{'sysDescription'}});
+      printf "%-26s 0--------->>>> %-25s %s\n", $sw->{'hostname'}, $sw->{'description'}, $sw->{model} if $verbose;
+
       if ($verb_description) {
          my $desc = $result->{$OID_NUMBER{'sysDescription'}};
          $desc =~ s/[\n\r]/ /g;
-         print "   description: $desc\n"
+         print " +> $sw->{'hostname'} - description: $desc\n"
          }
       if ($check_hostname) {
          my ($hostname) = split /\./, $sw->{'hostname'}, 2;
-         print " $hostname - error internal hostname: $sw->{'hostname'}\n" if $result->{$OID_NUMBER{'sysName'}} ne $hostname;
+         print " +> $hostname - error internal hostname: $sw->{'hostname'}\n" if $result->{$OID_NUMBER{'sysName'}} ne $hostname;
          }
       if ($check_location) {
          my $location = $result->{$OID_NUMBER{'sysLocation'}};
          $location =~ s/^"(.+)"$/$1/;
-         print " $sw->{'hostname'} - error location: '$location' -> '$sw->{'location'}'\n" if $location ne $sw->{'location'};
-         }
-      #$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'};
+         print " +> $sw->{'hostname'} - error location: '$location' -> '$sw->{'location'}'\n" if $location ne $sw->{'location'};
+         }
+
       $session->close;
-
-      # Ligne à virer car on récupère maintenant le modèle du switch
-      #my ($desc, $type) = split m/ : /xms, $sw->{'description'}, 2;
-      printf "%-26s 0--------->>>> %-25s %s\n", $sw->{'hostname'}, $sw->{'description'}, $sw->{model} if $verbose;
       }