perfsonar development work

Author: hans.trompert
Date: 2007-07-25 06:19:28 -0400 (Wed, 25 Jul 2007)
New Revision: 2573

Modified:
   
trunk/perfsonar/schema/example-instances/perfSONAR/FlowsaMA/SetupDataRequest-flowStatistics.xml
   
trunk/perfsonar/schema/example-instances/perfSONAR/FlowsaMA/SetupDataRequest-rawFlows.xml
   
trunk/perfsonar/schema/example-instances/perfSONAR/FlowsaMA/SetupDataRequest-topFlows.xml
   
trunk/perfsonar/schema/example-instances/perfSONAR/FlowsaMA/SetupDataResponse-flowStatistics.xml
   
trunk/perfsonar/schema/example-instances/perfSONAR/FlowsaMA/SetupDataResponse-rawFlows.xml
   
trunk/perfsonar/schema/example-instances/perfSONAR/FlowsaMA/SetupDataResponse-topFlows.xml
Log:
version 0.10 - fixed some typos and updated to match the newly created 
FlowsaMA.rnc

Modified: 
trunk/perfsonar/schema/example-instances/perfSONAR/FlowsaMA/SetupDataRequest-flowStatistics.xml
===================================================================
--- 
trunk/perfsonar/schema/example-instances/perfSONAR/FlowsaMA/SetupDataRequest-flowStatistics.xml
     2007-07-25 09:18:29 UTC (rev 2572)
+++ 
trunk/perfsonar/schema/example-instances/perfSONAR/FlowsaMA/SetupDataRequest-flowStatistics.xml
     2007-07-25 10:19:28 UTC (rev 2573)
@@ -11,6 +11,7 @@
 version 0.7, 6 June 2007, Hans Trompert, subject now uses nmwgtopo3:node, 
removed old comments
 version 0.8, 12 June 2007, Martin Swany, Added location data
 version 0.9, 13 June 2007, Jason Zurawski, Final cleanup
+version 0.10, 24 July 2007, Hans Trompert, fixed some typos
 
 This request will return statistical information about the selected
 flows from the given router(s).  For the moment, more information can be
@@ -66,8 +67,8 @@
   xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
   xmlns:flow="http://ggf.org/ns/nmwg/tools/flow/2.0/";
   xmlns:nmwgtopo3="http://ggf.org/ns/nmwg/topology/base/3.0/";
-  xmlns:select="http://ggf.org/ns/nmwg/ops/select/";
-  xmlns:nmtm="http://ggf.org/ns/nmwg/time/";>
+  xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
+  xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";>
 
   <nmwg:metadata id="meta1">
     <flow:subject id="flowsub1">
@@ -79,21 +80,21 @@
           <nmwgtopo3:institution>SURFnet</nmwgtopo3:institution>
           <nmwgtopo3:city>Amsterdam</nmwgtopo3:city>
           <nmwgtopo3:country>The Netherlands</nmwgtopo3:country>
-          <nmwgtopo3:latitude>52.21'22.12N</nmwgtopo3:latitude>
-          <nmwgtopo3:longitude>04.57'10.03E</nmwgtopo3:longitude>
+          <nmwgtopo3:latitude>52.212212</nmwgtopo3:latitude>
+          <nmwgtopo3:longitude>04.571003</nmwgtopo3:longitude>
         </nmwgtopo3:location>
       </nmwgtopo3:node>
     </flow:subject>
     <nmwg:eventType>http://ggf.org/ns/nmwg/tools/flow/2.0/</nmwg:eventType>
-    <flow:parameters id="someid">
+    <flow:parameters id="flowparamid1">
       <nmwg:parameter name="flowVersion">netflow_v9</nmwg:parameter>
       <nmwg:parameter name="sampleRate">100</nmwg:parameter>
     </flow:parameters>
   </nmwg:metadata>
 
   <nmwg:metadata id="meta2">
-    <select:subject id="flowsub1" metadataIdRef="meta1"/>
-    <select:parameters id="someid">
+    <select:subject id="selectsub1" metadataIdRef="meta1"/>
+    <select:parameters id="selectparamid1">
       <nmwg:parameter name="startTime">
         <nmtm:time type="ISO" value="2005-07-16T00:00:00Z"/>
       </nmwg:parameter>

