perfsonar development work

Author: hans.trompert
Date: 2008-06-19 07:25:13 -0400 (Thu, 19 Jun 2008)
New Revision: 363

Modified:
   trunk/nmwg/schema/rnc/FlowsaMA.rnc
Log:
# Note:         v18 is a simplification of the v17 schema in order
#               for the test team to use soapui for validation,
#               due to this some of the semantics is lost, the
#               parts that were changed are marked "# v17 #"


Modified: trunk/nmwg/schema/rnc/FlowsaMA.rnc
===================================================================
--- trunk/nmwg/schema/rnc/FlowsaMA.rnc  2008-06-19 09:28:49 UTC (rev 362)
+++ trunk/nmwg/schema/rnc/FlowsaMA.rnc  2008-06-19 11:25:13 UTC (rev 363)
@@ -3,12 +3,17 @@
 # File:         Flowsa.rnc - Specialized schema for the Flow Selection
 #               and Aggregation MA.
 # Author:       Hans Trompert, SURFnet
-# Version:      17
-# Date:         August 13, 2007
+# Version:      18
+# Date:         June 10, 2008
 # Purpose:      Describes specific elements to be used in the
 #               FlowsaMA messages.
 # Reference:    http://books.xmlschemata.org/relaxng/page2.html
-#                         
+#
+# Note:         v18 is a simplification of the v17 schema in order
+#               for the test team to use soapui for validation,
+#               due to this some of the semantics is lost, the
+#               parts that were changed are marked "# v17 #"
+#
 # ###################################################################
 
 
@@ -46,32 +51,41 @@
                 FlowsaMetadataContent
         }
 
+# v17 #FlowsaMetadataContent =
+# v17 #        (
+# v17 #                FlowsaSubject? |
+# v17 #                FlowsaParameterMetadataBlock? |
+# v17 #                FilterMetadataBlock?
+# v17 #        ) &
+# v17 #        FlowsaEventType? &
+# v17 #        Key?
+# v17 #
+
 FlowsaMetadataContent =
         (
-                FlowsaSubject? |
-                FlowsaParameterMetadataBlock? |
+                FlowsaMetadataBlock? |
                 FilterMetadataBlock?
         ) &
         FlowsaEventType? &
         Key?
 
-FlowsaSubject =
-        element flow:subject {
-                Identifier &
-                MetadataIdentifierRef? &
-                RouterGroup?
-        }
+# v17 #FlowsaParameterMetadataBlock =
+# v17 #        element flow:subject {
+# v17 #                Identifier &
+# v17 #                MetadataIdentifierRef?
+# v17 #        } &
+# v17 #        (
+# v17 #                FlowsaStatParameters? |
+# v17 #                FlowsaRawParameters? |
+# v17 #                FlowsaTopParameters?
+# v17 #        )
 
-FlowsaParameterMetadataBlock =
-        element flow:subject {
-                Identifier &
-                MetadataIdentifierRef?
-        } &
+FlowsaMetadataBlock =
+        FlowsaSubject? &
         (
-                FlowsaStatParameters? |
-                FlowsaRawParameters? |
-                FlowsaTopParameters?
-        )
+                FlowsaParameters |
+                Parameters
+        )?
 
 # ###################################################################
 #
@@ -81,6 +95,13 @@
 #
 # ###################################################################
 
+FlowsaSubject =
+        element flow:subject {
+                Identifier &
+                MetadataIdentifierRef? &
+                RouterGroup?
+        }
+
 RouterGroup = BaseNetwork
 
 # ###################################################################
@@ -105,202 +126,295 @@
 #
 # ###################################################################
 
