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

Utils: fixes broken waitfor that didnt collect nc_show_ports output; improves debug output, improves split for get_eid_map

Browse Source
This commit is contained in:
Jed Reynolds
2020-03-18 16:21:34 -07:00
parent 1006a0f803
commit 9084131cdc
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
LANforge/Utils.pm
View File

@@ -112,9 +112,9 @@ sub doAsyncCmd {
$self->log_cli($cmd);
}
$t->print($cmd);
#my @rslt = $t->waitfor('/ \>\>RSLT:(.*)/');
my @rslt = $t->waitfor('/ \>\>RSLT:(.*)/');
my @rslt2 = $t->waitfor( $self->async_waitfor() );
@rv = ( @rslt2 );
@rv = (@rslt, @rslt2);
if ( !$self->cli_rcv_silent() ) {
print "**************\n @rv \n................\n\n";
@@ -375,7 +375,6 @@ sub updateEndpoint {
$ep = $self->doAsyncCmd( "show_endpoint " . $endp->name() );
}
else {
# Use the non-caching endpoint show.
$ep = $self->doAsyncCmd( "nc_show_endpoint " . $endp->name() );
@@ -430,7 +429,7 @@ sub log_cli {
}
}
if ($using_stdout == 1 || !isQuiet() ) {
print "\nCMD: $cmd\n"
print qq(\nCMD: \"$cmd\"\n);
}
}
@@ -514,11 +513,11 @@ sub fmt_cmd {
$rv .= ( $mod_hunk =~m/ +/) ? "'$mod_hunk' " : "$mod_hunk ";
}
if (rindex($rv, ' ', length($rv)-2) > 1) {
print STDERR "[$rv]\n";
#print STDERR "[$rv]\n";
$rv =~ s/\s+$//g;
print STDERR "[$rv]\n";
#print STDERR "[$rv]\n";
}
print STDERR "\ncmd: $rv\n" if($show_err or $::quiet ne "yes");
print STDERR qq(\nFormatted cmd: "$rv"\n) if ($show_err or $::quiet ne "yes");
return $rv;
}
@@ -580,8 +579,7 @@ sub sleep_sec {
sub get_eid_map {
my ($self, $resource) = @_;
my $rh_eid_map = {};
my @ports_lines = split("\n", $self->doAsyncCmd("nc_show_ports 1 $resource ALL"));
sleep_ms(100);
my @ports_lines = split(/\r?\n/, $self->doAsyncCmd("nc_show_ports 1 $resource all"));
chomp(@ports_lines);
my ($eid, $card, $port, $type, $mac, $dev, $parent, $ip);