perfsonar development work

Author: hans.trompert
Date: 2007-08-10 06:16:41 -0400 (Fri, 10 Aug 2007)
New Revision: 2624

Modified:
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/doc/samples/SetupDataRequest-flowStatistics.xml
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/doc/samples/SetupDataRequest-rawFlows.xml
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/doc/samples/SetupDataRequest-topFlows.xml
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/doc/samples/SetupDataResponse-flowStatistics.xml
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/doc/samples/SetupDataResponse-rawFlows.xml
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/doc/samples/SetupDataResponse-topFlows.xml
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/doc/schemas/FlowsaMA.rnc
Log:
limited the use of http://ggf.org/ns/nmwg/tools/flow/[top|raw|stat]/2.0/ sub 
namespaces to eventType only

Modified: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/doc/samples/SetupDataRequest-flowStatistics.xml
===================================================================
--- 
branches/new-structure/trunk/surfnet_java-flowsa-ma/doc/samples/SetupDataRequest-flowStatistics.xml
 2007-08-09 18:55:00 UTC (rev 2623)
+++ 
branches/new-structure/trunk/surfnet_java-flowsa-ma/doc/samples/SetupDataRequest-flowStatistics.xml
 2007-08-10 10:16:41 UTC (rev 2624)
@@ -17,6 +17,7 @@
 version 0.12, 27 July 2007, Jason Zurawski, Both changes should be reversed; 
you can accomplish multiple routers with chaining, and the flow properties 
you havbe added describe software of a node, not the node itself.  
 version 0.13, 07 Aug 2007, Hans Trompert, reversed changes made in version 
11, now using RouterGroup (== BaseNetwork) as a subject, cleanup
 version 0.14, 08 Aug 2007, Hans Trompert, minor edit
+version 0.15, 10 Aug 2007, Hans Trompert, limited the use of 
http://ggf.org/ns/nmwg/tools/flow/stat/2.0/ sub namespace to eventType only
 
 This request will return statistical information about the selected
 flows from the given router(s).
@@ -50,8 +51,8 @@
   </nmwg:metadata>
 
   <nmwg:metadata id="meta2">
-    <stat:subject id="statsub1" metadataIdRef="meta1"/>
-    <stat:parameters id="statparamid1"/>
+    <flow:subject id="flowsub2" metadataIdRef="meta1"/>
+    <flow:parameters id="flowparamid1"/>
   </nmwg:metadata>
 
   <nmwg:metadata id="meta3">

Modified: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/doc/samples/SetupDataRequest-rawFlows.xml
===================================================================
--- 
branches/new-structure/trunk/surfnet_java-flowsa-ma/doc/samples/SetupDataRequest-rawFlows.xml
       2007-08-09 18:55:00 UTC (rev 2623)
+++ 
branches/new-structure/trunk/surfnet_java-flowsa-ma/doc/samples/SetupDataRequest-rawFlows.xml
       2007-08-10 10:16:41 UTC (rev 2624)
@@ -12,6 +12,7 @@
 version 0.11, 07 Aug 2007, Hans Trompert, now using RouterGroup (== 
BaseNetwork) as a subject, cleanup
 version 0.12, 08 Aug 2007, Hans Trompert, fixed eventType
 version 0.13, 08 Aug 2007, Hans Trompert, showFieldTcpFlags does not take an 
argument
+version 0.14, 10 Aug 2007, Hans Trompert, limited the use of 
http://ggf.org/ns/nmwg/tools/flow/raw/2.0/ sub namespace to eventType only
 
 This request will return information about all flows whithin the specified
 time range from the given router(s), the flows are optionally filtered on
@@ -46,8 +47,8 @@
   </nmwg:metadata>
 
   <nmwg:metadata id="meta2">
-    <raw:subject id="rawsub1" metadataIdRef="meta1"/>
-    <raw:parameters id="rawparamid1">
+    <flow:subject id="flowsub2" metadataIdRef="meta1"/>
+    <flow:parameters id="flowparamid1">
       <nmwg:parameter name="aggregationRule">srcip,dstport</nmwg:parameter>
       <nmwg:parameter name="filterRule">port = 80</nmwg:parameter>
       <nmwg:parameter name="showFieldAddressFamily"/>
@@ -68,7 +69,7 @@
       <nmwg:parameter name="showFieldTos"/>
       <nmwg:parameter name="showFieldPackets"/>
       <nmwg:parameter name="showFieldBytes"/>
-    </raw:parameters>
+    </flow:parameters>
   </nmwg:metadata>
 
   <nmwg:metadata id="meta3">

