Changeset 309

Timestamp:

Oct 19, 2017, 9:52:24 PM (7 years ago)

Author:

g7moreau

Message:

• Protect key model and revision

File:

• trunk/klask (modified) (5 diffs)

trunk/klask

@@ -356 +356 @@
       next if not $sw_snmp_description =~ m/$SWITCH_KIND{$sw_kind}->{match}/ms; # option xms break search, why ?
 
-      return $SWITCH_KIND{$sw_kind}->{model};
+      return $SWITCH_KIND{$sw_kind}->{'model'};
       }
 
@@ -370 +370 @@
    for my $sw_kind (keys %SWITCH_KIND) {
       next if not $sw_snmp_description =~ m/$SWITCH_KIND{$sw_kind}->{match}/ms; # option xms break search, why ?
-      last if not exists $SWITCH_KIND{$sw_kind}->{revision};
-
-      my ($revision) = $sw_snmp_description =~ m/$SWITCH_KIND{$sw_kind}->{revision}/xms;
+      last if not exists $SWITCH_KIND{$sw_kind}->{'revision'};
+
+      my ($revision) = $sw_snmp_description =~ m/$SWITCH_KIND{$sw_kind}->{'revision'}/xms;
       return $revision || 'unknow';
       }
@@ -411 +411 @@
 
       $sw->{'description'} = $result->{$OID_NUMBER{'sysName'}} || $sw->{'hostname'};
-      $sw->{model} = get_switch_model($result->{$OID_NUMBER{'sysDescription'}});
-      $sw->{revision} = get_switch_revision($result->{$OID_NUMBER{'sysDescription'}});
-      printf "%-26s 0--------->>>> %-25s %s\n", $sw->{'hostname'}, $sw->{'description'}, $sw->{model}.'('.$sw->{revision}.')' if $verbose;
+      $sw->{'model'} = get_switch_model($result->{$OID_NUMBER{'sysDescription'}});
+      $sw->{'revision'} = get_switch_revision($result->{$OID_NUMBER{'sysDescription'}});
+      printf "%-26s 0--------->>>> %-25s %s\n", $sw->{'hostname'}, $sw->{'description'}, $sw->{'model'}.'('.$sw->{'revision'}.')' if $verbose;
 
       if ($verb_description) {
@@ -890 +890 @@
       $checksum_data .= join ':',
          $switch_db{$sw_name}->{'description'},
-         $switch_db{$sw_name}->{model},
+         $switch_db{$sw_name}->{'model'},
          $switch_db{$sw_name}->{'hostname'},
          "\n";
@@ -2954 +2954 @@
 
             my $swname  = $sw;
-               $swname .= q{\n-\n} . "$db_switch_global{$sw}->{model}" if exists $db_switch_global{$sw} and exists $db_switch_global{$sw}->{model};
+               $swname .= q{\n-\n} . "$db_switch_global{$sw}->{'model'}" if exists $db_switch_global{$sw} and exists $db_switch_global{$sw}->{'model'};
             print "\"$sw\" [label=\"$swname\", color=black, fillcolor=palegreen, shape=rect, style=filled];\n";
             print "\"location$b-$l\" -> \"$sw\" [len=2, color=firebrick, arrowtail=dot];\n";