perfsonar development work

Author: boote
Date: 2007-09-15 01:27:48 -0400 (Sat, 15 Sep 2007)
New Revision: 269

Added:
   branches/owd/
   branches/owd/rnc/owd.rnc
Modified:
   branches/owd/rnc/nmtime.rnc
   branches/owd/rnc/topo/nmtopo_l4.rnc
Log:
Proposed changes - I will merge these into trunk in a couple of days
if no one has problems with it:

nmtopo_l4.rnc:
    Removed "src"/"dst" specification in Roll. This is now only
    semantically checked. The requirement of one 'src' and one 'dst'
    did not work will with some tooling, and it is not worth the
    trouble.

nmtime.rnc:
    Added 'Precision'.

owd.rnc:
    Schema for one-way "raw" data.



Copied: branches/owd (from rev 264, trunk/nmwg/schema)

Modified: branches/owd/rnc/nmtime.rnc
===================================================================
--- trunk/nmwg/schema/rnc/nmtime.rnc    2007-09-08 03:07:54 UTC (rev 264)
+++ branches/owd/rnc/nmtime.rnc 2007-09-15 05:27:48 UTC (rev 269)
@@ -11,7 +11,7 @@
 # ##############################################################
 # Namespace definitions
 # ##############################################################
-namespace nmtm = "http://ggf.org/ns/nmwg/time/2.0/";
+namespace nmtm = "http://ggf.org/ns/nmwg/time/20070914/";
 
 
 # ##############################################################
@@ -44,6 +44,7 @@
 Time = 
         element nmtm:time {
                 attribute type { xsd:string } &
+                Precision? &
                 (
                          TimeStamp |
                          (
@@ -56,10 +57,28 @@
                 )
         } 
 
+Precision =
+        (
+            (
+                attribute precision { xsd:unsignedInt } &
+                attribute precisionUnits { xsd:string } &
+                attribute synchronized { xsd:boolean }?
+            ) |
+            element nmtm:precision {
+                attribute precisionUnits { xsd:string } &
+                attribute synchronized { xsd:boolean }? &
+                xsd:unsignedInt
+            }
+        )
+        
+
 TimeStamp =   
-        ( 
-                attribute value { xsd:string } |
-                element nmtm:value { xsd:string }
+        (
+                ( 
+                        attribute value { xsd:string } |
+                        element nmtm:value { xsd:string }
+                ) &
+                Precision?
         )
 
 Duration =

Added: branches/owd/rnc/owd.rnc


Property changes on: branches/owd/rnc/owd.rnc
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/owd/rnc/topo/nmtopo_l4.rnc
===================================================================
--- trunk/nmwg/schema/rnc/topo/nmtopo_l4.rnc    2007-09-08 03:07:54 UTC (rev 
264)
+++ branches/owd/rnc/topo/nmtopo_l4.rnc 2007-09-15 05:27:48 UTC (rev 269)
@@ -25,32 +25,13 @@
                 L4EndpointPairContent
         }
 
+#
+# One endpoint should have a roll of 'src' and the other 'dst'.
+#
 L4EndpointPairContent =
         (
-                element nmtl4:endPoint {
-                        attribute port { xsd:string }? &
-                        attribute protocol { xsd:string }? &
-                        (
-                                attribute role { "src" } |
-                                element nmtopo:role { "src" }
-                        )? &
-                        (
-                                element nmtl4:address { L4Address } |
-                                element nmtl3:interface { anyThing }
-                        )?                
-                },
-                element nmtl4:endPoint {
-                        attribute port { xsd:string }? &
-                        attribute protocol { xsd:string }? &
-                        (
-                                attribute role { "dst" } |
-                                element nmtopo:role { "dst" }
-                        )? &
-                        (
-                                element nmtl4:address { L4Address } |
-                                element nmtl3:interface { anyThing }
-                        )                
-                } 
+                L4Endpoint &
+                L4Endpoint
         )