Modified: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/doc/samples/SetupDataRequest-topFlows.xml
===================================================================
--- 
branches/new-structure/trunk/surfnet_java-flowsa-ma/doc/samples/SetupDataRequest-topFlows.xml
       2007-08-09 18:55:00 UTC (rev 2623)
+++ 
branches/new-structure/trunk/surfnet_java-flowsa-ma/doc/samples/SetupDataRequest-topFlows.xml
       2007-08-10 10:16:41 UTC (rev 2624)
@@ -10,6 +10,7 @@
 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.
 version 0.11, 07 Aug 2007, Hans Trompert, now using RouterGroup (== 
BaseNetwork) as a subject, cleanup
 version 0.12, 08 Aug 2007, Hans Trompert, fixed eventType, matched query 
interval to data in response message
+version 0.13, 10 Aug 2007, Hans Trompert, limited the use of 
http://ggf.org/ns/nmwg/tools/flow/top/2.0/ sub namespace to eventType only
 
 This request will return the Top N flow or flow element statistics.
 
@@ -42,13 +43,13 @@
   </nmwg:metadata>
 
   <nmwg:metadata id="meta2">
-    <top:subject id="topsub1" metadataIdRef="meta1"/>
-    <top:parameters id="topparamid1">
+    <flow:subject id="flowsub2" metadataIdRef="meta1"/>
+    <flow:parameters id="flowparamid1">
       <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>
-    </top:parameters>
+    </flow:parameters>
   </nmwg:metadata>
 
   <nmwg:metadata id="meta3">

Modified: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/doc/samples/SetupDataResponse-flowStatistics.xml
===================================================================
--- 
branches/new-structure/trunk/surfnet_java-flowsa-ma/doc/samples/SetupDataResponse-flowStatistics.xml
        2007-08-09 18:55:00 UTC (rev 2623)
+++ 
branches/new-structure/trunk/surfnet_java-flowsa-ma/doc/samples/SetupDataResponse-flowStatistics.xml
        2007-08-10 10:16:41 UTC (rev 2624)
@@ -13,6 +13,7 @@
 version 0.11, 27 July 2007, Jason Zurawski, added example of multiple 
subjects with corresponding data blocks
 version 0.12, 30 July 2007, Hans Trompert, moved flowVersion and sampleRate 
into seperate metadatablock, changed node into a network containing one ore 
more nodes
 version 0.13, 07 Aug 2007, Hans Trompert, reversed changes made in version 
12, now using RouterGroup (== BaseNetwork) as a subject, cleanup
+version 0.14, 10 Aug 2007, Hans Trompert, limited the use of 
http://ggf.org/ns/nmwg/tools/flow/stat/2.0/ sub namespace to eventType only
 
 
 This is the response of the request for statistical information about
@@ -65,11 +66,11 @@
   </nmwg:metadata>
 
   <nmwg:metadata id="meta2">
-    <stat:subject id="statsub1" metadataIdRef="meta1"/>
-    <stat:parameters id="statparamid1">
+    <flow:subject id="flowsub2" metadataIdRef="meta1"/>
+    <flow:parameters id="flowparamid1">
       <nmwg:parameter name="flowVersion">netflow_v9</nmwg:parameter>
       <nmwg:parameter name="sampleRate">100</nmwg:parameter>
-    </stat:parameters>
+    </flow:parameters>
   </nmwg:metadata>
 
   <nmwg:metadata id="meta3">
@@ -85,7 +86,7 @@
   </nmwg:metadata>
 
   <nmwg:data id="data1" metadataIdRef="meta3">
-    <stat:datum
+    <flow:datum
       flows="2743934" flowsTcp="28855797" flowsUdp="3640646"
       flowsIcmp="166385" flowsOther="81106" packets="145371187"
       packetsTcp="131640619" packetsUdp="8769174" packetsIcmp="215350"
@@ -97,7 +98,7 @@
         <nmtm:start type="ISO" value="2005-07-16T00:00:00Z"/>
         <nmtm:end type="ISO" value="2005-07-21T00:00:00Z"/>
       </nmtm:time>
-    </stat:datum>
+    </flow:datum>
   </nmwg:data>
 
 </nmwg:message>

Modified: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/doc/samples/SetupDataResponse-rawFlows.xml
===================================================================
--- 
branches/new-structure/trunk/surfnet_java-flowsa-ma/doc/samples/SetupDataResponse-rawFlows.xml
      2007-08-09 18:55:00 UTC (rev 2623)
+++ 
branches/new-structure/trunk/surfnet_java-flowsa-ma/doc/samples/SetupDataResponse-rawFlows.xml
      2007-08-10 10:16:41 UTC (rev 2624)
