scottk/wlan-lanforge-scripts
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-lanforge-scripts.git synced 2025-10-31 10:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

firemod: migrates endp_vals logic to looking up values in hashmap rather than parsing all strange line patterns

Browse Source
This commit is contained in:
Jed Reynolds
2020-03-11 19:07:35 -07:00
parent cb35ebf99d
commit 71adb83573
1 changed files with 173 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

338
lf_firemod.pl
View File

@@ -347,34 +347,41 @@ if (grep {$_ eq $::action} split(',', "show_endp,set_endp,create_endp,create_arm
elsif ($::action eq "show_endp") { elsif ($::action eq "show_endp") {
if ((defined $::endp_vals) && ("$::endp_vals" ne "")) { if ((defined $::endp_vals) && ("$::endp_vals" ne "")) {
my %option_map = (); my %option_map = ();
my $option = ''; my $option = '';
for $option (split(',', $::endp_vals)) { for $option (split(',', $::endp_vals)) {
#print "OPTION[$option]\n"; #print "OPTION[$option]\n";
#next if ($option =~ /\s/); #next if ($option =~ /\s/);
if ($option =~ /rx_pps/ ) { $option = "Rx Pkts"; } if ($option =~ /rx[_-]pps/ ) { $option = "Rx-Pkts-Per-Sec"; }
if ($option =~ /tx_pps/ ) { $option = "Tx Pkts"; } if ($option =~ /tx[_-]pps/ ) { $option = "Tx-Pkts-Per-Sec"; }
if ($option =~ /rx_pkts/ ) { $option = "Rx Pkts"; } if ($option =~ /rx[_-]pkts/ ) { $option = "Rx-Pkts-Total"; }
if ($option =~ /tx_pkts/ ) { $option = "Tx Pkts"; } if ($option =~ /tx[_-]pkts/ ) { $option = "Tx-Pkts-Total"; }
if ($option =~ /rx[_-]bps/ ) { $option = "Rx-Bytes-bps"; }
if ($option =~ /tx[_-]bps/ ) { $option = "Tx-Bytes-bps"; }
if ($option =~ /^Rx[ _-]Bytes$/ ) { $option = "Rx-Bytes-Total"; }
if ($option =~ /^Tx[ _-]Bytes$/ ) { $option = "Tx-Bytes-Total"; }
if ($option =~ /^Rx[ _-]Pkts$/ ) { $option = "Rx-Pkts-Total"; }
if ($option =~ /^Tx[ _-]Pkts$/ ) { $option = "Tx-Pkts-Total"; }
# we don't know if we're armageddon or layer 3 # we don't know if we're armageddon or layer 3
if ($option =~ /tx_bytes/ ) { if ($option =~ /tx_bytes/ ) {
$option_map{ "Tx Bytes" } = ''; $option_map{ "Tx-Bytes-Total" } = '';
$option = "Bytes Transmitted"; $option = "Bytes Transmitted";
} }
if ($option =~ /rx_b(ps|ytes)/ ) { if ($option =~ /rx_b(ps|ytes)/ ) {
$option_map{ "Rx Bytes" } = ''; $option_map{ "Rx-Bytes-Total" } = '';
$option = "Bytes Rcvd"; $option = "Bytes Rcvd";
} }
if ($option =~ /tx_packets/) { if ($option =~ /tx_packets/) {
$option_map{ "Tx Pkts" } = ''; $option_map{ "Tx-Pkts-Total" } = '';
$option = "Packets Transmitted"; $option = "Packets Transmitted";
} }
if ($option =~ /rx_packets/) { if ($option =~ /rx_packets/) {
$option_map{ "Rx Pkts" } = ''; $option_map{ "Rx-Pkts-Total" } = '';
$option = "Packets Rcvd"; $option = "Packets Rcvd";
} }
$option_map{ $option } = ''; $option_map{ $option } = '';
} }
# options are reformatted # options are reformatted
@@ -387,165 +394,165 @@ if (grep {$_ eq $::action} split(',', "show_endp,set_endp,create_endp,create_arm
else { else {
@lines = split(/\r?\n/, $::utils->doAsyncCmd("nc_show_endp $endp_name")); @lines = split(/\r?\n/, $::utils->doAsyncCmd("nc_show_endp $endp_name"));
} }
my $rh_value_map = $::utils->show_as_hash(\@lines);
for($i=0; $i<@lines; $i++) { for my $option (keys %option_map) {
$lines[$i] = $lines[$i]." #"; my $val = '-';
if (defined $rh_value_map->{$option}) {
$val = $rh_value_map->{$option};
if ($option =~ /Latency/) {
$val = $rh_value_map->{$option};
$option_map{"Normalized-Hdr"} = $::utils->normalize_bucket_hdr(17);
$option_map{"Latency"} = $val;
}
elsif ($option =~ /Pkt-Gaps/) {
$val = $rh_value_map->{$option};
$option_map{"Normalized-Hdr"} = $::utils->normalize_bucket_hdr(17);
$option_map{"Pkt-Gaps"} = $val;
}
elsif ($option =~ /RX-Silence/) {
$val = $rh_value_map->{$option};
$option_map{"Normalized-Hdr"} = $::utils->normalize_bucket_hdr(17);
$option_map{"RX-Silence"} = $val;
}
}
else {
$val = 'not found';
}
$option_map{ $option } = $val;
} }
my $matcher = " (".join('|', keys %option_map)."):"; #
my @parts; # my $endval_done = 0;
my @matches = grep( /$matcher/, @lines); # for $match (@matches) {
my $match; # last if ($endval_done);
#print "MATCHER $matcher matches:\n" . join("\n", @matches) . NL; # print "\nMatch-line: $end_val> $match\n";
for my $end_val (split(',', $::endp_vals)) { #
my $endval_done = 0; # # no value between colon separated tags can be very
for $match (@matches) { # # confusing to parse, let's force a dumb value in if we find that
last if ($endval_done); # #if ($match =~ /[^ ]+:\s+[^ ]+:/) {
#print "\nMatch-line: $end_val> $match\n"; # # $match =~ s/([^ ]+:)\s+([^ ]+:\s+)/$1 "" $2/g;
# # #print "\n M> $match\n";
# no value between colon separated tags can be very # #}
# confusing to parse, let's force a dumb value in if we find that #
if ($match =~ /[^ ]+:\s+[^ ]+:/) { #
$match =~ s/([^ ]+:)\s+([^ ]+:\s+)/$1 "" $2/g; # ## ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- #
#print "\n M> $match\n"; # ## special cases #
} # ## ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- #
#
## ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- # # elsif ($end_val =~ /Cx Detected/) {
## special cases # # my $value = 0;
## ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- # # #print "# case 2\n";
if ($end_val =~ /Latency/) { # ($option) = ($match =~ /(Cx Detected)/);
if ($match =~ /.*Latency:\s+(.*)\s+#/) { # if (defined $option_map{ $option } ) {
my $val = $1; # $value = 0 + ($match =~ /:\s+(\d+)/)[0];
#print "val -:$val:-\n"; # $option_map{ $option } = $value;
$option_map{"Normalized-Hdr"} = $::utils->normalize_bucket_hdr(17); # $endval_done++;
$option_map{"Latency"} = $val; # last;
} # }
} # }
elsif ($end_val =~ /Pkt-Gaps/) { # elsif (($match =~ /Tx (Bytes|Pkts)/ && (($end_val =~ /tx_(bps|pps)/) || ($end_val =~ /Tx (Bytes|Pkts)/) || ($end_val =~ /(Pkts|Bytes) Sent/))) ||
if ($match =~ /.*Pkt-Gaps:\s+(.*)\s+#/) { # ($match =~ /Rx (Bytes|Pkts)/ && (($end_val =~ /rx_(bps|pps)/) || ($end_val =~ /Rx (Bytes|Pkts)/)|| ($end_val =~ /(Pkts|Bytes) Rcvd/)))) {
my $val = $1; # my $value = 0;
$option_map{"Normalized-Hdr"} = $::utils->normalize_bucket_hdr(17); # ($option) = ($match =~ /([TR]x (Bytes|Pkts))/);
$option_map{"Pkt-Gaps"} = $val; # #print "# case 3, Option: $option" . NL;
} # @parts = ($match =~ m{ Total: (\d+) +Time: \d+s\s+ Cur: (\d+) +(\d+)\/s \#$});
} # #print "\n TX: ".join(",",@parts)."\n";
elsif ($end_val =~ /RX-Silence/) { # if (defined $option_map{ $option } ) {
if ($match =~ /.*RX-Silence:\s+(.*)\s+#/) { # if (($end_val =~ /tx_(bps|pps)/ ) ||
my $val = $1; # ($end_val =~ /rx_(bps|pps)/ )) {
$option_map{"Normalized-Hdr"} = $::utils->normalize_bucket_hdr(17); # $value = 0 + $parts[2];
$option_map{"RX-Silence"} = $val; # if ($end_val =~ /bps/) {
} # $value *= 8;
} # }
elsif ($end_val =~ /Cx Detected/) { # }
my $value = 0; # else {
#print "# case 2\n"; # $value = 0 + $parts[0];
($option) = ($match =~ /(Cx Detected)/); # }
if (defined $option_map{ $option } ) { # print "\n B end_val[$end_val] option[$option] now ".$value."\n";
$value = 0 + ($match =~ /:\s+(\d+)/)[0]; # $option_map{ $end_val } = $value;
$option_map{ $option } = $value; #
$endval_done++; # # For backwards compat with older logic
last; # if (defined($option_map{"Bytes Rcvd"})) {
} # if ($end_val eq "Rx Bytes") {
} # $option_map{"Bytes Rcvd"} = $value;
elsif (($match =~ /Tx (Bytes|Pkts)/ && (($end_val =~ /tx_(bps|pps)/) || ($end_val =~ /Tx (Bytes|Pkts)/) || ($end_val =~ /(Pkts|Bytes) Sent/))) || # }
($match =~ /Rx (Bytes|Pkts)/ && (($end_val =~ /rx_(bps|pps)/) || ($end_val =~ /Rx (Bytes|Pkts)/)|| ($end_val =~ /(Pkts|Bytes) Rcvd/)))) { # }
my $value = 0; # $endval_done++;
($option) = ($match =~ /([TR]x (Bytes|Pkts))/); # last;
#print "# case 3, Option: $option" . NL; # }
@parts = ($match =~ m{ Total: (\d+) +Time: \d+s\s+ Cur: (\d+) +(\d+)\/s \#$}); # }
#print "\n TX: ".join(",",@parts)."\n"; # elsif ($match =~ / [TR][Xx] (((OOO|Duplicate|Failed) (Bytes|Pkts))|Wrong Dev|CRC Failed|Bit Errors|Dropped)/
if (defined $option_map{ $option } ) { # || $match =~ /Conn (Established|Timeouts)|TCP Retransmits/) {
if (($end_val =~ /tx_(bps|pps)/ ) || # my $value = 0;
($end_val =~ /rx_(bps|pps)/ )) { # ($option) = ($match =~ /([TR][Xx] (((OOO|Duplicate|Failed) (Bytes|Pkts))|Wrong Dev|CRC Failed|Bit Errors|Dropped)|Conn (Established|Timeouts)|TCP Retransmits)/);
$value = 0 + $parts[2]; # @parts = $match =~ m{ Total: (\d+) +Time: \d+s\s+ Cur: (\d+) +(\d+)\/s \#$};
if ($end_val =~ /bps/) { # #print "\n# case 4 TX: ".join(",",@parts)."\n";
$value *= 8; # if (defined $option_map{ $option } ) {
} # #print "$match\n";
} # $match =~ s/""/ /g;
else { # ($option_map{ $option }) = $match =~/.*?:\s+(.*?)\s+\#$/;
$value = 0 + $parts[0]; # $endval_done++;
} # last;
print "\n B end_val[$end_val] option[$option] now ".$value."\n"; # }
$option_map{ $end_val } = $value; # }
# elsif ($match =~ /(Bytes|Packets) (Rcvd|Transmitted)/ ) {
# For backwards compat with older logic # ($option) = ($match =~ /((Bytes|Packets) (Rcvd|Transmitted))/);
if (defined($option_map{"Bytes Rcvd"})) { # @parts = ($match =~ m{ Total: (\d+) +Time: \d+s\s+ Cur: (\d+) +(\d+)\/s \#$});
if ($end_val eq "Rx Bytes") { # #print "\n# case 5 TX: ".join(",",@parts)."\n";
$option_map{"Bytes Rcvd"} = $value; # my $value = 0;
} # if (defined $option_map{ $option } ) {
} # if ($end_val =~ /rx_(bps|pps)/ ) {
$endval_done++; # $value = 0 + $parts[2];
last; # }
} # elsif ($end_val =~ /rx_(byte|pkt|packet)s/ ) {
} # $value = 0 + $parts[0];
elsif ($match =~ / [TR][Xx] (((OOO|Duplicate|Failed) (Bytes|Pkts))|Wrong Dev|CRC Failed|Bit Errors|Dropped)/ # }
|| $match =~ /Conn (Established|Timeouts)|TCP Retransmits/) { # if ($option eq "Bytes Rcvd") {
my $value = 0; # if ($end_val =~ /rx_bps/ ) {
($option) = ($match =~ /([TR][Xx] (((OOO|Duplicate|Failed) (Bytes|Pkts))|Wrong Dev|CRC Failed|Bit Errors|Dropped)|Conn (Established|Timeouts)|TCP Retransmits)/); # $value *= 8;
@parts = $match =~ m{ Total: (\d+) +Time: \d+s\s+ Cur: (\d+) +(\d+)\/s \#$}; # }
#print "\n# case 4 TX: ".join(",",@parts)."\n"; # }
if (defined $option_map{ $option } ) { # $option_map{ $option } = $value;
#print "$match\n"; # $endval_done++;
$match =~ s/""/ /g; # last;
($option_map{ $option }) = $match =~/.*?:\s+(.*?)\s+\#$/; # }
$endval_done++; # }
last; # else {
} # $match =~ s/Shelf: (\d+), /Shelf: $1 /
} # if ($match =~ /^\s*Shelf:/ );
elsif ($match =~ /(Bytes|Packets) (Rcvd|Transmitted)/ ) { #
($option) = ($match =~ /((Bytes|Packets) (Rcvd|Transmitted))/); # $match =~ s/(Endpoint|PktsToSend): (\d+) /$1: $2 /
@parts = ($match =~ m{ Total: (\d+) +Time: \d+s\s+ Cur: (\d+) +(\d+)\/s \#$}); # if ($match =~ /\s*(Endpoint|PktsToSend):/ );
#print "\n# case 5 TX: ".join(",",@parts)."\n"; #
my $value = 0; # if ($match =~ /((Src|Dst)Mac): /) {
if (defined $option_map{ $option } ) { # my ($name1, $mac1) = ( $match =~ /(...Mac): (.*?) /);
if ($end_val =~ /rx_(bps|pps)/ ) { # $mac1 =~ s/ /-/g;
$value = 0 + $parts[2]; # $match =~ s/(...Mac): (.. .. .. .. .. ..) /$1: $mac1 /;
} # }
elsif ($end_val =~ /rx_(byte|pkt|packet)s/ ) { # if ($match =~ /FileName: .*? SendBadCrc: /) {
$value = 0 + $parts[0]; # my $filename1 = '';
} # ($filename1) =~ /FileName: (.*?) SendBadCrc.*$/;
if ($option eq "Bytes Rcvd") { # $filename1 = '""' if ($filename1 =~ /^ *$/);
if ($end_val =~ /rx_bps/ ) { # $match =~ s/(FileName): (.*?) (SendBadCrc.*)$/$1: $filename1 $3/;
$value *= 8; # }
} # $match =~ s/CWND: (\d+) /CWND: $1 /
} # if ($match =~/CWND: (\d+) /);
$option_map{ $option } = $value; # # ~specials
$endval_done++; #
last; # #print " match: $match\n";
} # if ($match =~ /.*$end_val:\s+(\S+)/) {
} # my $value = $1;
else { # #print " Found value: $value for key: $end_val\n";
$match =~ s/Shelf: (\d+), /Shelf: $1 / # $option_map{ $end_val } = $value;
if ($match =~ /^\s*Shelf:/ ); # $endval_done++;
# }
$match =~ s/(Endpoint|PktsToSend): (\d+) /$1: $2 / # }
if ($match =~ /\s*(Endpoint|PktsToSend):/ ); # } # ~matches
# } # ~endp_vals
if ($match =~ /((Src|Dst)Mac): /) {
my ($name1, $mac1) = ( $match =~ /(...Mac): (.*?) /);
$mac1 =~ s/ /-/g;
$match =~ s/(...Mac): (.. .. .. .. .. ..) /$1: $mac1 /;
}
if ($match =~ /FileName: .*? SendBadCrc: /) {
my $filename1 = '';
($filename1) =~ /FileName: (.*?) SendBadCrc.*$/;
$filename1 = '""' if ($filename1 =~ /^ *$/);
$match =~ s/(FileName): (.*?) (SendBadCrc.*)$/$1: $filename1 $3/;
}
$match =~ s/CWND: (\d+) /CWND: $1 /
if ($match =~/CWND: (\d+) /);
# ~specials
#print " match: $match\n";
if ($match =~ /.*$end_val:\s+(\S+)/) {
my $value = $1;
#print " Found value: $value for key: $end_val\n";
$option_map{ $end_val } = $value;
$endval_done++;
}
}
} # ~matches
} # ~endp_vals
for $option ( sort keys %option_map ) { for $option ( sort keys %option_map ) {
print $option.": ".$option_map{ $option }.$::NL; print $option.": ".$option_map{ $option }."\n";
} }
} }
else { else {
@@ -682,6 +689,7 @@ elsif ($::action eq "show_cx") {
$::test_mgr = "default_tm"; $::test_mgr = "default_tm";
} }
my $cmd = $::utils->fmt_cmd("show_cxe", $::test_mgr, $::cx_name ); my $cmd = $::utils->fmt_cmd("show_cxe", $::test_mgr, $::cx_name );
#print "$cmd\n";
print $::utils->doAsyncCmd($cmd)."\n"; print $::utils->doAsyncCmd($cmd)."\n";
} }
elsif ($::action eq "create_cx") { elsif ($::action eq "create_cx") {