Modified: 
trunk/perfsonar/schema/example-instances/perfSONAR/FlowsaMA/SetupDataRequest-rawFlows.xml
===================================================================
--- 
trunk/perfsonar/schema/example-instances/perfSONAR/FlowsaMA/SetupDataRequest-rawFlows.xml
   2007-07-25 09:18:29 UTC (rev 2572)
+++ 
trunk/perfsonar/schema/example-instances/perfSONAR/FlowsaMA/SetupDataRequest-rawFlows.xml
   2007-07-25 10:19:28 UTC (rev 2573)
@@ -7,6 +7,7 @@
 version 0.7, 6 June 2007, Hans Trompert, subject now uses nmwgtopo3:node, 
changed the way the showField parameters are specified.
 version 0.8, 12 June 2007, Martin Swany, Added location data
 version 0.9, 13 June 2007, Jason Zurawski, Final cleanup
+version 0.10, 24 July 2007, Hans Trompert, fixed some typos, added 
subnamespace raw
 
 This request will return information about all flows whithin the specified
 time range from the given router(s), the flows are optionally filtered on
@@ -106,9 +107,10 @@
 <nmwg:message type="SetupDataRequest" id="msg1"
   xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
   xmlns:flow="http://ggf.org/ns/nmwg/tools/flow/2.0/";
+  xmlns:raw="http://ggf.org/ns/nmwg/tools/flow/raw/2.0/";
   xmlns:nmwgtopo3="http://ggf.org/ns/nmwg/topology/base/3.0/";
-  xmlns:select="http://ggf.org/ns/nmwg/ops/select/";
-  xmlns:nmtm="http://ggf.org/ns/nmwg/time/";>
+  xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
+  xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";>
 
   <nmwg:metadata id="meta1">
     <flow:subject id="flowsub1">
@@ -120,21 +122,21 @@
           <nmwgtopo3:institution>SURFnet</nmwgtopo3:institution>
           <nmwgtopo3:city>Amsterdam</nmwgtopo3:city>
           <nmwgtopo3:country>The Netherlands</nmwgtopo3:country>
-          <nmwgtopo3:latitude>52.21'22.12N</nmwgtopo3:latitude>
-          <nmwgtopo3:longitude>04.57'10.03E</nmwgtopo3:longitude>
+          <nmwgtopo3:latitude>52.212212</nmwgtopo3:latitude>
+          <nmwgtopo3:longitude>04.571003</nmwgtopo3:longitude>
         </nmwgtopo3:location>
       </nmwgtopo3:node>
     </flow:subject>
-    <nmwg:eventType>http://ggf.org/ns/nmwg/tools/flow/2.0/</nmwg:eventType>
-    <flow:parameters id="someid">
+    
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/flow/raw/2.0/</nmwg:eventType>
+    <flow:parameters id="flowparamid1">
       <nmwg:parameter name="flowVersion">netflow_v9</nmwg:parameter>
       <nmwg:parameter name="sampleRate">100</nmwg:parameter>
     </flow:parameters>
   </nmwg:metadata>
 
   <nmwg:metadata id="meta2">
-    <select:subject id="flowsub1" metadataIdRef="meta1"/>
-    <select:parameters id="someid">
+    <select:subject id="selectsub1" metadataIdRef="meta1"/>
+    <select:parameters id="selectparamid1">
       <nmwg:parameter name="startTime">
         <nmtm:time type="ISO" value="2005-07-16T00:00:00Z"/>
       </nmwg:parameter>
@@ -145,8 +147,8 @@
   </nmwg:metadata>
 
   <nmwg:metadata id="meta3">
-    <flow:subject id="flowsub1" metadataIdRef="meta2"/>
-    <flow:parameters id="someid">
+    <raw:subject id="rawsub1" metadataIdRef="meta2"/>
+    <raw:parameters id="rawparamid1">
       <nmwg:parameter name="aggregationRule">srcip,dstport</nmwg:parameter>
       <nmwg:parameter name="filterRule">port = 80</nmwg:parameter>
       <nmwg:parameter name="showFieldAddressFamily"/>