@@ -11,6 +11,7 @@
 version 0.11, 07 Aug 2007, Hans Trompert, now using RouterGroup (== 
BaseNetwork) as a subject, cleanup
 version 0.12, 08 Aug 2007, Hans Trompert, fixed eventType
 version 0.13, 08 Aug 2007, Hans Trompert, showFieldTcpFlags does not take an 
argument
+version 0.14, 10 Aug 2007, Hans Trompert, limited the use of 
http://ggf.org/ns/nmwg/tools/flow/raw/2.0/ sub namespace to eventType only
 
 This response will return information about all flows whithin the specified
 time range from the given router(s), the flows are optionally filtered on
@@ -63,8 +64,8 @@
   </nmwg:metadata>
 
   <nmwg:metadata id="meta2">
-    <raw:subject id="rawsub1" metadataIdRef="meta1"/>
-    <raw:parameters id="rawparamid1">
+    <flow:subject id="flowsub2" metadataIdRef="meta1"/>
+    <flow:parameters id="flowparamid1">
       <nmwg:parameter name="flowVersion">netflow_v9</nmwg:parameter>
       <nmwg:parameter name="sampleRate">100</nmwg:parameter>
       <nmwg:parameter name="aggregationRule">srcip,dstport</nmwg:parameter>
@@ -87,7 +88,7 @@
       <nmwg:parameter name="showFieldTos"/>
       <nmwg:parameter name="showFieldPackets"/>
       <nmwg:parameter name="showFieldBytes"/>
-    </raw:parameters>
+    </flow:parameters>
   </nmwg:metadata>
 
   <nmwg:metadata id="meta3">
@@ -103,13 +104,13 @@
   </nmwg:metadata>
 
   <nmwg:data id="data1" metadataIdRef="meta3">
-    <raw:datum addressFamily="2" timeFirstSeen="1180697264"
+    <flow: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"/>
-    <raw:datum addressFamily="2" timeFirstSeen="1180697332"
+    <flow: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: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/doc/samples/SetupDataResponse-topFlows.xml
===================================================================
--- 
branches/new-structure/trunk/surfnet_java-flowsa-ma/doc/samples/SetupDataResponse-topFlows.xml
      2007-08-09 18:55:00 UTC (rev 2623)
+++ 
branches/new-structure/trunk/surfnet_java-flowsa-ma/doc/samples/SetupDataResponse-topFlows.xml
      2007-08-10 10:16:41 UTC (rev 2624)
@@ -10,6 +10,7 @@
 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.
 version 0.11, 07 Aug 2007, Hans Trompert, now using RouterGroup (== 
BaseNetwork) as a subject, cleanup
 version 0.12, 08 Aug 2007, Hans Trompert, fixed eventType, matched query 
interval to data
+version 0.13, 10 Aug 2007, Hans Trompert, limited the use of 
http://ggf.org/ns/nmwg/tools/flow/top/2.0/ sub namespace to eventType only
 
 This request will return the Top N flow or flow element statistics.
 
@@ -60,15 +61,15 @@
   </nmwg:metadata>
 
   <nmwg:metadata id="meta2">
-    <top:subject id="topsub1" metadataIdRef="meta1"/>
-    <top:parameters id="topparamid1">
+    <flow:subject id="flowsub2" metadataIdRef="meta1"/>
+    <flow:parameters id="flowparamid1">
       <nmwg:parameter name="flowVersion">netflow_v9</nmwg:parameter>
       <nmwg:parameter name="sampleRate">100</nmwg:parameter>
       <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>
-    </top:parameters>
+    </flow:parameters>
   </nmwg:metadata>
 
   <nmwg:metadata id="meta3">
@@ -84,11 +85,11 @@
   </nmwg:metadata>
 
   <nmwg:data id="data1" metadataIdRef="meta3">
-    <top:datum dateFirstSeen="2007-06-01 14:54:39.479"
+    <flow: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"/>
-    <top:datum dateFirstSeen="2007-06-01 14:55:26.379"
+    <flow: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"/>

Modified: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/doc/schemas/FlowsaMA.rnc
===================================================================
--- 
branches/new-structure/trunk/surfnet_java-flowsa-ma/doc/schemas/FlowsaMA.rnc  
      2007-08-09 18:55:00 UTC (rev 2623)
+++ 
branches/new-structure/trunk/surfnet_java-flowsa-ma/doc/schemas/FlowsaMA.rnc  
      2007-08-10 10:16:41 UTC (rev 2624)
