perfsonar development work

Author: dfn.calim
Date: 2011-04-13 07:42:29 +0100 (Wed, 13 Apr 2011)
New Revision: 698

Modified:
   trunk/lib/perfSONAR/MP/OWAMP.pm
Log:
some bug fix in Owamp summary response

Modified: trunk/lib/perfSONAR/MP/OWAMP.pm
===================================================================
--- trunk/lib/perfSONAR/MP/OWAMP.pm     2011-03-31 11:33:15 UTC (rev 697)
+++ trunk/lib/perfSONAR/MP/OWAMP.pm     2011-04-13 06:42:29 UTC (rev 698)
@@ -118,8 +118,13 @@
     push @commandline, "-P", $parameters{portrange} if 
$parameters{portrange};
     
     push @commandline, "-a" if($parameters{"percentile"});
-    push @commandline, "-f" if($parameters{"one_way"} && 
($parameters{"one_way"} eq "from"));
-    push @commandline, "-t" if($parameters{"one_way"} && 
($parameters{"one_way"} eq "to"));
+    if($parameters{"one_way"} && ($parameters{"one_way"} eq "from")){
+        push @commandline, "-f";
+    }elsif($parameters{"one_way"} && ($parameters{"one_way"} eq "to")){
+        push @commandline, "-t";
+    }else{
+        push @commandline, "-t";
+    }
     
     #Append destination
     if ($parameters{"dst"} ){
@@ -166,7 +171,7 @@
     my @result = split(/\n/, $result);
     my $time = time;
     my @datalines = ();
-    
+
     if ($self->{OUTPUTTYPE} eq  "raw"){
        foreach my $resultline (@result){
                if ($resultline =~
@@ -224,37 +229,52 @@
             
             #$self->{LOGGER}->debug(Dumper($linecount));
        }# End foreach
-                       
     }#End if
     elsif ($self->{OUTPUTTYPE} eq  "summary"){
-       my %data_hash;
+        my %data_hash;
        foreach my $resultline (@result){            
+            next if $resultline =~ /Approximately/;
+            next if $resultline =~ s/^\s+//;
+            #--- owping statistics from [131.188.81.234]:38399 to 
[198.124.252.101]:9169 ---            if ($resultline =~
             if ($resultline =~
+                
/---\s+owping\s+statistics\s+from\s+\[(\S+)\]:(\S+)\s+to\s+\[(\S+)\]:(\S+)/){
+                $data_hash{"sender"} = $1;
+                $data_hash{"receiver"} = $3; 
+            }
+            if ($resultline =~
                 #10 sent, 0 lost (0.000%), 0 duplicates
                 
/(\d+)\s+sent,\s+(\d+)\s+lost\s+\((\S+)\),\s+(\d+)\s+duplicates/){
-                $data_hash{"number_of_packets"} = $1;
-                $data_hash{"lost_packets"} = $2;
+                $data_hash{"sent"} = $1;
+                $data_hash{"loss"} = $2;
                 $data_hash{"lost_percent"} = $3;
-                $data_hash{"duplicate_packets"} = $4;
+                $data_hash{"duplicates"} = $4;
                 #push @datalines, \%data_hash;
             } elsif ($resultline =~
                 #one-way delay min/median/max = 0.202/0.4/0.582 ms, 
(err=0.628 ms)
                 /one-way delay min\/median\/max = 
(\S+\/\S+\/\S+)\s+(\w+),\s+\(err=(.+)\s+(\w+)/){
                 my $delay = $1;
                 my ($min,$med,$max) = split ("/", $delay);
-                $data_hash{"delay_min"} = $min;
-                $data_hash{"delay_med"} = $med;
-                $data_hash{"delay_max"} = $max;
+                $data_hash{"min_delay"} = $min;
+                $data_hash{"med_delay"} = $med;
+                $data_hash{"max_delay"} = $max;
                 $data_hash{"delay_units"} = $2;
                 $data_hash{"error"} = $3;
                 $data_hash{"error_units"} = $4;
                 #push @datalines, \%data_hash;
-            } else { next; }
+            }elsif ($resultline =~
+            #one-way jitter = 0.1 ms (P95-P50)
+            /one-way jitter\s+=\s+([0-9.]+)\s+(\w+)\s\(P95-P50\)/){
+                $data_hash{"jitter"} = $1;
+                $data_hash{"jitter_units"} = $2;            
+           }elsif ($resultline =~
+            #Hops = 12 (consistently)
+            /Hops =\s+(\d+)\s+\(consistently\)/){
+                $data_hash{"hops"} = $1;
+           }else { next; }
        }#End foreach
        push @datalines, \%data_hash;
-    }#End else
+    }#elsif ($self->{OUTPUTTYPE} eq  "summary"
     
-  
     if($#datalines < 0){
         #no data -> something wrong, write result as error description:
         $datalines[0]="OWAMP Error:";