perfsonar development work

Author: zurawski
Date: 2010-09-02 15:01:36 -0400 (Thu, 02 Sep 2010)
New Revision: 389

Modified:
   trunk/nmwg/schema/rnc/iperf.rnc
Log:
Long uncommited changes to iperf.rnc.  Need to allow multiple 
eventTypes, throughput/value are the same thing, and addition of the 
'sent' datum attribute.  

-jason



Modified: trunk/nmwg/schema/rnc/iperf.rnc
===================================================================
--- trunk/nmwg/schema/rnc/iperf.rnc     2010-05-10 17:05:38 UTC (rev 388)
+++ trunk/nmwg/schema/rnc/iperf.rnc     2010-09-02 19:01:36 UTC (rev 389)
@@ -78,7 +78,7 @@
                 IperfMetadataBlock |
                 FilterMetadataBlock                
         ) &        
-        EventType? &
+        EventType* &
         Key?        
 
 
@@ -290,9 +290,12 @@
 
 IperfDatum =
         element iperf:datum {
-                attribute value { xsd:float } &
+                (
+                    attribute value { xsd:float } |
+                    attribute throughput { xsd:string }
+                ) &
+                attribute sent { xsd:string }? &
                 attribute valueUnits { xsd:string }? &        
-                attribute throughput { xsd:string }? & 
                 attribute jitter { xsd:string }? & 
                 attribute loss { xsd:string }? & 
                 attribute numBytes { xsd:int }? &