@@ -163,11 +165,11 @@
       <nmwg:parameter name="showFieldDstAS"/>
       <nmwg:parameter name="showFieldInputIF"/>
       <nmwg:parameter name="showFieldOutputIF"/>
-      <nmwg:parameter name="showFieldTcpFlags"/>
+      <nmwg:parameter name="showFieldTcpFlags">6</nmwg:parameter>
       <nmwg:parameter name="showFieldTos"/>
       <nmwg:parameter name="showFieldPackets"/>
       <nmwg:parameter name="showFieldBytes"/>
-    </flow:parameters>
+    </raw:parameters>
   </nmwg:metadata>
 
   <nmwg:data id="data1" metadataIdRef="meta3"/>

Modified: 
trunk/perfsonar/schema/example-instances/perfSONAR/FlowsaMA/SetupDataRequest-topFlows.xml
===================================================================
--- 
trunk/perfsonar/schema/example-instances/perfSONAR/FlowsaMA/SetupDataRequest-topFlows.xml
   2007-07-25 09:18:29 UTC (rev 2572)
+++ 
trunk/perfsonar/schema/example-instances/perfSONAR/FlowsaMA/SetupDataRequest-topFlows.xml
   2007-07-25 10:19:28 UTC (rev 2573)
@@ -6,6 +6,7 @@
 version 0.7, 6 June 2007, Hans Trompert, subject now uses nmwgtopo3:node
 version 0.8, 12 June 2007, Martin Swany, Added location data
 version 0.9, 13 June 2007, Jason Zurawski, Final cleanup
+version 0.10, 24 July 2007, Hans Trompert, fixed some typos, updated 
Metadata explanation to match message, added subnamespace top to namespace 
flow and updated the subject of the metadata block containing the paramters 
that are specific to this request accordingly.
 
 This request will return the Top N flow or flow element statistics.
 For the moment, more information can be found at:
@@ -16,29 +17,41 @@
 
         Information on the router that exported the flow information:
 
-        - ifAddress: the address of the router that is being used as the
-          source address on the packets of flow information that are 
exported from
-          the router to the collector on the MA
-        
-        - flowVersion: the flow information export format used by the router,
-          for now we support the following versions:
+        - hostName: the name of the router for which we are holding flow
+          information. This is preferably the official name of the
+          router, usually this is the DNS name that is associated with
+          the loopback0 interface.
+
+        - description: description of the router (optional)
+
+        - operSys: operating system running on the router (optional)
+
+        - institution: institution this routers belongs to (optional)
+
+        - city, country, latitude and longitude: location of the router
+          (optional)
+
+        - flowVersion: the flow information export format used by the
+          router, for now we support the following versions:
                 - netflow_v5
                 - netflow_v9
                 - ipfix
                 - sflow
-                
-        - sampleRate: the packet sample rate, if any, that is being used by 
the
-          router before flow accounting is done, for example:
-                - sampleRate = 100 if only 1 out of every 100 packets is 
sent to
-                  the router internal accounting process
+
+        - sampleRate: the packet sample rate, if any, that is being used
+          by the router before flow accounting is done, for example:
+                - sampleRate = 100 if only 1 out of every 100 packets is
+                  sent to the router internal accounting process
                 - sampleRate = 1 if every 1 out of 1 packets is sent to
-                  the router internal accounting process (all
-                  packets are accounted for)
-                  
-        - hostName: the name of the router (optional)
+                  the router internal accounting process (all packets
+                  are accounted for)
 
-        Below are fields that are specific to this request:
+        The filtering namespace http://ggf.org/ns/nmwg/ops/select/ can
+        be used to specify a startTime and endTime to limit the number
+        of flows to a specific time range.
 
+Below are fields that are specific to this request:
+
         - topStatistic: generate the Top N flow or flow element statistic.
           Statistic can be (only one can be specified at a time):
                   record  Statistic about arregated netflow records.
@@ -79,9 +92,10 @@
 <nmwg:message type="SetupDataRequest" id="msg1"
   xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
   xmlns:flow="http://ggf.org/ns/nmwg/tools/flow/2.0/";