@@ -3,8 +3,8 @@
 # File:         Flowsa.rnc - Specialized schema for the Flow Selection
 #               and Aggregation MA.
 # Author:       Hans Trompert, SURFnet
-# Version:      15
-# Date:         August 08, 2007
+# Version:      16
+# Date:         August 10, 2007
 # Purpose:      Describes specific elements to be used in the
 #               FlowsaMA messages.
 # Reference:    http://books.xmlschemata.org/relaxng/page2.html
@@ -48,37 +48,13 @@
 
 FlowsaMetadataContent =
         (
-                FlowsaSubject |
-                FlowsaStatMetadataBlock |
-                FlowsaTopMetadataBlock |
-                FlowsaRawMetadataBlock |
-                FilterMetadataBlock
+                FlowsaSubject? |
+                FlowsaParameterMetadataBlock? |
+                FilterMetadataBlock?
         ) &
-        EventType? &
+        FlowsaEventType? &
         Key?
 
-
-FlowsaStatMetadataBlock =
-        FlowsaStatSubject? &
-        (
-                FlowsaStatParameters |
-                Parameters
-        )?
-
-FlowsaTopMetadataBlock =
-        FlowsaTopSubject? &
-        (
-                FlowsaTopParameters |
-                Parameters
-        )?
-
-FlowsaRawMetadataBlock =
-        FlowsaRawSubject? &
-        (
-                FlowsaRawParameters |
-                Parameters
-        )?
-
 FlowsaSubject =
         element flow:subject {
                 Identifier &
@@ -86,24 +62,17 @@
                 RouterGroup?
         }
 
-FlowsaStatSubject =
-        element stat:subject {
+FlowsaParameterMetadataBlock =
+        element flow:subject {
                 Identifier &
                 MetadataIdentifierRef?
-        }
+        } &
+        (
+                FlowsaStatParameters? |
+                FlowsaRawParameters? |
+                FlowsaTopParameters?
+        )
 
-FlowsaTopSubject =
-        element top:subject {
-                Identifier &
-                MetadataIdentifierRef?
-        }
-
-FlowsaRawSubject =
-        element raw:subject {
-                Identifier &
-                MetadataIdentifierRef?
-        }
-
 # ###################################################################
 #
 # The subject of the message is a group of routers, for this we just
@@ -116,6 +85,22 @@
 
 # ###################################################################
 #
+# The eventType is used to specify the kind of flow query:
+# - statistical information
+# - raw flow information, optionally filtered and/or aggregated
+# - top N statistics
+#
+# ###################################################################
+
+FlowsaEventType =
+        element nmwg:eventType {
+                "http://ggf.org/ns/nmwg/tools/flow/stat/2.0/"; |
+                "http://ggf.org/ns/nmwg/tools/flow/raw/2.0/"; |
+                "http://ggf.org/ns/nmwg/tools/flow/top/2.0/";
+        }
+
+# ###################################################################
+#
 # Flowsa parameters
 #
 # ###################################################################
@@ -206,7 +191,7 @@
         }
 
 FlowsaStatParameters =
-        element stat:parameters {
+        element flow:parameters {
                 Identifier &
                 (
                         FlowVersion? | 
@@ -215,7 +200,7 @@
         }
 
 FlowsaTopParameters =
-        element top:parameters {
+        element flow:parameters {
                 Identifier &
                 (
                         FlowVersion? |
@@ -228,7 +213,7 @@
         }
 
 FlowsaRawParameters =
-        element raw:parameters {
+        element flow:parameters {
                 Identifier &
                 (
                         FlowVersion? | 
@@ -252,13 +237,12 @@
                 (
                         FlowsaStatDatum* |
                         FlowsaTopDatum* |
-                        FlowsaRawDatum* |
-                        ResultDatum*
+                        FlowsaRawDatum* 
                 )
         }
 
 FlowsaStatDatum =
-        element stat:datum {
+        element flow:datum {
                 attribute flows { xsd:string } &
                 attribute flowsTcp { xsd:string } &
                 attribute flowsUdp { xsd:string } &
@@ -283,7 +267,7 @@
         }
 
 FlowsaTopDatum =
-        element top:datum {
+        element flow:datum {
                 attribute dateFirstSeen { xsd:string } &
                 attribute duration { xsd:string } &
                 attribute proto { xsd:string } &
@@ -297,7 +281,7 @@
         }
 
 FlowsaRawDatum =
-        element raw:datum {
+        element flow:datum {
                 attribute addressFamily { xsd:string }? &
                 attribute timeFirstSeen { xsd:string }? &
                 attribute msecFirstSeen { xsd:string }? &