perfsonar development work

Author: boote
Date: 2007-12-20 02:54:34 -0500 (Thu, 20 Dec 2007)
New Revision: 315

Modified:
   trunk/nmwg/schema/rnc/nmtime.rnc
   trunk/nmwg/schema/rnc/topo/nmtopo_l4.rnc
Log:
nmtime: adding precision into a timestamp

nmtopo_l4: Previous 'L4EndPointPair' definition was problematic in some tools.
Simplified to make a pair just be two L4Endpoints. (Previous definition
tried to enforce 'src'/'dst' roles - that can now be done in business
logic.)



Modified: trunk/nmwg/schema/rnc/nmtime.rnc
===================================================================
--- trunk/nmwg/schema/rnc/nmtime.rnc    2007-12-20 07:33:12 UTC (rev 314)
+++ trunk/nmwg/schema/rnc/nmtime.rnc    2007-12-20 07:54:34 UTC (rev 315)
@@ -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 =

Modified: trunk/nmwg/schema/rnc/topo/nmtopo_l4.rnc
===================================================================
--- trunk/nmwg/schema/rnc/topo/nmtopo_l4.rnc    2007-12-20 07:33:12 UTC (rev 
314)
+++ trunk/nmwg/schema/rnc/topo/nmtopo_l4.rnc    2007-12-20 07:54:34 UTC (rev 
315)
@@ -2,7 +2,7 @@
 # 
 # File:         nmtopo_l4.rnc - Layer 4 Network entities
 #                           
-# Version:      $Id: nmtopo-l4.rnc 209 2007-02-15 17:20:25Z zurawski $
+# Version:      $Id$
 #           
 # ##############################################################
 
@@ -25,32 +25,15 @@
                 L4EndpointPairContent
         }
 
+#
+# In general, one endpoint should have a roll of 'src' and the other 'dst'.
+# (However, this is just text - and it is reasonable that something like
+# owd might use 'sender'/'receiver' in place of 'src'/'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
         )