perfsonar development work

Author: zurawski
Date: 2010-09-02 15:03:58 -0400 (Thu, 02 Sep 2010)
New Revision: 391

Modified:
   trunk/nmwg/schema/rnc/owdsummary.rnc
Log:
Allow multiple eventTypes.  Re-structure the parameters to allow 
automated tools to parse/convert.  Adding in an alternate way to specify 
time.  Adding in two forgotten datum attributes.  Making one attribute 
optional.

-jason



Modified: trunk/nmwg/schema/rnc/owdsummary.rnc
===================================================================
--- trunk/nmwg/schema/rnc/owdsummary.rnc        2010-09-02 19:02:45 UTC (rev 
390)
+++ trunk/nmwg/schema/rnc/owdsummary.rnc        2010-09-02 19:03:58 UTC (rev 
391)
@@ -43,7 +43,7 @@
                 SummaryMetadataBlock |
                 FilterMetadataBlock                
         ) &        
-        EventType? &
+        EventType* &
         Key?        
 
 
@@ -68,15 +68,16 @@
         }
         
 # XXX: Add 'schedule' parameter
-SummaryParameter = 
+SummaryParameter =    
         element nmwg:parameter { 
+            (
                 attribute name { "bucket_width" } &
                 (
                         attribute value { xsd:float } |
                         xsd:float
                 )
-        } &
-        element nmwg:parameter {
+            ) |
+            (
                 attribute name { "schedule" } &
                 (
                        element interval {
@@ -84,9 +85,9 @@
                                 xsd:string
                         } +
                 )
-        }
+            )
+        } 
 
-
 SummaryData =
         element nmwg:data {
                 Identifier &
@@ -112,16 +113,25 @@
 # If is is known that any of the packet measurements were made with
 # unsynchrnonized clocks, then the synchronization attribute of the
 # StartTime SHOULD be set to False.
-                StartTime &
-                EndTime &
                 (
+                    (
+                        StartTime &
+                        EndTime
+                    ) |
+                    (
+                        attribute timeType { string } &
+                        attribute startTime { string } &
+                        attribute endTime { string }
+                    )
+                ) &
+                (
                     attribute sent { xsd:unsignedInt } |
                     element summary:sent { xsd:unsignedInt }
                 ) &
                 (
                     attribute sync { xsd:boolean } |
                     element summary:sync { xsd:boolean }
-                ) &
+                )? &
 # Units is seconds
                 (
                     attribute maxError { xsd:float } |
@@ -129,7 +139,7 @@
                 ) &
                 (
                     attribute duplicates { xsd:unsignedInt } |
-                    element summary:duplicates { xsd:unisgnedInt }
+                    element summary:duplicates { xsd:unsignedInt }
                 ) &
                 (
                     attribute loss { xsd:unsignedInt } |
@@ -152,6 +162,16 @@
                     element summary:max_delay { xsd:float }
                 )? &
 # Units is seconds
+                (
+                    attribute minTTL { xsd:unsignedInt } |
+                    element summary:minTTL { xsd:unsignedInt }
+                )? &
+# Units is seconds
+                (
+                    attribute maxTTL { xsd:unsignedInt } |
+                    element summary:maxTTL { xsd:unsignedInt }
+                )? &
+# Units is seconds
 # *_ipdv_jitter definitions from RFC 3393 (Section 4.5)
 # Basically, consecutive packets are selected for computing ipdv.
                 (