perfsonar development work

Author: hans.trompert
Date: 2007-08-08 08:58:29 -0400 (Wed, 08 Aug 2007)
New Revision: 253

Modified:
   trunk/nmwg/schema/rnc/FlowsaMA.rnc
Log:
Changed subject of all messages to RouterGroup (== BaseNetwork).
Changed parameter organization.

Modified: trunk/nmwg/schema/rnc/FlowsaMA.rnc
===================================================================
--- trunk/nmwg/schema/rnc/FlowsaMA.rnc  2007-08-08 12:45:22 UTC (rev 252)
+++ trunk/nmwg/schema/rnc/FlowsaMA.rnc  2007-08-08 12:58:29 UTC (rev 253)
@@ -1,18 +1,21 @@
-# ##############################################################
+# ###################################################################
 # 
 # File:         Flowsa.rnc - Specialized schema for the Flow Selection
 #               and Aggregation MA.
-# Version:      $Id$
+# Author:       Hans Trompert, SURFnet
+# Version:      14
+# Date:         August 08, 2007
 # Purpose:      Describes specific elements to be used in the
-#               FlowsaMA specific messages.
+#               FlowsaMA messages.
 # Reference:    http://books.xmlschemata.org/relaxng/page2.html
 #                         
-# ##############################################################
+# ###################################################################
 
 
-# ##############################################################
+# ###################################################################
 # Namespace definitions
-# ##############################################################
+# ###################################################################
+
 namespace nmwg      = "http://ggf.org/ns/nmwg/base/2.0/";
 namespace flow      = "http://ggf.org/ns/nmwg/tools/flow/2.0/";
 namespace stat      = "http://ggf.org/ns/nmwg/tools/flow/stat/2.0/";
@@ -20,9 +23,10 @@
 namespace raw       = "http://ggf.org/ns/nmwg/tools/flow/raw/2.0/";
 namespace nmwgtopo3 = "http://ggf.org/ns/nmwg/topology/base/3.0/";
 
-# ##############################################################
+# ###################################################################
 # Include additional functionality from other files
-# ##############################################################
+# ###################################################################
+
 include "nmtopo.rnc"
 include "nmtopo_ver3.rnc"
 include "result.rnc"
@@ -31,6 +35,10 @@
         Data |= FlowsaData
 }
 
