perfsonar development work

Author: hans.trompert
Date: 2007-08-10 07:15:54 -0400 (Fri, 10 Aug 2007)
New Revision: 255

Modified:
   trunk/nmwg/schema/rnc/FlowsaMA.rnc
Log:
limited the use of http://ggf.org/ns/nmwg/tools/flow/top/2.0/ sub namespace 
to eventType only

Modified: trunk/nmwg/schema/rnc/FlowsaMA.rnc
===================================================================
--- trunk/nmwg/schema/rnc/FlowsaMA.rnc  2007-08-08 15:21:01 UTC (rev 254)
+++ trunk/nmwg/schema/rnc/FlowsaMA.rnc  2007-08-10 11:15:54 UTC (rev 255)
@@ -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 }? &