perfsonar development work

Author: dfn.calim
Date: 2010-09-16 11:48:49 +0100 (Thu, 16 Sep 2010)
New Revision: 628

Added:
   
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/bwctl-test-ARNES
   
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/bwctl-test-calim
   
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-raw-req-01.xml
   
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-summary-req-01.xml
   
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-summary-req-02.xml
Removed:
   
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-ind-req.xml
   
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-ind2-req.xml
   
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-machine-req.xml
   
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-raw-req.xml
   branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-req.xml
Modified:
   branches/perfsonar-oppd-new-architect/bin/oppd.pl
   branches/perfsonar-oppd-new-architect/lib/NMWG/schema/2.0/owamp.rnc
   branches/perfsonar-oppd-new-architect/lib/perfSONAR/DataStruct/NMWG.pm
   branches/perfsonar-oppd-new-architect/lib/perfSONAR/Echo.pm
   branches/perfsonar-oppd-new-architect/lib/perfSONAR/MP.pm
   branches/perfsonar-oppd-new-architect/lib/perfSONAR/MP/BWCTL.pm
   branches/perfsonar-oppd-new-architect/lib/perfSONAR/MP/OWAMP.pm
Log:
New request messages added. 2.Some error control added for request messages

Modified: branches/perfsonar-oppd-new-architect/bin/oppd.pl
===================================================================
--- branches/perfsonar-oppd-new-architect/bin/oppd.pl   2010-09-08 07:24:08 
UTC (rev 627)
+++ branches/perfsonar-oppd-new-architect/bin/oppd.pl   2010-09-16 10:48:49 
UTC (rev 628)
@@ -838,8 +838,7 @@
       my $nmwg_response;
       if ($ds->{ERROROCCUR}){
        #Do here response on error
-       $log->error("A error occured in creating data struct");
-       $log->error("$ds->{ERROROCCUR}");
+       $logger->error("A error occured in creating data struct");
       }else{
         $ds->{SERVICES} = \%services;
         #Run $ds

Modified: branches/perfsonar-oppd-new-architect/lib/NMWG/schema/2.0/owamp.rnc
===================================================================
--- branches/perfsonar-oppd-new-architect/lib/NMWG/schema/2.0/owamp.rnc 
2010-09-08 07:24:08 UTC (rev 627)
+++ branches/perfsonar-oppd-new-architect/lib/NMWG/schema/2.0/owamp.rnc 
2010-09-16 10:48:49 UTC (rev 628)
@@ -6,7 +6,7 @@
 
 
 namespace nmwg = "http://ggf.org/ns/nmwg/base/2.0/";
-namespace owamp = "http://ggf.org/ns/nmwg/tools/bwctl/2.0/";
+namespace owamp = "http://ggf.org/ns/nmwg/tools/owamp/2.0/";
 namespace nmwgtopo3 = "http://ggf.org/ns/nmwg/topology/base/3.0/";
 namespace nmwgt = "http://ggf.org/ns/nmwg/topology/2.0/";
 

Modified: 
branches/perfsonar-oppd-new-architect/lib/perfSONAR/DataStruct/NMWG.pm
===================================================================
--- branches/perfsonar-oppd-new-architect/lib/perfSONAR/DataStruct/NMWG.pm    
  2010-09-08 07:24:08 UTC (rev 627)
+++ branches/perfsonar-oppd-new-architect/lib/perfSONAR/DataStruct/NMWG.pm    
  2010-09-16 10:48:49 UTC (rev 628)
@@ -59,11 +59,15 @@
        my $self = {};
        $self->{LOGGER} = get_logger( $CLASSPATH );
        
+       $self->{NS}->{MPBWCTL} = "http://ggf.org/ns/nmwg/tools/iperf/2.0/";;
+       $self->{NS}->{MPOWAMP} = "http://ggf.org/ns/nmwg/tools/owamp/2.0/";;
+       
+       
        push @{$self->{"supportedEventtypes"}},
 
-    ("bwctl",
-    "http://ggf.org/ns/nmwg/tools/bwctl/2.0/";,
+    ("http://ggf.org/ns/nmwg/tools/bwctl/2.0/";,
     "http://ggf.org/ns/nmwg/tools/iperf/2.0/";,
+    "http://ggf.org/ns/nmwg/tools/owamp/2.0/";,
     "owamp",
     "bwctl",
     "http://schemas.perfsonar.net/tools/admin/echo/2.0";
@@ -85,6 +89,10 @@
     $ds->{DSTYPE} = 'NMWG';
     $ds->{REQUESTMSG} = $nmwg;
     
+    ($ds->{SERVICE} = $ds->{URI}) =~ s/^.*\/services\///;
+    $ds->{SERVICE} =~ s/\/$//;
+    $self->{LOGGER}->info("Requested service: $ds->{SERVICE}");
+    
     #Check messagetype
     if (!$self->NMWGcheckMessagetype($messagetype,\$ds)){
        $self->{LOGGER}->error("Error in checking message type");
@@ -95,17 +103,8 @@
     }
     
     #Now get the new messagetype
-    $messagetype = $ds->{REQUESTMSG}->get_message_type();
-    
-    
-    ($ds->{SERVICE} = $ds->{URI}) =~ s/^.*\/services\///;
-    $ds->{SERVICE} =~ s/\/$//;
-    $self->{LOGGER}->info("Requested service: $ds->{SERVICE}");
-    
-    if (!$ds->{SERVICE}){
-        croak "Service $self->{SERVICE} not known!";
-    }
-        
+    $messagetype = $ds->{REQUESTMSG}->get_message_type();   
+            
     my @module_ets = @{$self->{"supportedEventtypes"}};        
     
     #create {"dataIDs"} and {"metadataIDs"}
@@ -181,7 +180,7 @@
     #add metadata parameters to data hashes
     ($errorstring, $metaid) = $ds->{REQUESTMSG}->concatenate_params;
     if ($errorstring){
-        $self->{LOGGER}->info($errorstring);
+        $self->{LOGGER}->error($errorstring);
         $ds->{REQUESTMSG}->return_result_code("error.common.parse_error", 
"$errorstring", $metaid);
         $ds->{ERROROCCUR} = 1;
         return;
@@ -292,6 +291,15 @@
     }
     elsif ($messagetype eq "MetadataKeyRequest"){
         $$ds->{REQUESTMSG}->set_message_type("MetadataKeyResponse");
+        
+        #MetadataKeyRequest to MP are not allowed
+        if ($$ds->{SERVICE}  =~ /MP/){
+                my $errorstring = "MetadataKeyRequest to MP service is not 
supported";
+            $self->{LOGGER}->error($errorstring);
+            $$ds->{REQUESTMSG}->set_message_type("ErrorResponse");
+            $$ds->{ERRMSG} = $errorstring;
+            return 0;
+        }
     }
     elsif ($messagetype =~ /EchoRequest/){
         $$ds->{REQUESTMSG}->set_message_type("EchoResponse");
@@ -369,10 +377,15 @@
 
 sub parseResult{
        my ($self, $ds) = @_;
-       #TODO USE namespace and not eventtype
-       my $ns = $self->{EVENTTYPE};
+       
+       my $ns_serivce = $$ds->{SERVICE};
+       $ns_serivce =~ s/\///;
+       my $ns = $self->{NS}->{$ns_serivce};
     my $params = $$ds->{PARAMS};
     
+    #Do here all for MetakeyDataRequest
+    my $messagetype = $$ds->{REQUESTMSG}->get_message_type();
+    
     foreach my $id (keys %{$params}){
           my $datalines_ref = $$ds->{PARAMS}->{$id}->{MRESULT}; #Returns a 
ref to array
           if ($$ds->{DOECHO} == 1){               
@@ -383,6 +396,7 @@
                   $$ds->{REQUESTMSG}->return_result_code($et, 
"@$datalines_ref", $$ds->{REQUESTMSG}->{"dataIDs"}{$id}{"metaref"});
           }else{       
               $$ds->{REQUESTMSG}->set_data_ns ($id, $ns, @$datalines_ref);
+              #$$ds->{REQUESTMSG}->set_data ($id, @$datalines_ref);
           }
           #$self->{LOGGER}->debug(Dumper(@$datalines_ref));
     }  

Modified: branches/perfsonar-oppd-new-architect/lib/perfSONAR/Echo.pm
===================================================================
--- branches/perfsonar-oppd-new-architect/lib/perfSONAR/Echo.pm 2010-09-08 
07:24:08 UTC (rev 627)
+++ branches/perfsonar-oppd-new-architect/lib/perfSONAR/Echo.pm 2010-09-16 
10:48:49 UTC (rev 628)
@@ -62,4 +62,14 @@
     }
     
 }
+
+
+=head2 doselftests({})
+This method is used to get status for the called service tool. 
+Start this method in the service so settings from this service is used.
+=cut
+sub doselftests{
+    
+}
+
 1;

Modified: branches/perfsonar-oppd-new-architect/lib/perfSONAR/MP/BWCTL.pm
===================================================================
--- branches/perfsonar-oppd-new-architect/lib/perfSONAR/MP/BWCTL.pm     
2010-09-08 07:24:08 UTC (rev 627)
+++ branches/perfsonar-oppd-new-architect/lib/perfSONAR/MP/BWCTL.pm     
2010-09-16 10:48:49 UTC (rev 628)
@@ -164,12 +164,13 @@
   my @result = split(/\n/, $result);
   my @datalines;
   my $time = time;
-  my %data_hash;
   
+  
   foreach my $resultline (@result){
     next unless  ($resultline =~
         
/(\d+\.\d+\s*\-\s*\d+\.\d+)\s+sec\s+(\d+\.?\d*)\s+(\w+)\s+(\d+\.?\d*)\s+(\w+\/\w+)/);
 
+    my %data_hash;
     
     $data_hash{"timeType"} = "unix";
     $data_hash{"timeValue"} = $time;
@@ -183,16 +184,12 @@
   if($#datalines < 0){
     #no data -> something wrong, write result as error description:
     $datalines[0]="BWCTL Error:";
-    push @datalines, @result;
-        
-  } 
-  
-  if ($datalines[0] eq "BWCTL Error:"){
-    my $errorstring = "@datalines";
+    my $errorstring = "@result";
     $errorstring =~ s/usage.*$//;
     $$ds->{ERROROCCUR} = 1;
     $self->{LOGGER}->error($errorstring);
-    push @datalines,"error.mp.bwctl";
+    push @datalines, @result;
+    push @datalines,"error.mp.bwctl";        
   }    
   return @datalines;
 } 

Modified: branches/perfsonar-oppd-new-architect/lib/perfSONAR/MP/OWAMP.pm
===================================================================
--- branches/perfsonar-oppd-new-architect/lib/perfSONAR/MP/OWAMP.pm     
2010-09-08 07:24:08 UTC (rev 627)
+++ branches/perfsonar-oppd-new-architect/lib/perfSONAR/MP/OWAMP.pm     
2010-09-16 10:48:49 UTC (rev 628)
@@ -92,9 +92,8 @@
     push @commandline, "-N", $parameters{intermediates} if 
$parameters{intermediates};
     
     #Look for the output type
-    if ($parameters{"output"} && $parameters{"output"} eq "per_packet"){
-       push @commandline, "-v";
-       $self->{OUTPUTTYPE} =  "per_packet";
+    if ($parameters{"output"} && $parameters{"output"} eq "summary"){
+       $self->{OUTPUTTYPE} =  "summary";
     }
     elsif ($parameters{"output"} && ($parameters{"output"} eq 
"machine_readable")){
        push @commandline, "-M";
@@ -112,7 +111,8 @@
     }
     else{
        #No output type defined
-       $self->{OUTPUTTYPE} =  "default";
+       push @commandline, "-R";
+        $self->{OUTPUTTYPE} =  "raw";
     }
     
     push @commandline, "-P", $parameters{portrange} if 
$parameters{portrange};
@@ -174,14 +174,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{"seq_number"} = $1;
+                $data_hash{"sequenceNumber"} = $1;
                 $data_hash{"send_time"} = $2;
                 $data_hash{"sender_sync"} = $3;
                 $data_hash{"sender_error"} = $4;
                 $data_hash{"receive_time"} = $5;
                 $data_hash{"receiver_sync"} = $6;
                 $data_hash{"receiver_error"} = $7;
-                $data_hash{"TTL"} = $8;
+                $data_hash{"packetTTL"} = $8;
                 push @datalines, \%data_hash;
             } #End foreach
        }#End if 
@@ -227,21 +227,20 @@
        }# End foreach
                        
     }#End if
