perfsonar development work

Author: hans.trompert
Date: 2007-08-08 11:21:01 -0400 (Wed, 08 Aug 2007)
New Revision: 254

Modified:
   trunk/nmwg/schema/rnc/FlowsaMA.rnc
Log:
Made parameters position independent.
Restricted some parameters values. 

Modified: trunk/nmwg/schema/rnc/FlowsaMA.rnc
===================================================================
--- trunk/nmwg/schema/rnc/FlowsaMA.rnc  2007-08-08 12:58:29 UTC (rev 253)
+++ trunk/nmwg/schema/rnc/FlowsaMA.rnc  2007-08-08 15:21:01 UTC (rev 254)
@@ -3,7 +3,7 @@
 # File:         Flowsa.rnc - Specialized schema for the Flow Selection
 #               and Aggregation MA.
 # Author:       Hans Trompert, SURFnet
-# Version:      14
+# Version:      15
 # Date:         August 08, 2007
 # Purpose:      Describes specific elements to be used in the
 #               FlowsaMA messages.
@@ -123,19 +123,30 @@
 TopStatistics =
         element nmwg:parameter {
                 attribute name { "topStatistic" } &
-                xsd:string
+               (
+                        "record" | "srcip" | "dstip" | "ip" |
+                        "addresses" | "srcport" | "dstport" |
+                        "port" | "ports" | "srcas" | "dstas" |
+                        "as" | "numbers" | "inif" | "outif" |
+                        "if" | "interface" | "proto"
+                )
         }
 
 OrderBy =
         element nmwg:parameter {
                 attribute name { "orderBy" } &
-                xsd:string
+                (
+                        "flows" | "packets" | "bytes" | "pps" |
+                        "bps" | "bpp"
+                )
         }
 
 SplitProtocol =
         element nmwg:parameter {
                 attribute name { "splitProtocol" } &
-                xsd:string
+                (
+                        "yes" | "no"
+                )
         }
 
 TopN =
@@ -160,9 +171,7 @@
         element nmwg:parameter {
                 attribute name { "flowVersion" } &
                 (
-                    "netflow_v9" |
-                    "netflow_v5" |
-                    "sflow"
+                    "netflow_v9" | "netflow_v5" | "sflow"
                 )
         }
 
@@ -191,44 +200,42 @@
                         "showFieldOutputIF" |
                         "showFieldTos" |
                         "showFieldPackets" |
-                        "showFieldBytes" 
+                        "showFieldBytes" |
+                        "showFieldTcpFlags"
                 }
         }
 
-ShowFieldTcpFlags =
-        element nmwg:parameter {
-                attribute name { "showFieldTcpFlags" } &
-                xsd:string
-        }
-
 FlowsaStatParameters =
         element stat:parameters {
-                Identifier,
-                FlowVersion?, 
-                FlowSampleRate?
+                Identifier &
+                (
+                        FlowVersion? | 
+                        FlowSampleRate?
+                )+
         }
 
 FlowsaTopParameters =
         element top:parameters {
-                Identifier,
-                FlowVersion?, 
-                FlowSampleRate?,
-                TopStatistics?,
-                OrderBy?,
-                SplitProtocol?,
-                TopN?
+                Identifier &
+                (
+                        FlowVersion? |
+                        FlowSampleRate? |
+                        TopStatistics? |
+                        OrderBy? |
+                        SplitProtocol? |
+                        TopN?
+                )+
         }
 
 FlowsaRawParameters =
         element raw:parameters {
-                Identifier,
-                FlowVersion?, 
-                FlowSampleRate?,
-                AggregationRule?,
-                FilterRule?,
+                Identifier &
                 (
-                        ShowFieldParameter |
-                        ShowFieldTcpFlags
+                        FlowVersion? | 
+                        FlowSampleRate? |
+                        AggregationRule? |
+                        FilterRule? |
+                        ShowFieldParameter?
                 )+
         }