perfsonar development work

Author: zurawski
Date: 2010-09-02 15:02:45 -0400 (Thu, 02 Sep 2010)
New Revision: 390

Modified:
   trunk/nmwg/schema/rnc/owd.rnc
Log:
Using an alternate topology specification (doesn't change anything).  
Re-structure the specification of parameters to allow automated tools to 
parse/convert (also doesn't change anything).  

-jason



Modified: trunk/nmwg/schema/rnc/owd.rnc
===================================================================
--- trunk/nmwg/schema/rnc/owd.rnc       2010-09-02 19:01:36 UTC (rev 389)
+++ trunk/nmwg/schema/rnc/owd.rnc       2010-09-02 19:02:45 UTC (rev 390)
@@ -9,21 +9,18 @@
 #                         
 # ##############################################################
 
-
 namespace nmwg = "http://ggf.org/ns/nmwg/base/2.0/";
 namespace owd = 
"http://ggf.org/ns/nmwg/characteristic/delay/one-way/20070914/";
 namespace nmwgr = "http://ggf.org/ns/nmwg/result/2.0/";
 
-
-include "topo/nmtopo_l4.rnc"
-include "nmtime.rnc"
-include "result.rnc"
 include "nmbase.rnc" {
         Metadata |= OWDMetadata
         Data |= OWDData        
 } 
+include "nmtopo.rnc"
+include "nmtopo-l4.rnc"
+include "result.rnc"
 
-
 OWDMetadata = 
         element nmwg:metadata {
                 Identifier &
@@ -74,42 +71,21 @@
 # size (packet size - bytes or do we have to mess with units?
 #   
 OWDParameter = 
-    (
-        element nmwg:parameter { 
-                attribute name { "count" } &
+        element nmwg:parameter {
+            (
+                attribute name { "count" | "DSCP" | "timeout" | "size" } &
                 (
                         attribute value { xsd:unsignedInt } |
                         xsd:unsignedInt
                 )
-        } &
-        element nmwg:parameter { 
-                attribute name { "DSCP" } &
-                (
-                        attribute value { xsd:unsignedInt } |
-                        xsd:unsignedInt
-                )
-        } &
-        element nmwg:parameter { 
+            ) |
+            (
                 attribute name { "schedule" } &
                 element owd:delayGap {
                     attribute type { "fixed" | "exponential" }
-                } +
-        } &
-        element nmwg:parameter { 
-                attribute name { "timeout" } &
-                (
-                        attribute value { xsd:unsignedInt } |
-                        xsd:unsignedInt
-                )
-        } &
-        element nmwg:parameter { 
-                attribute name { "size" } &
-                (
-                        attribute value { xsd:unsignedInt } |
-                        xsd:unsignedInt
-                )
+                } +            
+            )          
         }
-    )
 
 
 OWDData =