perfsonar development work

Author: verena
Date: 2007-11-14 04:31:41 -0500 (Wed, 14 Nov 2007)
New Revision: 296

Modified:
   branches/owd/rnc/hades.rnc
   branches/owd/rnc/summary.rnc
Log:
Added Schedule parameter to summary.rnc
Added hades specific parameter set to hades.rnc


Modified: branches/owd/rnc/hades.rnc
===================================================================
--- branches/owd/rnc/hades.rnc  2007-11-07 14:47:02 UTC (rev 295)
+++ branches/owd/rnc/hades.rnc  2007-11-14 09:31:41 UTC (rev 296)
@@ -9,10 +9,6 @@
 # ##############################################################
 
 
-# I'm not sure I see the point of creating this file until/unless
-# you have things that are specific to hades and not included in
-# summary. --jeff
-
 namespace nmwg = "http://ggf.org/ns/nmwg/base/2.0/";
 namespace nmwgr = "http://ggf.org/ns/nmwg/result/2.0/";
 namespace summary = 
"http://ggf.org/ns/nmwg/characteristic/delay/summary/20070921/";
@@ -26,7 +22,75 @@
 
 
 HadesMetadata = 
-# all the same as summary except for hades:subject and hades eventtype?
+        element nmwg:metadata {
+                Identifier &
+                MetadataIdentifierRef? &
+                (
+                        OWDMetadataContent |
+                        SummaryMetadataContent |
+                        HadesMetadataContent
+                )
+        }
 
-HadesData =
-# all the same as summary except for hades:datum?
+HadesMetadataBlock =
+        HadesSubject? &
+        (
+                HadesParameters |
+                Parameters
+        )?
+
+HadesMetadataContent =
+        (
+                HadesMetadataBlock |
+                FilterMetadataBlock
+        ) &
+        EventType? &
+        Key?
+
+HadesSubject =
+        element hades:subject {
+                Identifier &
+                MetadataIdentifierRef? &
+                (
+                        EndpointPair |
+                        L4EndpointPair
+                )
+        }
+
+HadesParameters =
+        element hades:parameters {
+                Identifier &
+                HadesParameter+
+        }
+
+
+HadesParameter =
+        element nmwg:parameter {
+                attribute name { "packetsize" | "groupsize" |
+                                 "interval" | "precedence" 
+                } &
+                (
+                        attribute value { xsd:string } |
+                        xsd:string
+                )
+        }
+
+HadesData = 
+        element nmwg:data {
+                Identifier &
+                MetadataIdentifierRef? &
+                (
+                        (
+                                Metadata* |
+                                HadesMetadata*
+                        ) |
+                        (
+                                HadesDatum* |
+                                ResultDatum*
+                        ) |
+                        Key*
+                )
+         }
+
+HadesDatum = SummaryDatum
+

Modified: branches/owd/rnc/summary.rnc
===================================================================
--- branches/owd/rnc/summary.rnc        2007-11-07 14:47:02 UTC (rev 295)
+++ branches/owd/rnc/summary.rnc        2007-11-14 09:31:41 UTC (rev 296)
@@ -76,6 +76,15 @@
                         xsd:float
                 )
         } &
+        element nmwg:parameter {
+                attribute name { "schedule" } &
+                (
+                       element interval {
+                                attribute type {"fixed" | "exp"} &
+                                xsd:string
+                        } +
+                )
+        }
 
 
 SummaryData =