+# ###################################################################
+# Flowsa metadata
+# ###################################################################
+
 FlowsaMetadata =
         element nmwg:metadata {
                 Identifier &
@@ -40,7 +48,8 @@
 
 FlowsaMetadataContent =
         (
-                FlowsaMetadataBlock |
+                FlowsaSubject |
+                FlowsaStatMetadataBlock |
                 FlowsaTopMetadataBlock |
                 FlowsaRawMetadataBlock |
                 FilterMetadataBlock
@@ -48,10 +57,11 @@
         EventType? &
         Key?
 
-FlowsaMetadataBlock =
-        FlowsaSubject? &
+
+FlowsaStatMetadataBlock =
+        FlowsaStatSubject? &
         (
-                FlowsaParameters |
+                FlowsaStatParameters |
                 Parameters
         )?
 
@@ -73,9 +83,15 @@
         element flow:subject {
                 Identifier &
                 MetadataIdentifierRef? &
-                Router
+                RouterGroup?
         }
 
+FlowsaStatSubject =
+        element stat:subject {
+                Identifier &
+                MetadataIdentifierRef?
+        }
+
 FlowsaTopSubject =
         element top:subject {
                 Identifier &
@@ -88,54 +104,22 @@
                 MetadataIdentifierRef?
         }
 
-# ####################################
+# ###################################################################
 #
-# Router is a lesser version of the
-# nmwg version 3 topology node.
+# The subject of the message is a group of routers, for this we just
+# use the BaseNetwork element from the nmwg version 3 topology
+# namespace.
 #
-# ####################################
+# ###################################################################
 
-Router =
-        element nmwgtopo3:node {
-                RouterContent
-        }
+RouterGroup = BaseNetwork
 
-RouterContent =
-        element nmwgtopo3:hostName { xsd:string } &
-        element nmwgtopo3:description { xsd:string }? &
-        element nmwgtopo3:operSys { xsd:string }? &
-        element nmwgtopo3:location {
-                RouterLocationContent
-        }?
-
-RouterLocationContent =
-        element nmwgtopo3:institution { xsd:string }? &
-        element nmwgtopo3:country { xsd:string }? &
-        element nmwgtopo3:city { xsd:string }? &
-        element nmwgtopo3:latitude { xsd:float }? &
-        element nmwgtopo3:longitude { xsd:float }?
-
-
-# #########################################
+# ###################################################################
 #
-# Parameters
+# Flowsa parameters
 #
-# #########################################
+# ###################################################################
 
-FlowVersions = 
-        element nmwg:parameter { 
-                attribute name { "flowVersion" } &
-                FlowVersion
-        }
-        
-FlowVersion = ("netflow_v9" | "netflow_v5" | "sflow")
-
-FlowSampleRate =
-        element nmwg:parameter {
-                attribute name { "sampleRate" } &
-                xsd:int
-        }
-
 TopStatistics =
         element nmwg:parameter {
                 attribute name { "topStatistic" } &
@@ -161,80 +145,98 @@
         }
 
 AggregationRule =
-       element nmwg:parameter {
-               attribute name { "aggregationRule" } &
-               xsd:string
-       }
+        element nmwg:parameter {
+                attribute name { "aggregationRule" } &
+                xsd:string
+        }
 
 FilterRule =
-       element nmwg:parameter {
-               attribute name { "filterRule" } &
-               xsd:string
-       }
+        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" 
-               }
-       }
+        element nmwg:parameter {
+                attribute name {
+                        "showFieldAddressFamily" |
+                        "showFieldTimeFirstSeen" |
+                        "showFieldMsecFirstSeen" |
+                        "showFieldTimeLastSeen" |
+                        "showFieldMsecLastSeen" |
+                        "showFieldProtocol" |
+                        "showFieldSrcAddress" |
+                        "showFieldSrcPort" |
+                        "showFieldDstAddress" |
+                        "showFieldDstPort" |
+                        "showFieldSrcAS" |
+                        "showFieldDstAS" |
+                        "showFieldInputIF" |
+                        "showFieldOutputIF" |
+                        "showFieldTos" |
+                        "showFieldPackets" |
+                        "showFieldBytes" 
+                }
+        }
 
 ShowFieldTcpFlags =
-       element nmwg:parameter {
-               attribute name { "showFieldTcpFlags" } &
-               xsd:string
-       }
+        element nmwg:parameter {
+                attribute name { "showFieldTcpFlags" } &
+                xsd:string
+        }
 
-FlowsaParameters =
-        element flow:parameters {
-                Identifier &
-                (
-                        FlowVersions,
-                        FlowSampleRate
-                )
+FlowsaStatParameters =
+        element stat:parameters {
+                Identifier,
+                FlowVersion?, 
+                FlowSampleRate?
         }
 
 FlowsaTopParameters =
         element top:parameters {
                 Identifier,
+                FlowVersion?, 
+                FlowSampleRate?,
                 TopStatistics?,
                 OrderBy?,
                 SplitProtocol?,
-                TopN? 
+                TopN?
         }
 
 FlowsaRawParameters =
         element raw:parameters {
                 Identifier,
+                FlowVersion?, 
+                FlowSampleRate?,
                 AggregationRule?,
                 FilterRule?,
                 (
-                       ShowFieldParameter |
-                       ShowFieldTcpFlags
+                        ShowFieldParameter |
+                        ShowFieldTcpFlags
                 )+
         }
 
-# #########################################
+# ###################################################################
 #
-# Flowsa Data
+# Flowsa data
 #
-# #########################################
+# ###################################################################
 
 FlowsaData =
         element nmwg:data {
@@ -275,37 +277,37 @@
 
 FlowsaTopDatum =
         element top: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 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 }
+        }
 
 FlowsaRawDatum =
         element raw: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 }? 
-       }
+                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 }? 
+        }