perfsonar development work

Author: dfn.calim
Date: 2011-10-05 10:17:15 +0100 (Wed, 05 Oct 2011)
New Revision: 743

Added:
   
branches/perfsonar-oppd-all-0.53/lib/NMWG/examples/2.0/SetupDataRequest-04-owamp-store.xml
Modified:
   
branches/perfsonar-oppd-all-0.53/lib/NMWG/examples/2.0/SetupDataRequest-01-owamp.xml
   branches/perfsonar-oppd-all-0.53/lib/perfSONAR/DataStruct/NMWG.pm
Log:
add store request for owamp mp

Modified: 
branches/perfsonar-oppd-all-0.53/lib/NMWG/examples/2.0/SetupDataRequest-01-owamp.xml
===================================================================
--- 
branches/perfsonar-oppd-all-0.53/lib/NMWG/examples/2.0/SetupDataRequest-01-owamp.xml
        2011-10-04 15:11:19 UTC (rev 742)
+++ 
branches/perfsonar-oppd-all-0.53/lib/NMWG/examples/2.0/SetupDataRequest-01-owamp.xml
        2011-10-05 09:17:15 UTC (rev 743)
@@ -28,8 +28,22 @@
       <nmwg:parameter name="size" value="10"/>
     </nmwg:parameters>
   </nmwg:metadata>
+ 
+  <!-- Define here where is SQL MA -->
+  <nmwg:metadata id="meta2">
+    <perfsonar:subject id="store1" dataIdRef="1"/>
+    <nmwg:eventType>store</nmwg:eventType>
+        <nmwg:parameters id="param2">
+          <nmwg:parameter name="uri" 
value="http://radagast.x-win.dfn.de:3070/services/MA/BWCTL/GEANT"/>
+        </nmwg:parameters>
+  </nmwg:metadata>
+             
 
   <!-- triggers to indicate head of chains -->
   <nmwg:data id="1" metadataIdRef="meta1"/>
 
+  <!-- This executes the store of measurement data -->
+  <nmwg:data id="2" metadataIdRef="meta2"/>
+
+
 </nmwg:message>

Added: 
branches/perfsonar-oppd-all-0.53/lib/NMWG/examples/2.0/SetupDataRequest-04-owamp-store.xml
===================================================================
--- 
branches/perfsonar-oppd-all-0.53/lib/NMWG/examples/2.0/SetupDataRequest-04-owamp-store.xml
                          (rev 0)
+++ 
branches/perfsonar-oppd-all-0.53/lib/NMWG/examples/2.0/SetupDataRequest-04-owamp-store.xml
  2011-10-05 09:17:15 UTC (rev 743)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This request triggers the following command on the host:
+       owping -S 131.188.81.234 -c 10 -s 10 -R -t 198.124.252.101
+     This is a example to get raw data from the measurement
+     For details of response look at: SetupDataResponse-01-owamp.xml 
+-->
+<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">
+    <owamp:subject id="subj1">
+      <nmwgt:endPointPair>
+             <nmwgt:src type="ipv4" value="131.188.81.234"/> <!-- The host 
where is OWAMP M -->
+             <nmwgt:dst type="ipv4" value="198.124.252.101"/>      <!-- 
destination host -->
+      </nmwgt:endPointPair>
+    </owamp: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="size" value="10"/>
+    </nmwg:parameters>
+  </nmwg:metadata>
+
+  <!-- triggers to indicate head of chains -->
+  <nmwg:data id="1" metadataIdRef="meta1"/>
+
+</nmwg:message>

Modified: branches/perfsonar-oppd-all-0.53/lib/perfSONAR/DataStruct/NMWG.pm
===================================================================
--- branches/perfsonar-oppd-all-0.53/lib/perfSONAR/DataStruct/NMWG.pm   
2011-10-04 15:11:19 UTC (rev 742)
+++ branches/perfsonar-oppd-all-0.53/lib/perfSONAR/DataStruct/NMWG.pm   
2011-10-05 09:17:15 UTC (rev 743)
@@ -560,10 +560,10 @@
        my $store_url = undef;
        
        #OWAMP store is acctually not supported
-       if ($$ds->{SERVICE}->{NAME}  =~ /OWAMP/ ){
-               $$ds->{ERRORMSG} = "Store by OWAMP MP is actually not 
supported";
-        return 0;
-       }
+       #if ($$ds->{SERVICE}->{NAME}  =~ /OWAMP/ ){
+       #       $$ds->{ERRORMSG} = "Store by OWAMP MP is actually not 
supported";
+        #return 0;
+       #}
        if ($store_by eq "CONF"){
                $store_url = 
$$ds->{SERVICES}->{$$ds->{SERVICE}->{NAME}}->{module_param}->{store_url};