-TopStatistics =
-        element nmwg:parameter {
-                attribute name { "topStatistic" } &
-               (
-                        "record" | "srcip" | "dstip" | "ip" |
-                        "addresses" | "srcport" | "dstport" |
-                        "port" | "ports" | "srcas" | "dstas" |
-                        "as" | "numbers" | "inif" | "outif" |
-                        "if" | "interface" | "proto"
-                )
-        }
+# v17 #TopStatistics =
+# v17 #        element nmwg:parameter {
+# v17 #                attribute name { "topStatistic" } &
+# v17 #               (
+# v17 #                        "record" | "srcip" | "dstip" | "ip" |
+# v17 #                        "addresses" | "srcport" | "dstport" |
+# v17 #                        "port" | "ports" | "srcas" | "dstas" |
+# v17 #                        "as" | "numbers" | "inif" | "outif" |
+# v17 #                        "if" | "interface" | "proto"
+# v17 #                )
+# v17 #        }
+# v17 #
+# v17 #OrderBy =
+# v17 #        element nmwg:parameter {
+# v17 #                attribute name { "orderBy" } &
+# v17 #                (
+# v17 #                        "flows" | "packets" | "bytes" | "pps" |
+# v17 #                        "bps" | "bpp"
+# v17 #                )
+# v17 #        }
+# v17 #
+# v17 #SplitProtocol =
+# v17 #        element nmwg:parameter {
+# v17 #                attribute name { "splitProtocol" } &
+# v17 #                (
+# v17 #                        "yes" | "no"
+# v17 #                )
+# v17 #        }
+# v17 #
+# v17 #TopN =
+# v17 #        element nmwg:parameter {
+# v17 #                attribute name { "topN" } &
+# v17 #                xsd:int
+# v17 #        }
+# v17 #
+# v17 #AggregationRule =
+# v17 #        element nmwg:parameter {
+# v17 #                attribute name { "aggregationRule" } &
+# v17 #                xsd:string
+# v17 #        }
+# v17 #
+# v17 #FilterRule =
+# v17 #        element nmwg:parameter {
+# v17 #                attribute name { "filterRule" } &
+# v17 #                xsd:string
+# v17 #        }
+# v17 #
+# v17 #FlowVersion = 
+# v17 #        element nmwg:parameter {
+# v17 #                attribute name { "flowVersion" } &
+# v17 #                (
+# v17 #                    "netflow_v9" | "netflow_v5" | "sflow"
+# v17 #                )
+# v17 #        }
+# v17 #
+# v17 #FlowSampleRate =
+# v17 #        element nmwg:parameter {
+# v17 #                attribute name { "sampleRate" } &
+# v17 #                xsd:int
+# v17 #        }        
+# v17 #
+# v17 #ShowFieldParameter =
+# v17 #        element nmwg:parameter {
+# v17 #                attribute name {
+# v17 #                        "showFieldAddressFamily" |
+# v17 #                        "showFieldTimeFirstSeen" |
+# v17 #                        "showFieldMsecFirstSeen" |
+# v17 #                        "showFieldTimeLastSeen" |
+# v17 #                        "showFieldMsecLastSeen" |
+# v17 #                        "showFieldProtocol" |
+# v17 #                        "showFieldSrcAddress" |
+# v17 #                        "showFieldSrcPort" |
+# v17 #                        "showFieldDstAddress" |
+# v17 #                        "showFieldDstPort" |
+# v17 #                        "showFieldSrcAS" |
+# v17 #                        "showFieldDstAS" |
+# v17 #                        "showFieldInputIF" |
+# v17 #                        "showFieldOutputIF" |
+# v17 #                        "showFieldTos" |
+# v17 #                        "showFieldPackets" |
+# v17 #                        "showFieldBytes" |
+# v17 #                        "showFieldTcpFlags"
+# v17 #                }
+# v17 #        }
+# v17 #
+# v17 #FlowsaStatParameters =
+# v17 #        element flow:parameters {
+# v17 #                Identifier &
+# v17 #                (
+# v17 #                        FlowVersion? | 
+# v17 #                        FlowSampleRate?
+# v17 #                )+
+# v17 #        }
+# v17 #
+# v17 #FlowsaTopParameters =
+# v17 #        element flow:parameters {
+# v17 #                Identifier &
+# v17 #                (
+# v17 #                        FlowVersion? |
+# v17 #                        FlowSampleRate? |
+# v17 #                        AggregationRule? |
+# v17 #                        FilterRule? |
+# v17 #                        TopStatistics? |
+# v17 #                        OrderBy? |
+# v17 #                        SplitProtocol? |
+# v17 #                        TopN?
+# v17 #                )+
+# v17 #        }
+# v17 #
+# v17 #FlowsaRawParameters =
+# v17 #        element flow:parameters {
+# v17 #                Identifier &
+# v17 #                (
+# v17 #                        FlowVersion? | 
+# v17 #                        FlowSampleRate? |
+# v17 #                        AggregationRule? |
+# v17 #                        FilterRule? |
+# v17 #                        ShowFieldParameter?
+# v17 #                )+
+# v17 #        }
+# v17 #
 