-    else{
+    elsif ($self->{OUTPUTTYPE} eq  "summary"){
+       my %data_hash;
        foreach my $resultline (@result){            
             if ($resultline =~
                 #10 sent, 0 lost (0.000%), 0 duplicates
                 
/(\d+)\s+sent,\s+(\d+)\s+lost\s+\((\S+)\),\s+(\d+)\s+duplicates/){
-                my %data_hash;
                 $data_hash{"number_of_packets"} = $1;
                 $data_hash{"lost_packets"} = $2;
                 $data_hash{"lost_percent"} = $3;
                 $data_hash{"duplicate_packets"} = $4;
-                push @datalines, \%data_hash;
+                #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 %data_hash;
                 my $delay = $1;
                 my ($min,$med,$max) = split ("/", $delay);
                 $data_hash{"delay_min"} = $min;
@@ -250,9 +249,10 @@
                 $data_hash{"delay_units"} = $2;
                 $data_hash{"error"} = $3;
                 $data_hash{"error_units"} = $4;
-                push @datalines, \%data_hash;
+                #push @datalines, \%data_hash;
             } else { next; }
        }#End foreach
+       push @datalines, \%data_hash;
     }#End else
     
   

Modified: branches/perfsonar-oppd-new-architect/lib/perfSONAR/MP.pm
===================================================================
--- branches/perfsonar-oppd-new-architect/lib/perfSONAR/MP.pm   2010-09-08 
07:24:08 UTC (rev 627)
+++ branches/perfsonar-oppd-new-architect/lib/perfSONAR/MP.pm   2010-09-16 
10:48:49 UTC (rev 628)
@@ -115,10 +115,10 @@
         finish $h;
         
         if (!$out){
-            $$ds->{PARAMS}->{$id}->{MEASRESULT}  = "$err_tmp" . "$err";
+            $$ds->{PARAMS}->{$id}->{MEASRESULT}  = "$err";
         }
         else{
-               $$ds->{PARAMS}->{$id}->{MEASRESULT} = "$out_tmp" . "$out";
+               $$ds->{PARAMS}->{$id}->{MEASRESULT} = "$out";
         }
         #$logger->info(Dumper($out));
         #parse the result

Copied: 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/bwctl-test-ARNES 
(from rev 625, 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/bwctl-test)
===================================================================
--- 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/bwctl-test-ARNES 
                              (rev 0)
+++ 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/bwctl-test-ARNES 
      2010-09-16 10:48:49 UTC (rev 628)
@@ -0,0 +1 @@
+./perfsonar-client.pl --reqfile=$1 
--uri=http://193.2.63.2:8090/services/MP/BWCTL 

Copied: 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/bwctl-test-calim 
(from rev 625, 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/bwctl-test)
===================================================================
--- 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/bwctl-test-calim 
                              (rev 0)
+++ 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/bwctl-test-calim 
      2010-09-16 10:48:49 UTC (rev 628)
@@ -0,0 +1 @@
+./perfsonar-client.pl --reqfile=$1 
--uri=http://calim.rrze.uni-erlangen.de:8090/services/MP/BWCTL 
--host=calim.rrze.uni-erlangen.de --port=80900

Deleted: 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-ind-req.xml
===================================================================
--- 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-ind-req.xml
      2010-09-08 07:24:08 UTC (rev 627)
+++ 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-ind-req.xml
      2010-09-16 10:48:49 UTC (rev 628)
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<nmwg:message type="SetupDataRequest"
-                   id="datarq2-1"
-                   xmlns="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
-                   
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
-                   xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
-                   xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
-                   xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
-                   xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
-
-  <nmwg:metadata id="meta1">
-    <perfsonar:subject id="subj1">
-      <nmwgt:endPointPair>
-        <nmwgt:src type="ipv4" value="131.188.81.61"/>
-        <nmwgt:dst type="ipv4" value="131.188.81.14"/>
-      </nmwgt:endPointPair>
-    </perfsonar:subject>
-
-    <nmwg:eventType>owamp</nmwg:eventType>
-    <nmwg:parameters id="param1">
-      <nmwg:parameter name="individual" value="delay"/>
-      <nmwg:parameter name="port" value="6767"/>
-    </nmwg:parameters>
-  </nmwg:metadata>
-
-  <!-- triggers to indicate head of chains -->
-  <nmwg:data id="1" metadataIdRef="meta1"/>
-
-
-</nmwg:message>
-

Deleted: 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-ind2-req.xml
===================================================================
--- 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-ind2-req.xml
     2010-09-08 07:24:08 UTC (rev 627)
+++ 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-ind2-req.xml
     2010-09-16 10:48:49 UTC (rev 628)
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<nmwg:message type="SetupDataRequest"
-                   id="datarq2-1"
-                   xmlns="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
-                   
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
-                   xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
-                   xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
-                   xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
-                   xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
-
-  <nmwg:metadata id="meta1">
-    <perfsonar:subject id="subj1">
-      <nmwgt:endPointPair>
-        <nmwgt:src type="ipv4" value="131.188.81.34"/>
-        <nmwgt:dst type="ipv4" value="131.188.81.178"/>
-      </nmwgt:endPointPair>
-    </perfsonar:subject>
-
-    <nmwg:eventType>owamp</nmwg:eventType>
-    <nmwg:parameters id="param1">
-      <nmwg:parameter name="individual" value="timestamps"/>
-      <nmwg:parameter name="port" value="861"/>
-      <nmwg:parameter name="count" value="33"/>
-    </nmwg:parameters>
-  </nmwg:metadata>
-
-  <!-- triggers to indicate head of chains -->
-  <nmwg:data id="1" metadataIdRef="meta1"/>
-
-
-   <nmwg:metadata id="meta2">
-    <perfsonar:subject id="subj2">
-      <nmwgt:endPointPair>
-        <nmwgt:src type="ipv4" value="131.188.81.34"/>
-        <nmwgt:dst type="ipv4" value="142.104.63.180"/>
-      </nmwgt:endPointPair>
-    </perfsonar:subject>
-
-    <nmwg:eventType>owamp</nmwg:eventType>
-    <nmwg:parameters id="param2">
-      <nmwg:parameter name="port" value="861"/>
-      <nmwg:parameter name="count" value="200"/>
-    </nmwg:parameters>
-  </nmwg:metadata>
-
-  <!-- triggers to indicate head of chains -->
-  <nmwg:data id="2" metadataIdRef="meta2"/>
-</nmwg:message>
-

Deleted: 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-machine-req.xml
===================================================================
--- 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-machine-req.xml
  2010-09-08 07:24:08 UTC (rev 627)
+++ 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-machine-req.xml
  2010-09-16 10:48:49 UTC (rev 628)
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<nmwg:message type="SetupDataRequest"
-                   id="datarq2-1"
-                   xmlns="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
-                   
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
-                   xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
-                   xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
-                   xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
-                   xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
-
-  <nmwg:metadata id="meta1">
-    <perfsonar:subject id="subj1">
-      <nmwgt:endPointPair>
-        <nmwgt:src type="ipv4" value="131.188.81.34"/>
-        <nmwgt:dst type="ipv4" value="131.188.81.178"/>
-      </nmwgt:endPointPair>
-    </perfsonar:subject>
-
-    <nmwg:eventType>owamp</nmwg:eventType>
-    <nmwg:parameters id="param1">
-      <nmwg:parameter name="output" value="machine_readable"/>
-      <nmwg:parameter name="count" value="10"/>
-    </nmwg:parameters>
-  </nmwg:metadata>
-
-  <!-- triggers to indicate head of chains -->
-  <nmwg:data id="1" metadataIdRef="meta1"/>
-
-
-</nmwg:message>
-

Copied: 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-raw-req-01.xml
 (from rev 619, 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-ind-req.xml)
===================================================================
--- 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-raw-req-01.xml
                           (rev 0)
+++ 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-raw-req-01.xml
   2010-09-16 10:48:49 UTC (rev 628)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<nmwg:message type="SetupDataRequest"
+                   id="datarq2-1"
+                   xmlns="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
+                   
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
+                   xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+                   xmlns:owamp="http://ggf.org/ns/nmwg/tools/owamp/2.0/";
+                   xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
+                   xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
+                   xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
+
+  <nmwg:metadata id="meta1">
+    <perfsonar:subject id="subj1">
+      <nmwgt:endPointPair>
+        <nmwgt:src type="ipv4" value="131.188.81.34"/>
+        <nmwgt:dst type="ipv4" value="131.188.81.178"/>
+      </nmwgt:endPointPair>
+    </perfsonar:subject>
+
+    <nmwg:eventType>http://ggf.org/ns/nmwg/tools/owamp/2.0</nmwg:eventType>
+    <nmwg:parameters id="param1">
+      <nmwg:parameter name="count" value="10"/>
+    </nmwg:parameters>
+  </nmwg:metadata>
+
+  <!-- triggers to indicate head of chains -->
+  <nmwg:data id="1" metadataIdRef="meta1"/>
+
+  <!-- Second measurement -->
+  
+  <nmwg:metadata id="meta2">
+    <perfsonar:subject id="subj2">
+      <nmwgt:endPointPair>
+        <nmwgt:src type="ipv4" value="131.188.81.34"/>
+        <nmwgt:dst type="ipv4" value="82.130.1.234:861"/>
+      </nmwgt:endPointPair>
+    </perfsonar:subject>
+
+    <nmwg:eventType>http://ggf.org/ns/nmwg/tools/owamp/2.0</nmwg:eventType>
+    <nmwg:parameters id="param1">
+      <nmwg:parameter name="count" value="20"/>
+    </nmwg:parameters>
+  </nmwg:metadata>
+
+  <!-- triggers to indicate head of chains -->
+  <nmwg:data id="2" metadataIdRef="meta2"/>
+
+</nmwg:message>
+

Deleted: 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-raw-req.xml
===================================================================
--- 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-raw-req.xml
      2010-09-08 07:24:08 UTC (rev 627)
+++ 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-raw-req.xml
      2010-09-16 10:48:49 UTC (rev 628)
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<nmwg:message type="SetupDataRequest"
-                   id="datarq2-1"
-                   xmlns="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
-                   
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
-                   xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
-                   xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
-                   xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
-                   xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
-
-  <nmwg:metadata id="meta1">
-    <perfsonar:subject id="subj1">
-      <nmwgt:endPointPair>
-        <nmwgt:src type="ipv4" value="131.188.81.34"/>
-        <nmwgt:dst type="ipv4" value="131.188.81.178"/>
-      </nmwgt:endPointPair>
-    </perfsonar:subject>
-
-    <nmwg:eventType>owamp</nmwg:eventType>
-    <nmwg:parameters id="param1">
-      <nmwg:parameter name="output" value="raw"/>
-      <nmwg:parameter name="count" value="10"/>
-    </nmwg:parameters>
-  </nmwg:metadata>
-
-  <!-- triggers to indicate head of chains -->
-  <nmwg:data id="1" metadataIdRef="meta1"/>
-
-
-</nmwg:message>
-

Deleted: 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-req.xml
===================================================================
--- 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-req.xml  
2010-09-08 07:24:08 UTC (rev 627)
+++ 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-req.xml  
2010-09-16 10:48:49 UTC (rev 628)
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<nmwg:message type="SetupDataRequest"
-                   id="datarq2-1"
-                   xmlns="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
-                   
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
-                   xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
-                   xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
-                   xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
-                   xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
-
-  <nmwg:metadata id="meta1">
-    <perfsonar:subject id="subj1">
-      <nmwgt:endPointPair>
-        <nmwgt:src type="ipv4" value="131.188.81.61"/>
-        <nmwgt:dst type="ipv4" value="131.188.81.14"/>
-      </nmwgt:endPointPair>
-    </perfsonar:subject>
-
-    <nmwg:eventType>owamp</nmwg:eventType>
-    <nmwg:parameters id="param1">
-      <nmwg:parameter name="port" value="6767"/>
-    </nmwg:parameters>
-  </nmwg:metadata>
-
-  <!-- triggers to indicate head of chains -->
-  <nmwg:data id="1" metadataIdRef="meta1"/>
-
-
-</nmwg:message>
-

Copied: 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-summary-req-01.xml
 (from rev 619, 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-ind-req.xml)
===================================================================
--- 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-summary-req-01.xml
                               (rev 0)
+++ 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-summary-req-01.xml
       2010-09-16 10:48:49 UTC (rev 628)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<nmwg:message type="SetupDataRequest"
+                   id="datarq2-1"
+                   xmlns="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
+                   
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
+                   xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+                  xmlns:owamp="http://ggf.org/ns/nmwg/tools/owamp/2.0/";
+                   xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
+                   xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
+                   xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
+
+  <nmwg:metadata id="meta1">
+    <perfsonar:subject id="subj1">
+      <nmwgt:endPointPair>
+        <nmwgt:src type="ipv4" value="131.188.81.34"/>
+        <nmwgt:dst type="ipv4" value="131.188.81.178"/>
+      </nmwgt:endPointPair>
+    </perfsonar:subject>
+
+    <nmwg:eventType>http://ggf.org/ns/nmwg/tools/owamp/2.0</nmwg:eventType>
+    <nmwg:parameters id="param1">
+      <nmwg:parameter name="count" value="10"/>
+      <nmwg:parameter name="output" value="summary"/>     
+    </nmwg:parameters>
+  </nmwg:metadata>
+
+  <!-- triggers to indicate head of chains -->
+  <nmwg:data id="1" metadataIdRef="meta1"/>
+
+
+</nmwg:message>
+

Copied: 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-summary-req-02.xml
 (from rev 619, 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-ind-req.xml)
===================================================================
--- 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-summary-req-02.xml
                               (rev 0)
+++ 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-summary-req-02.xml
       2010-09-16 10:48:49 UTC (rev 628)
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<nmwg:message type="SetupDataRequest"
+                   id="datarq2-1"
+                   xmlns="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
+                   
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
+                   xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+                  xmlns:owamp="http://ggf.org/ns/nmwg/tools/owamp/2.0/";
+                   xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
+                   xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
+                   xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
+
+  <nmwg:metadata id="meta1">
+    <perfsonar:subject id="subj1">
+      <nmwgt:endPointPair>
+        <nmwgt:src type="ipv4" value="131.188.81.34"/>
+        <nmwgt:dst type="ipv4" value="131.188.81.178"/>
+      </nmwgt:endPointPair>
+    </perfsonar:subject>
+
+    <nmwg:eventType>http://ggf.org/ns/nmwg/tools/owamp/2.0</nmwg:eventType>
+    <nmwg:parameters id="param1">
+      <nmwg:parameter name="count" value="10"/>
+      <nmwg:parameter name="output" value="summary"/>     
+    </nmwg:parameters>
+  </nmwg:metadata>
+
+  <!-- triggers to indicate head of chains -->
+  <nmwg:data id="1" metadataIdRef="meta1"/>
+  
+  <!-- Second measurement -->
+  
+  <nmwg:metadata id="meta2">
+    <perfsonar:subject id="subj2">
+      <nmwgt:endPointPair>
+        <nmwgt:src type="ipv4" value="131.188.81.34"/>
+        <nmwgt:dst type="ipv4" value="82.130.1.234:861"/>
+      </nmwgt:endPointPair>
+    </perfsonar:subject>
+
+    <nmwg:eventType>http://ggf.org/ns/nmwg/tools/owamp/2.0</nmwg:eventType>
+    <nmwg:parameters id="param1">
+      <nmwg:parameter name="count" value="20"/> <!-- number of test packets 
-->
+      <nmwg:parameter name="output" value="summary"/> 
+      <nmwg:parameter name="startdelay" value="3"/> <!-- time to wait before 
executing test (seconds) -->
+    </nmwg:parameters>
+  </nmwg:metadata>
+
+  <!-- triggers to indicate head of chains -->
+  <nmwg:data id="2" metadataIdRef="meta2"/>
+
+</nmwg:message>
+