perfsonar development work

Author: dfn.calim
Date: 2012-11-29 14:37:19 +0000 (Thu, 29 Nov 2012)
New Revision: 777

Modified:
   branches/perfsonar-oppd-all-0.53/lib/NMWG/schema/2.0/owamp.rnc
Log:
add adjusted OWAMP MP schema rnc

Modified: branches/perfsonar-oppd-all-0.53/lib/NMWG/schema/2.0/owamp.rnc
===================================================================
--- branches/perfsonar-oppd-all-0.53/lib/NMWG/schema/2.0/owamp.rnc      
2012-11-29 07:42:41 UTC (rev 776)
+++ branches/perfsonar-oppd-all-0.53/lib/NMWG/schema/2.0/owamp.rnc      
2012-11-29 14:37:19 UTC (rev 777)
@@ -9,6 +9,9 @@
 namespace owamp = "http://ggf.org/ns/nmwg/tools/owamp/2.0/";
 namespace nmwgtopo3 = "http://ggf.org/ns/nmwg/topology/base/3.0/";
 namespace nmwgt = "http://ggf.org/ns/nmwg/topology/2.0/";
+namespace owd = 
"http://ggf.org/ns/nmwg/characteristic/delay/one-way/20070914/";
+namespace summary = 
"http://ggf.org/ns/nmwg/characteristic/delay/summary/20070921/";
+namespace owamp = "http://ggf.org/ns/nmwg/tools/owamp/2.0/";
 
 
 include "nmtopo.rnc"
@@ -63,18 +66,22 @@
 #For dtails look the owping options on:
 #
 OwampParameter =
-        element nmwg:parameter {
-                attribute name { "count" | "timeout" | "size" |
-                                 "units" | "send_schedule" |
-                                 "percentile" | "one-way" | "DSCP" |
-                                 "PHB" | "enddelay" | "startdelay" |
-                                 "bucket_width" | "intermediates" |
-                                 "output" | "portrange"
-                } &
-                (
-                        attribute value { xsd:int } |
-                        xsd:int
-                )
+               element nmwg:parameter {
+                       attribute name { "count" | "timeout" | "size" |
+                               "percentile" | "DSCP" | "enddelay" | 
+                               "startdelay" | "bucket_width" | 
+                               "intermediates" | "portrange"
+                       } &
+                       (
+                               attribute value { xsd:unsignedInt } |
+                               xsd:unsignedInt
+                       )
+                       attribute name { "units" | "one-way" | "output"
+                       } &
+                       (
+                                attribute value { xsd:string } |
+                                xsd:string
+                        )
         }
 
 
@@ -90,39 +97,49 @@
                         (
                                 IPPMDatum* |
                                OwampDatum* |
+                               SummaryDatum* |
                                 ResultDatum*
                         ) |
                         ResultDatum* |
                         Key*
                 )
         }
-
+############################################
+#### Raw data datum from OWAMP MP      ####
+############################################
 OwampDatum =
        element owamp:datum {
-               attribute seqNum { xsd:int } &
-               attribute ttl { xsd:int } &
+               attribute sequenceNumber { xsd:unsignedInt } &
+               attribute packetTTL { xsd:unsignedInt } &
                attribute sendTime { xsd:int } &
                attribute sendSynchronized { xsd:int } &
                attribute sendTimeError { xsd:float } &
                attribute receiveTime { xsd:int } &
                attribute receiveSynchronized { xsd:int } &
                attribute receiveTimeError { xsd:float } &
+       }
 
+
+############################################
+#### Summary data datum from OWAMP MP   ####
+############################################
+SummaryDatum =
+        element summary:datum {
                attribute sender { xsd:string } &
                attribute receiver { xsd:string } &
-               attribute sent { xsd:int } &
-               attribute loss { xsd:int } &
-               attribute lost_percent { xsd:int } &
-               attribute duplicates { xsd:int } &
-               attribute min_delay { xsd:int } &
-               attribute med_delay { xsd:int } &
-               attribute max_delay { xsd:int } &
-               attribute delay_units { xsd:string } &
-               attribute error { xsd:int } &
-               attribute error_units { xsd:string } &
-               attribute jitter { xsd:int } &
-               attribute jitter_units { xsd:string } &
-               attribute hops { xsd:int } &
+               attribute sent { xsd:unsignedInt } &
+               attribute loss { xsd:unsignedInt } &
+               attribute lost_percent { xsd:float } &
+               attribute duplicates { xsd:unsignedInt } &
+               attribute min_delay { xsd:float } &
+               attribute med_delay { xsd:float } &
+               attribute max_delay { xsd:float } &
+               attribute timeType { xsd:string } &
+               attribute startTime { string } &
+               attribute endTime { string }
+               attribute maxError { xsd:float } &
+               attribute jitter { xsd:unsignedInt } &
+               attribute hops { xsd:unsignedInt } &
                
 
        }