diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP index f6ecd282..10f99e1f 100644 --- a/MANIFEST.SKIP +++ b/MANIFEST.SKIP @@ -58,7 +58,7 @@ # Avoid Devel::Cover and Devel::CoverX::Covered files. \bcover_db\b \bcovered\b - + # Avoid MYMETA files ^MYMETA\. diff --git a/contrib/DEVELOP b/contrib/DEVELOP index 945e0884..81200310 100644 --- a/contrib/DEVELOP +++ b/contrib/DEVELOP @@ -6,7 +6,7 @@ Coding Guidelines: - always update ChangeLog before committing - check-in required mibs to netdisco-mibs and release new package if needed -Release and Testing Instructions: +Release and Testing Instructions: - for netdisco see: -> https://github.com/netdisco/netdisco/wiki/Developing -> https://metacpan.org/pod/App::Netdisco @@ -17,17 +17,17 @@ Release and Testing Instructions: -> https://github.com/netdisco/netdisco-mibs/wiki FAQ: - - Do I have to update the version number and timestamp in modified files before committing? + - Do I have to update the version number and timestamp in modified files before committing? -> No. These are RCS tags that are automatically updated by CVS when you commit - Should I add changes at the top of the ChangeLog? -> Yes. The changelog is created one commit at a time. If there isn't a section for the current version, then add one at the top and put your - changes after. You can leave the date field for the release empty (). + changes after. You can leave the date field for the release empty (). - What should I change the $VERSION to? -> If you are the first person to get to a file after a release, update it - to either release++ or "release++ dash cvs". + to either release++ or "release++ dash cvs". Example: File is marked 2.01, change it to 2.02-cvs with your new changes. Example: File is marked 2.02-cvs, no change until packaging for release when the -cvs is removed. TODO: Is there still an odd/even scheme as introduced by Eric? diff --git a/contrib/util/make_dev_matrix.pl b/contrib/util/make_dev_matrix.pl index 06131de2..36e0a19a 100755 --- a/contrib/util/make_dev_matrix.pl +++ b/contrib/util/make_dev_matrix.pl @@ -28,7 +28,7 @@ if ($@) { } else { $graph{$vendor}->{$family}=[]; } - + } } my $now = scalar localtime; @@ -83,7 +83,7 @@ foreach my $vendor (sort sort_nocase keys %$matrix){ } elsif (defined $vendor_defaults->{$a}){ $val = $vendor_defaults->{$a}; $class = 'vendor'; - } + } print " ",join("
\n",@$val),"\n"; } print "\n"; @@ -141,7 +141,7 @@ sub parse_data { my ($cmd,$value); if ($line =~ /^([a-z-_]+)\s*:\s*(.*)$/) { - $cmd = $1; $value = $2; + $cmd = $1; $value = $2; } else { print "What do i do with this line : $line \n"; next; @@ -164,18 +164,18 @@ sub parse_data { $family = $value; $model = undef; print "$family has no vendor.\n" unless defined $vendor; - $Matrix->{$vendor}->{families}->{$family} = {} + $Matrix->{$vendor}->{families}->{$family} = {} unless defined $Matrix->{$vendor}->{families}->{$family}; $class = $Matrix->{$vendor}->{families}->{$family}; $class->{defaults}->{type}='family'; next; - } + } if ($cmd eq 'device') { $model = $value; print "$model has no family.\n" unless defined $family; print "$model has no vendor.\n" unless defined $vendor; - $Matrix->{$vendor}->{families}->{$family}->{models}->{$model} = {} + $Matrix->{$vendor}->{families}->{$family}->{models}->{$model} = {} unless defined $Matrix->{$vendor}->{families}->{$family}->{models}->{$model}; $class = $Matrix->{$vendor}->{families}->{$family}->{models}->{$model}; $class->{defaults}->{type}='device'; @@ -233,7 +233,7 @@ sub html_head { .vendor { font-size:12pt; color:#777777; } .family { font-size:12pt; color:blue; } .model { font-size:12pt; color:red; } - .note { color:red; } + .note { color:red; } //--> @@ -304,7 +304,7 @@ be assumed working. Discovery Protocol (LLDP), Cisco Discovery Protocol (CDP), SynOptics/Bay/Nortel/Avaya Network Management Protocol (SONMP), Foundry/Brocade Discovery Protocol (FDP), Extreme Discovery - Protocol (EDP), and Alcatel Mapping Adjacency Protocol (AMAP). + Protocol (EDP), and Alcatel Mapping Adjacency Protocol (AMAP). @@ -325,7 +325,7 @@ be assumed working. end_tail - + } sub print_headers { diff --git a/contrib/util/make_snmpdata.pl b/contrib/util/make_snmpdata.pl index 81c19827..a17625d4 100755 --- a/contrib/util/make_snmpdata.pl +++ b/contrib/util/make_snmpdata.pl @@ -80,7 +80,7 @@ unless ( defined $sysdescr ) { SNMP::loadModules(@ARGV); -# Create a hash of MIB Modules for which we want results +# Create a hash of MIB Modules for which we want results my %mib_hash = map {$_ => 1} @ARGV; # Add the common MIB Modules we always want my @common_mibs = ('SNMPv2-MIB', 'IF-MIB'); diff --git a/contrib/util/push_ver b/contrib/util/push_ver index 5646bff3..8c647f9b 100755 --- a/contrib/util/push_ver +++ b/contrib/util/push_ver @@ -35,7 +35,7 @@ sub glob_rec { foreach my $f (@files) { next if $f eq '\.$'; - + if (-d $f) { push @pms, glob_rec($f); next; diff --git a/contrib/util/test_class.pl b/contrib/util/test_class.pl index 9148dd08..01e6c698 100755 --- a/contrib/util/test_class.pl +++ b/contrib/util/test_class.pl @@ -250,11 +250,11 @@ test_class.pl [options] Options: - -c|class SNMP::Info class to use, Layer2::Catalyst + -c|class SNMP::Info class to use, Layer2::Catalyst -d|dev Device -s|comm SNMP community -v|ver SNMP version - -p|print Print values + -p|print Print values -i|ignore Ignore Net-SNMP configuration file -m|mibdir Directory containing MIB Files -n|nobulk Disable bulkwalk @@ -294,7 +294,7 @@ SNMP version. Default 2. =item B<-print> Print values of a class method rather than summarizing. May be repeated -multiple times. +multiple times. -print i_description -print i_type @@ -308,7 +308,7 @@ provided. =item B<-mibdir> Directory containing MIB Files. Multiple directories should be separated by a -colon ':'. +colon ':'. -mibdir /usr/local/share/snmp/mibs/rfc:/usr/local/share/snmp/mibs/net-snmp diff --git a/contrib/util/test_class_mocked.pl b/contrib/util/test_class_mocked.pl index c3ebb013..5d602f78 100755 --- a/contrib/util/test_class_mocked.pl +++ b/contrib/util/test_class_mocked.pl @@ -385,9 +385,9 @@ test_class_mocked.pl [options] Options: - -class SNMP::Info class to use, Layer2::Catalyst + -class SNMP::Info class to use, Layer2::Catalyst -file File containing data gathered using make_snmpdata.pl - -print Print values + -print Print values -debug Debugging flag -ignore Ignore Net-SNMP configuration file -mibdir Directory containing MIB Files @@ -414,7 +414,7 @@ mandatory option. =item B<-print> Print values of a class method rather than summarizing. May be repeated -multiple times. +multiple times. -print i_description -print i_type @@ -434,7 +434,7 @@ provided. =item B<-mibdir> Directory containing MIB Files. Multiple directories should be separated by a -colon ':'. +colon ':'. -mibdir /usr/local/share/snmp/mibs/rfc:/usr/local/share/snmp/mibs/net-snmp