+  xmlns:top="http://ggf.org/ns/nmwg/tools/flow/top/2.0/";
   xmlns:nmwgtopo3="http://ggf.org/ns/nmwg/topology/base/3.0/";
-  xmlns:select="http://ggf.org/ns/nmwg/ops/select/";
-  xmlns:nmtm="http://ggf.org/ns/nmwg/time/";>
+  xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
+  xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";>
 
   <nmwg:metadata id="meta1">
     <flow:subject id="flowsub1">
@@ -93,21 +107,21 @@
           <nmwgtopo3:institution>SURFnet</nmwgtopo3:institution>
           <nmwgtopo3:city>Amsterdam</nmwgtopo3:city>
           <nmwgtopo3:country>The Netherlands</nmwgtopo3:country>
-          <nmwgtopo3:latitude>52.21'22.12N</nmwgtopo3:latitude>
-          <nmwgtopo3:longitude>04.57'10.03E</nmwgtopo3:longitude>
+          <nmwgtopo3:latitude>52.212212</nmwgtopo3:latitude>
+          <nmwgtopo3:longitude>04.571003</nmwgtopo3:longitude>
         </nmwgtopo3:location>
       </nmwgtopo3:node>
     </flow:subject>
-    <nmwg:eventType>http://ggf.org/ns/nmwg/tools/flow/2.0/</nmwg:eventType>
-    <flow:parameters id="someid">
+    
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/flow/top/2.0/</nmwg:eventType>
+    <flow:parameters id="flowparamid1">
       <nmwg:parameter name="flowVersion">netflow_v9</nmwg:parameter>
       <nmwg:parameter name="sampleRate">100</nmwg:parameter>
     </flow:parameters>
   </nmwg:metadata>
 
   <nmwg:metadata id="meta2">
-    <select:subject id="flowsub1" metadataIdRef="meta1"/>
-    <select:parameters id="someid">
+    <select:subject id="selectsub1" metadataIdRef="meta1"/>
+    <select:parameters id="selectparamid1">
       <nmwg:parameter name="startTime">
         <nmtm:time type="ISO" value="2005-07-16T00:00:00Z"/>
       </nmwg:parameter>
@@ -118,13 +132,13 @@
   </nmwg:metadata>
 
   <nmwg:metadata id="meta3">
-    <flow:subject id="flowsub1" metadataIdRef="meta2"/>
-    <flow:parameters id="someid">
+    <top:subject id="topsub1" metadataIdRef="meta2"/>
+    <top:parameters id="topparamid1">
       <nmwg:parameter name="topStatistic">ip</nmwg:parameter>
       <nmwg:parameter name="orderBy">flows</nmwg:parameter>
       <nmwg:parameter name="splitProtocol">yes</nmwg:parameter>
       <nmwg:parameter name="topN">20</nmwg:parameter>
-    </flow:parameters>
+    </top:parameters>
   </nmwg:metadata>
 
   <nmwg:data id="data1" metadataIdRef="meta3"/>

Modified: 
trunk/perfsonar/schema/example-instances/perfSONAR/FlowsaMA/SetupDataResponse-flowStatistics.xml
===================================================================
--- 
trunk/perfsonar/schema/example-instances/perfSONAR/FlowsaMA/SetupDataResponse-flowStatistics.xml
    2007-07-25 09:18:29 UTC (rev 2572)
+++ 
trunk/perfsonar/schema/example-instances/perfSONAR/FlowsaMA/SetupDataResponse-flowStatistics.xml
    2007-07-25 10:19:28 UTC (rev 2573)
@@ -8,6 +8,7 @@
 version 0.7, 6 June 2007, Hans Trompert, subject now uses nmwgtopo3:node, 
removed superfluous ident field from data
 version 0.8, 12 June 2007, Martin Swany, Added location data
 version 0.9, 13 June 2007, Jason Zurawski, Final cleanup
+version 0.10, 24 July 2007, Hans Trompert, fixed some typos, added 
subnamespace stat to flow namespace to make datum elements unique.
 
 This is the response of the request for statistical information about
 the selected flows from the given router(s).  For the moment, more
