perfsonar development work

Author: dfn.calim
Date: 2012-11-29 14:39:04 +0000 (Thu, 29 Nov 2012)
New Revision: 778

Modified:
   branches/perfsonar-oppd-all-0.53/lib/perfSONAR/MP/OWAMP.pm
Log:
add adjusted OWAMP MP schema rnc

Modified: branches/perfsonar-oppd-all-0.53/lib/perfSONAR/MP/OWAMP.pm
===================================================================
--- branches/perfsonar-oppd-all-0.53/lib/perfSONAR/MP/OWAMP.pm  2012-11-29 
14:37:19 UTC (rev 777)
+++ branches/perfsonar-oppd-all-0.53/lib/perfSONAR/MP/OWAMP.pm  2012-11-29 
14:39:04 UTC (rev 778)
@@ -194,14 +194,14 @@
                  #SEQNO STIME SSYNC SERR RTIME RSYNC RERR TTL\n
                 /(\d+)\s*(\d+)\s*(\d+)\s(.+)\s(\d+)\s(\d+)\s(.+)\s(\d+)/){
                 my %data_hash;
-                $data_hash{"seqNum"} = $1;
+                $data_hash{"sequenceNumber"} = $1;
                 $data_hash{"sendTime"} = $2;
                 $data_hash{"sendSynchronized"} = $3;
                 $data_hash{"sendTimeError"} = $4;
                 $data_hash{"receiveTime"} = $5;
                 $data_hash{"receiveSynchronized"} = $6;
                 $data_hash{"receiveTimeError"} = $7;
-                $data_hash{"ttl"} = $8;
+                $data_hash{"packetTTL"} = $8;
                 push @datalines, \%data_hash;
             } #End foreach
        }#End if 
@@ -275,7 +275,12 @@
            /first:\s+(\d+-\d+-\d+T\d+:\d+:\d+.\d+)/){
                my $starttime = $1;
                $self->{LOGGER}->info("Starttime: $starttime");
-               $data_hash{"starttime"} = $starttime;
+               $data_hash{"startTime"} = $starttime;
+           }elsif ($resultline =~
+            #last:   2012-11-29T15:13:11.386
+            /last:\s+(\d+-\d+-\d+T\d+:\d+:\d+.\d+)/){
+           my $endTime = $1;
+           $data_hash{"endTime"} = $endTime;
             } 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+)/){
@@ -284,15 +289,15 @@
                 $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;
+                $data_hash{"timeType"} = $2;
+                $data_hash{"maxError"} = $3;
+                #$data_hash{"error_units"} = $4;
                 #push @datalines, \%data_hash;
             }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;            
+                #$data_hash{"jitter_units"} = $2;            
            }elsif ($resultline =~
             #Hops = 12 (consistently)
             /Hops =\s+(\d+)\s+\(consistently\)/){