perfsonar development work

Author: hans.trompert
Date: 2008-06-19 05:28:49 -0400 (Thu, 19 Jun 2008)
New Revision: 362

Modified:
   trunk/nmwg/schema/rnc/netflow.rnc
Log:
#               v2 - Hans Trompert - June 19, 2008
#               Removed transportFormats en flowFormats, this is
#               information that needs to be communicated to the
#               LS and does not belong in a SetupDataRequest/
#               Response.


Modified: trunk/nmwg/schema/rnc/netflow.rnc
===================================================================
--- trunk/nmwg/schema/rnc/netflow.rnc   2008-06-16 02:41:55 UTC (rev 361)
+++ trunk/nmwg/schema/rnc/netflow.rnc   2008-06-19 09:28:49 UTC (rev 362)
@@ -8,6 +8,15 @@
 #               messages.
 # Reference:    http://books.xmlschemata.org/relaxng/page2.html
 #                         
+# History:      v1 - author(s) unknown - 2006/2007
+#               Initial version.
+#
+#               v2 - Hans Trompert - June 19, 2008
+#               Removed transportFormats en flowFormats, this is
+#               information that needs to be communicated to the
+#               LS and does not belong in a SetupDataRequest/
+#               Response.
+#
 # ##############################################################
 
 
@@ -74,13 +83,9 @@
 NetflowParameters =
         element netflow:parameters {
                 Identifier &        
-                (
-                        NetflowParameter |
-                        NetflowFlowFormats |
-                        NetflowTransportFormats
-                )+
+                NetflowParameter*
         }
-        
+
 NetflowParameter = 
         element nmwg:parameter { 
                 attribute name { "sampleRate" | "anonymizationLevel" |
@@ -92,36 +97,6 @@
                 )
         }
 
-NetflowFlowFormats = 
-        element nmwg:parameter { 
-                attribute name { "flowFormats" } &
-                NetflowFlowFormat+
-        }
-        
-NetflowTransportFormats = 
-        element nmwg:parameter { 
-                attribute name { "transportFormats" } &
-                NetflowTransportFormat+
-        }        
-
-NetflowFlowFormat = 
-        element netflow:flowFormat { 
-                attribute index {text} &
-                (
-                        attribute value { text } |
-                        text
-                )
-        }
-
-NetflowTransportFormat = 
-        element netflow:transportFormat { 
-                attribute index { text } &
-                (
-                        attribute value { text } |
-                        text
-                )
-        }
-
 NetflowRouter = 
         element netflow:router {
                 Identifier &