@@ -82,9 +83,10 @@
 <nmwg:message type="SetupDataRespone" id="msg2" messageIdRef="msg1"
   xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
   xmlns:flow="http://ggf.org/ns/nmwg/tools/flow/2.0/";
+  xmlns:stat="http://ggf.org/ns/nmwg/tools/flow/stat/2.0/";
   xmlns:nmwgtopo3="http://ggf.org/ns/nmwg/topology/base/3.0/";
-  xmlns:select="http://ggf.org/ns/nmwg/ops/select/";
-  xmlns:nmtm="http://ggf.org/ns/nmwg/time/";>
+  xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
+  xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";>
 
   <nmwg:metadata id="meta1">
     <flow:subject id="flowsub1">
@@ -92,25 +94,25 @@
         <nmwgtopo3:hostName>test-router.lab.test-net</nmwgtopo3:hostName>
         <nmwgtopo3:description>Avici Systems TSR in test 
lab</nmwgtopo3:description>
         <nmwgtopo3:operSys>IPriori Operational Image 
6.5.3.3</nmwgtopo3:operSys>
-        <nmwgtopo3:institution>SURFnet</nmwgtopo3:institution>
         <nmwgtopo3:location>
+          <nmwgtopo3:institution>SURFnet</nmwgtopo3:institution>
           <nmwgtopo3:city>Amsterdam</nmwgtopo3:city>
           <nmwgtopo3:country>The Netherlands</nmwgtopo3:country>
-          <nmwgtopo3:latitude>52.21'22.12N</nmwgtopo3:latitude>
-          <nmwgtopo3:longitude>04.57'10.03E</nmwgtopo3:longitude>
+          <nmwgtopo3:latitude>52.212212</nmwgtopo3:latitude>
+          <nmwgtopo3:longitude>04.571003</nmwgtopo3:longitude>
         </nmwgtopo3:location>
       </nmwgtopo3:node>
     </flow:subject>
-    <nmwg:eventType>http://ggf.org/ns/nmwg/tools/flow/2.0/</nmwg:eventType>
-    <flow:parameters id="someid">
+    
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/flow/stat/2.0/</nmwg:eventType>
+    <flow:parameters id="flowparamid1">
       <nmwg:parameter name="flowVersion">netflow_v9</nmwg:parameter>
       <nmwg:parameter name="sampleRate">100</nmwg:parameter>
     </flow:parameters>
   </nmwg:metadata>
 
   <nmwg:metadata id="meta2">
-    <select:subject id="flowsub1" metadataIdRef="meta1"/>
-    <select:parameters id="someid">
+    <select:subject id="selectsub1" metadataIdRef="meta1"/>
+    <select:parameters id="selectparamid1">
       <nmwg:parameter name="startTime">
         <nmtm:time type="ISO" value="2005-07-16T00:00:00Z"/>
       </nmwg:parameter>
@@ -121,7 +123,7 @@
   </nmwg:metadata>
 
   <nmwg:data id="data1" metadataIdRef="meta2">
-    <flow:datum flows="2743934" flowsTcp="28855797" flowsUdp="3640646"
+    <stat:datum flows="2743934" flowsTcp="28855797" flowsUdp="3640646"
       flowsIcmp="166385" flowsOther="81106" packets="145371187"
       packetsTcp="131640619" packetsUdp="8769174" packetsIcmp="215350"
       packetsOther="4746044" bytes="107316849515"
@@ -133,7 +135,7 @@
         <nmtm:start type="ISO" value="2005-07-16T00:00:00Z"/>
         <nmtm:end type="ISO" value="2005-07-21T00:00:00Z"/>
       </nmtm:time>
-    </flow:datum>
+    </stat:datum>
   </nmwg:data>
 
 </nmwg:message>

Modified: 
trunk/perfsonar/schema/example-instances/perfSONAR/FlowsaMA/SetupDataResponse-rawFlows.xml
===================================================================
--- 
trunk/perfsonar/schema/example-instances/perfSONAR/FlowsaMA/SetupDataResponse-rawFlows.xml
  2007-07-25 09:18:29 UTC (rev 2572)
+++ 
trunk/perfsonar/schema/example-instances/perfSONAR/FlowsaMA/SetupDataResponse-rawFlows.xml
  2007-07-25 10:19:28 UTC (rev 2573)