-OrderBy =
-        element nmwg:parameter {
-                attribute name { "orderBy" } &
-                (
-                        "flows" | "packets" | "bytes" | "pps" |
-                        "bps" | "bpp"
-                )
+FlowsaParameters =
+        element flow:parameters {
+                Identifier &
+                FlowsaParameter*
         }
 
-SplitProtocol =
+FlowsaParameter =
         element nmwg:parameter {
-                attribute name { "splitProtocol" } &
+                attribute name { "aggregationRule" | "filterRule" | 
"sampleRate" |
+                                 "flowVersion" | "orderBy" | 
"showFieldParameter" |
+                                 "splitProtocol" | "topN" | "topStatistic" |
+                                 "showFieldAddressFamily" | 
"showFieldTimeFirstSeen" |
+                                 "showFieldMsecFirstSeen" | 
"showFieldTimeLastSeen" |
+                                 "showFieldMsecLastSeen" | 
"showFieldProtocol" |
+                                 "showFieldSrcAddress" | "showFieldSrcPort" |
+                                 "showFieldDstAddress" | "showFieldDstPort" |
+                                 "showFieldSrcAS" | "showFieldDstAS" |
+                                 "showFieldInputIF" | "showFieldOutputIF" |
+                                 "showFieldTos" | "showFieldPackets" |
+                                 "showFieldBytes" | "showFieldTcpFlags" } &
                 (
-                        "yes" | "no"
+                        attribute value { text } |
+                        text
                 )
         }
 
-TopN =
-        element nmwg:parameter {
-                attribute name { "topN" } &
-                xsd:int
-        }
-
-AggregationRule =
-        element nmwg:parameter {
-                attribute name { "aggregationRule" } &
-                xsd:string
-        }
-
-FilterRule =
-        element nmwg:parameter {
-                attribute name { "filterRule" } &
-                xsd:string
-        }
-
-FlowVersion = 
-        element nmwg:parameter {
-                attribute name { "flowVersion" } &
-                (
-                    "netflow_v9" | "netflow_v5" | "sflow"
-                )
-        }
-
-FlowSampleRate =
-        element nmwg:parameter {
-                attribute name { "sampleRate" } &
-                xsd:int
-        }        
-
-ShowFieldParameter =
-        element nmwg:parameter {
-                attribute name {
-                        "showFieldAddressFamily" |
-                        "showFieldTimeFirstSeen" |
-                        "showFieldMsecFirstSeen" |
-                        "showFieldTimeLastSeen" |
-                        "showFieldMsecLastSeen" |
-                        "showFieldProtocol" |
-                        "showFieldSrcAddress" |
-                        "showFieldSrcPort" |
-                        "showFieldDstAddress" |
-                        "showFieldDstPort" |
-                        "showFieldSrcAS" |
-                        "showFieldDstAS" |
-                        "showFieldInputIF" |
-                        "showFieldOutputIF" |
-                        "showFieldTos" |
-                        "showFieldPackets" |
-                        "showFieldBytes" |
-                        "showFieldTcpFlags"
-                }
-        }
-
-FlowsaStatParameters =
-        element flow:parameters {
-                Identifier &
-                (
-                        FlowVersion? | 
-                        FlowSampleRate?
-                )+
-        }
-
-FlowsaTopParameters =
-        element flow:parameters {
-                Identifier &
-                (
-                        FlowVersion? |
-                        FlowSampleRate? |
-                        AggregationRule? |
-                        FilterRule? |
-                        TopStatistics? |
-                        OrderBy? |
-                        SplitProtocol? |
-                        TopN?
-                )+
-        }
-
-FlowsaRawParameters =
-        element flow:parameters {
-                Identifier &
-                (
-                        FlowVersion? | 
-                        FlowSampleRate? |
-                        AggregationRule? |
-                        FilterRule? |
-                        ShowFieldParameter?
-                )+
-        }
-
 # ###################################################################
 #
 # Flowsa data
 #
 # ###################################################################
 
+# v17 #FlowsaData =
+# v17 #        element nmwg:data {
+# v17 #                Identifier &
+# v17 #                MetadataIdentifierRef? &
+# v17 #                (
+# v17 #                        FlowsaStatDatum* |
+# v17 #                        FlowsaTopDatum* |
+# v17 #                        FlowsaRawDatum* 
+# v17 #                )
+# v17 #        }
+
 FlowsaData =
         element nmwg:data {
                 Identifier &
                 MetadataIdentifierRef? &
-                (
-                        FlowsaStatDatum* |
-                        FlowsaTopDatum* |
-                        FlowsaRawDatum* 
-                )
+                FlowsaDatum* 
         }
 
-FlowsaStatDatum =
-        element flow:datum {
-                attribute flows { xsd:string } &
-                attribute flowsTcp { xsd:string } &
-                attribute flowsUdp { xsd:string } &
-                attribute flowsIcmp { xsd:string } &
-                attribute flowsOther { xsd:string } &
-                attribute packets { xsd:string } &
-                attribute packetsTcp { xsd:string } &
-                attribute packetsUdp { xsd:string } &
-                attribute packetsIcmp { xsd:string } &
-                attribute packetsOther { xsd:string } &
-                attribute bytes { xsd:string } &
-                attribute bytesTcp { xsd:string } &
-                attribute bytesUdp { xsd:string } &
-                attribute bytesIcmp { xsd:string } &
-                attribute bytesOther { xsd:string } &
-                attribute first { xsd:string } &
-                attribute last { xsd:string } &
-                attribute msecFirst { xsd:string } &
-                attribute msecLast { xsd:string } &
-                attribute sequenceFailures { xsd:string } &
-                Time
-        }
+# v17 #FlowsaStatDatum =
+# v17 #        element flow:datum {
+# v17 #                attribute flows { xsd:string } &
+# v17 #                attribute flowsTcp { xsd:string } &
+# v17 #                attribute flowsUdp { xsd:string } &
+# v17 #                attribute flowsIcmp { xsd:string } &
+# v17 #                attribute flowsOther { xsd:string } &
+# v17 #                attribute packets { xsd:string } &
+# v17 #                attribute packetsTcp { xsd:string } &
+# v17 #                attribute packetsUdp { xsd:string } &
+# v17 #                attribute packetsIcmp { xsd:string } &
+# v17 #                attribute packetsOther { xsd:string } &
+# v17 #                attribute bytes { xsd:string } &
+# v17 #                attribute bytesTcp { xsd:string } &
+# v17 #                attribute bytesUdp { xsd:string } &
+# v17 #                attribute bytesIcmp { xsd:string } &
+# v17 #                attribute bytesOther { xsd:string } &
+# v17 #                attribute first { xsd:string } &
+# v17 #                attribute last { xsd:string } &
+# v17 #                attribute msecFirst { xsd:string } &
+# v17 #                attribute msecLast { xsd:string } &
+# v17 #                attribute sequenceFailures { xsd:string } &
+# v17 #                Time
+# v17 #        }
+# v17 #
+# v17 #FlowsaTopDatum =
+# v17 #        element flow:datum {
+# v17 #                attribute dateFirstSeen { xsd:string } &
+# v17 #                attribute duration { xsd:string } &
+# v17 #                attribute proto { xsd:string } &
+# v17 #                attribute topStatistic { xsd:string } &
+# v17 #                attribute flows { xsd:string } &
+# v17 #                attribute packets { xsd:string } &
+# v17 #                attribute bytes { xsd:string } &
+# v17 #                attribute pps { xsd:string } &
+# v17 #                attribute bps { xsd:string } &
+# v17 #                attribute bpp { xsd:string }
+# v17 #        }
+# v17 #
+# v17 #FlowsaRawDatum =
+# v17 #        element flow:datum {
+# v17 #                attribute addressFamily { xsd:string }? &
+# v17 #                attribute timeFirstSeen { xsd:string }? &
+# v17 #                attribute msecFirstSeen { xsd:string }? &
+# v17 #                attribute timeLastSeen { xsd:string }? &
+# v17 #                attribute msecLastSeen { xsd:string }? &
+# v17 #                attribute protocol { xsd:string }? &
+# v17 #                attribute srcAddress { xsd:string }? &
+# v17 #                attribute srcPort { xsd:string }? &
+# v17 #                attribute dstAddress { xsd:string }? &
+# v17 #                attribute dstPort { xsd:string }? &
+# v17 #                attribute srcAS { xsd:string }? &
+# v17 #                attribute dstAS { xsd:string }? &
+# v17 #                attribute inputIF { xsd:string }? &
+# v17 #                attribute outputIF { xsd:string }? &
+# v17 #                attribute tcpFlags { xsd:string }? &
+# v17 #                attribute tos { xsd:string }? &
+# v17 #                attribute packets { xsd:string }? &
+# v17 #                attribute bytes { xsd:string }? 
+# v17 #        }
 
-FlowsaTopDatum =
+FlowsaDatum =
         element flow:datum {
-                attribute dateFirstSeen { xsd:string } &
-                attribute duration { xsd:string } &
-                attribute proto { xsd:string } &
-                attribute topStatistic { xsd:string } &
-                attribute flows { xsd:string } &
-                attribute packets { xsd:string } &
-                attribute bytes { xsd:string } &
-                attribute pps { xsd:string } &
-                attribute bps { xsd:string } &
-                attribute bpp { xsd:string }
+                (
+                        attribute flows { xsd:string } &
+                        attribute flowsTcp { xsd:string } &
+                        attribute flowsUdp { xsd:string } &
+                        attribute flowsIcmp { xsd:string } &
+                        attribute flowsOther { xsd:string } &
+                        attribute packets { xsd:string } &
+                        attribute packetsTcp { xsd:string } &
+                        attribute packetsUdp { xsd:string } &
+                        attribute packetsIcmp { xsd:string } &
+                        attribute packetsOther { xsd:string } &
+                        attribute bytes { xsd:string } &
+                        attribute bytesTcp { xsd:string } &
+                        attribute bytesUdp { xsd:string } &
+                        attribute bytesIcmp { xsd:string } &
+                        attribute bytesOther { xsd:string } &
+                        attribute first { xsd:string } &
+                        attribute last { xsd:string } &
+                        attribute msecFirst { xsd:string } &
+                        attribute msecLast { xsd:string } &
+                        attribute sequenceFailures { xsd:string } &
+                        Time
+                ) |
+                (
+                        attribute dateFirstSeen { xsd:string } &
+                        attribute duration { xsd:string } &
+                        attribute proto { xsd:string } &
+                        attribute topStatistic { xsd:string } &
+                        attribute flows { xsd:string } &
+                        attribute packets { xsd:string } &
+                        attribute bytes { xsd:string } &
+                        attribute pps { xsd:string } &
+                        attribute bps { xsd:string } &
+                        attribute bpp { xsd:string }
+                ) |
+                (
+                        attribute addressFamily { xsd:string }? &
+                        attribute timeFirstSeen { xsd:string }? &
+                        attribute msecFirstSeen { xsd:string }? &
+                        attribute timeLastSeen { xsd:string }? &
+                        attribute msecLastSeen { xsd:string }? &
+                        attribute protocol { xsd:string }? &
+                        attribute srcAddress { xsd:string }? &
+                        attribute srcPort { xsd:string }? &
+                        attribute dstAddress { xsd:string }? &
+                        attribute dstPort { xsd:string }? &
+                        attribute srcAS { xsd:string }? &
+                        attribute dstAS { xsd:string }? &
+                        attribute inputIF { xsd:string }? &
+                        attribute outputIF { xsd:string }? &
+                        attribute tcpFlags { xsd:string }? &
+                        attribute tos { xsd:string }? &
+                        attribute packets { xsd:string }? &
+                        attribute bytes { xsd:string }? 
+                )
         }
 
-FlowsaRawDatum =
-        element flow:datum {
-                attribute addressFamily { xsd:string }? &
-                attribute timeFirstSeen { xsd:string }? &
-                attribute msecFirstSeen { xsd:string }? &
-                attribute timeLastSeen { xsd:string }? &
-                attribute msecLastSeen { xsd:string }? &
-                attribute protocol { xsd:string }? &
-                attribute srcAddress { xsd:string }? &
-                attribute srcPort { xsd:string }? &
-                attribute dstAddress { xsd:string }? &
-                attribute dstPort { xsd:string }? &
-                attribute srcAS { xsd:string }? &
-                attribute dstAS { xsd:string }? &
-                attribute inputIF { xsd:string }? &
-                attribute outputIF { xsd:string }? &
-                attribute tcpFlags { xsd:string }? &
-                attribute tos { xsd:string }? &
-                attribute packets { xsd:string }? &
-                attribute bytes { xsd:string }? 
-        }
-