@@ -7,6 +7,7 @@
 version 0.7, 6 June 2007, Hans Trompert, subject now uses nmwgtopo3:node, 
changed the way the showField parameters are specified.
 version 0.8, 12 June 2007, Martin Swany, Added location data
 version 0.9, 13 June 2007, Jason Zurawski, Final cleanup
+version 0.10, 24 July 2007, Hans Trompert, fixed some typos, added 
subnamespace raw
 
 This response will return information about all flows whithin the specified
 time range from the given router(s), the flows are optionally filtered on
@@ -108,9 +109,10 @@
 <nmwg:message type="SetupDataResponse" id="msg1"
   xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
   xmlns:flow="http://ggf.org/ns/nmwg/tools/flow/2.0/";
+  xmlns:raw="http://ggf.org/ns/nmwg/tools/flow/raw/2.0/";
   xmlns:nmwgtopo3="http://ggf.org/ns/nmwg/topology/base/3.0/";
-  xmlns:select="http://ggf.org/ns/nmwg/ops/select/";
-  xmlns:nmtm="http://ggf.org/ns/nmwg/time/";>
+  xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
+  xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";>
 
   <nmwg:metadata id="meta1">
     <flow:subject id="flowsub1">
@@ -122,21 +124,21 @@
           <nmwgtopo3:institution>SURFnet</nmwgtopo3:institution>
           <nmwgtopo3:city>Amsterdam</nmwgtopo3:city>
           <nmwgtopo3:country>The Netherlands</nmwgtopo3:country>
-          <nmwgtopo3:latitude>52.21'22.12N</nmwgtopo3:latitude>
-          <nmwgtopo3:longitude>04.57'10.03E</nmwgtopo3:longitude>
+          <nmwgtopo3:latitude>52.212212</nmwgtopo3:latitude>
+          <nmwgtopo3:longitude>04.571003</nmwgtopo3:longitude>
         </nmwgtopo3:location>
       </nmwgtopo3:node>
     </flow:subject>
-    <nmwg:eventType>http://ggf.org/ns/nmwg/tools/flow/2.0/</nmwg:eventType>
-    <flow:parameters id="someid">
+    
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/flow/raw/2.0/</nmwg:eventType>
+    <flow:parameters id="flowparamid1">
       <nmwg:parameter name="flowVersion">netflow_v9</nmwg:parameter>
       <nmwg:parameter name="sampleRate">100</nmwg:parameter>
     </flow:parameters>
   </nmwg:metadata>
 
   <nmwg:metadata id="meta2">
-    <select:subject id="flowsub1" metadataIdRef="meta1"/>
-    <select:parameters id="someid">
+    <select:subject id="selectsub1" metadataIdRef="meta1"/>
+    <select:parameters id="selectparamid1">
       <nmwg:parameter name="startTime">
         <nmtm:time type="ISO" value="2005-07-16T00:00:00Z"/>
       </nmwg:parameter>
@@ -147,11 +149,10 @@
   </nmwg:metadata>
 
   <nmwg:metadata id="meta3">
-    <flow:subject id="flowsub1" metadataIdRef="meta2"/>
-    <flow:parameters id="someid">
+    <raw:subject id="rawsub1" metadataIdRef="meta2"/>
+    <raw:parameters id="rawparamid1">
       <nmwg:parameter name="aggregationRule">srcip,dstport</nmwg:parameter>
-      <nmwg:parameter name="filterRule">ip 10.101.102.103 and port =
-        443</nmwg:parameter>
+      <nmwg:parameter name="filterRule">ip 10.101.102.103 and port = 
443</nmwg:parameter>
       <nmwg:parameter name="showFieldAddressFamily"/>
       <nmwg:parameter name="showFieldTimeFirstSeen"/>
       <nmwg:parameter name="showFieldMsecFirstSeen"/>
@@ -166,21 +167,21 @@
       <nmwg:parameter name="showFieldDstAS"/>
       <nmwg:parameter name="showFieldInputIF"/>
       <nmwg:parameter name="showFieldOutputIF"/>
-      <nmwg:parameter name="showFieldTcpFlags"/>
+      <nmwg:parameter name="showFieldTcpFlags">6</nmwg:parameter>
       <nmwg:parameter name="showFieldTos"/>
       <nmwg:parameter name="showFieldPackets"/>
       <nmwg:parameter name="showFieldBytes"/>
-    </flow:parameters>
+    </raw:parameters>
   </nmwg:metadata>
 
   <nmwg:data id="data1" metadataIdRef="meta3">
-    <flow:datum addressFamily="2" timeFirstSeen="1180697264"
+    <raw:datum addressFamily="2" timeFirstSeen="1180697264"
       msecFirstSeen="945" timeLastSeen="1180697276" msecLastSeen="3"
       protocol="6" srcAddress="10.11.12.13" srcPort="443"
       dstAddress="10.101.102.103" dstPort="2952" srcAS="0" dstAS="0"
       inputIF="23" outputIF="2" tcpFlags="24" tos="0" packets="9"
       bytes="11627"/>
-    <flow:datum addressFamily="2" timeFirstSeen="1180697332"
+    <raw:datum addressFamily="2" timeFirstSeen="1180697332"
       msecFirstSeen="84" timeLastSeen="1180697341" msecLastSeen="330"
       protocol="6" srcAddress="10.11.12.13" srcPort="443"
       dstAddress="10.101.102.103" dstPort="2954" srcAS="0" dstAS="0"

Modified: 
trunk/perfsonar/schema/example-instances/perfSONAR/FlowsaMA/SetupDataResponse-topFlows.xml
===================================================================
--- 
trunk/perfsonar/schema/example-instances/perfSONAR/FlowsaMA/SetupDataResponse-topFlows.xml
  2007-07-25 09:18:29 UTC (rev 2572)
+++ 
trunk/perfsonar/schema/example-instances/perfSONAR/FlowsaMA/SetupDataResponse-topFlows.xml
  2007-07-25 10:19:28 UTC (rev 2573)
@@ -6,6 +6,7 @@
 version 0.7, 6 June 2007, Hans Trompert, subject now uses nmwgtopo3:node
 version 0.8, 12 June 2007, Martin Swany, Added location data
 version 0.9, 13 June 2007, Jason Zurawski, Final cleanup
+version 0.10, 24 July 2007, Hans Trompert, fixed some typos, updated 
metadata explanation to match message, added top subnamespace to flow 
namespace to make top parameter subject and top datum elements unique.
 
 This request will return the Top N flow or flow element statistics.
 For the moment, more information can be found at:
@@ -16,26 +17,34 @@
 
         Information on the router that exported the flow information:
 
-        - ifAddress: the address of the router that is being used as the
-          source address on the packets of flow information that are 
exported from
-          the router to the collector on the MA
-        
-        - flowVersion: the flow information export format used by the router,
-          for now we support the following versions:
+        - hostName: the name of the router for which we are holding flow
+          information. This is preferably the official name of the
+          router, usually this is the DNS name that is associated with
+          the loopback0 interface.
+
+        - description: description of the router (optional)
+
+        - operSys: operating system running on the router (optional)
+
+        - institution: institution this routers belongs to (optional)
+
+        - city, country, latitude and longitude: location of the router
+          (optional)
+
+        - flowVersion: the flow information export format used by the
+          router, for now we support the following versions:
                 - netflow_v5
                 - netflow_v9
                 - ipfix
                 - sflow
-                
-        - sampleRate: the packet sample rate, if any, that is being used by 
the
-          router before flow accounting is done, for example:
-                - sampleRate = 100 if only 1 out of every 100 packets is 
sent to
-                  the router internal accounting process
+
+        - sampleRate: the packet sample rate, if any, that is being used
+          by the router before flow accounting is done, for example:
+                - sampleRate = 100 if only 1 out of every 100 packets is
+                  sent to the router internal accounting process
                 - sampleRate = 1 if every 1 out of 1 packets is sent to
-                  the router internal accounting process (all
-                  packets are accounted for)
-                  
-        - hostName: the name of the router (optional)
+                  the router internal accounting process (all packets
+                  are accounted for)
 
         Below are fields that are specific to this request:
 
@@ -71,6 +80,10 @@
         - topN: Define the number for the Top N statistics. Defaults to 10. 
If
           0 is specified the number is unlimited. 
 
+        The filtering namespace http://ggf.org/ns/nmwg/ops/select/ can
+        be used to specify a startTime and endTime to limit the number
+        of flows to a specific time range.
+
 Data:
 
         The response of this request will contain the requested Top N 
information.
@@ -104,9 +117,10 @@
 <nmwg:message type="SetupDataRequest" id="msg1"
   xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
   xmlns:flow="http://ggf.org/ns/nmwg/tools/flow/2.0/";
+  xmlns:top="http://ggf.org/ns/nmwg/tools/flow/top/2.0/";
   xmlns:nmwgtopo3="http://ggf.org/ns/nmwg/topology/base/3.0/";
-  xmlns:select="http://ggf.org/ns/nmwg/ops/select/";
-  xmlns:nmtm="http://ggf.org/ns/nmwg/time/";>
+  xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
+  xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";>
 
 
   <nmwg:metadata id="meta1">
@@ -119,21 +133,21 @@
           <nmwgtopo3:institution>SURFnet</nmwgtopo3:institution>
           <nmwgtopo3:city>Amsterdam</nmwgtopo3:city>
           <nmwgtopo3:country>The Netherlands</nmwgtopo3:country>
-          <nmwgtopo3:latitude>52.21'22.12N</nmwgtopo3:latitude>
-          <nmwgtopo3:longitude>04.57'10.03E</nmwgtopo3:longitude>
+          <nmwgtopo3:latitude>52.212212</nmwgtopo3:latitude>
+          <nmwgtopo3:longitude>04.571003</nmwgtopo3:longitude>
         </nmwgtopo3:location>
       </nmwgtopo3:node>
     </flow:subject>
     <nmwg:eventType>http://ggf.org/ns/nmwg/tools/flow/2.0/</nmwg:eventType>
-    <flow:parameters id="someid">
+    <flow:parameters id="flowparamid1">
       <nmwg:parameter name="flowVersion">netflow_v9</nmwg:parameter>
       <nmwg:parameter name="sampleRate">100</nmwg:parameter>
     </flow:parameters>
   </nmwg:metadata>
 
   <nmwg:metadata id="meta2">
-    <select:subject id="flowsub1" metadataIdRef="meta1"/>
-    <select:parameters id="someid">
+    <select:subject id="selectsub1" metadataIdRef="meta1"/>
+    <select:parameters id="selectparamid1">
       <nmwg:parameter name="startTime">
         <nmtm:time type="ISO" value="2005-07-16T00:00:00Z"/>
       </nmwg:parameter>
@@ -144,21 +158,21 @@
   </nmwg:metadata>
 
   <nmwg:metadata id="meta3">
-    <flow:subject id="flowsub1" metadataIdRef="meta2"/>
-    <flow:parameters id="someid">
+    <top:subject id="topsub1" metadataIdRef="meta2"/>
+    <top:parameters id="topparamid1">
       <nmwg:parameter name="topStatistic">ip</nmwg:parameter>
       <nmwg:parameter name="orderBy">flows</nmwg:parameter>
       <nmwg:parameter name="splitProtocol">yes</nmwg:parameter>
       <nmwg:parameter name="topN">2</nmwg:parameter>
-    </flow:parameters>
+    </top:parameters>
   </nmwg:metadata>
 
   <nmwg:data id="data1" metadataIdRef="meta3">
-    <flow:datum dateFirstSeen="2007-06-01 14:54:39.479"
+    <top:datum dateFirstSeen="2007-06-01 14:54:39.479"
       duration="2119.521" proto="TCP" topStatistic="10.9.8.7"
       flows="771567" packets="1234987" bytes="7237645" pps="498"
       bps="4345983" bpp="1214"/>
-    <flow:datum dateFirstSeen="2007-06-01 14:55:26.379"
+    <top:datum dateFirstSeen="2007-06-01 14:55:26.379"
       duration="2072.634" proto="UDP" topStatistic="10.209.108.17"
       flows="671567" packets="1123887" bytes="6126534" pps="397"
       bps="3345983" bpp="1195"/>