perfsonar development work

Author: boote
Date: 2007-02-02 14:43:33 -0500 (Fri, 02 Feb 2007)
New Revision: 203

Modified:
   trunk/nmwg/schema/rnc/bwctl.rnc
   trunk/nmwg/schema/rnc/nmbase.rnc
Log:
Attempting to modify the bwctl.rnc file so that it will not need to change
with each new tool that it is configured to run.

Also trying to add the ability to return result codes.



Modified: trunk/nmwg/schema/rnc/bwctl.rnc
===================================================================
--- trunk/nmwg/schema/rnc/bwctl.rnc     2007-02-02 18:24:43 UTC (rev 202)
+++ trunk/nmwg/schema/rnc/bwctl.rnc     2007-02-02 19:43:33 UTC (rev 203)
@@ -8,13 +8,17 @@
 # Namespace definitions
 
 namespace nmwg = "http://ggf.org/ns/nmwg/base/2.0/";
-namespace iperf = "http://ggf.org/ns/nmwg/tools/iperf/2.0/";
-namespace bwctl = "http://ggf.org/ns/nmwg/tools/bwctl/??/";
+namespace bwctl = "http://ggf.org/ns/nmwg/tools/bwctl/2.0/";
 
 # Include additional functionality from other files
 
-include "iperf.rnc" {
-       Metadata |= BwctlMetadata
+include "nmtopo.rnc"
+include "nmtopo_ver2.rnc"
+
+# any* is included here to allow tool specific versions (iperf/nuttcp/etc...)
+include "nmbase.rnc" {
+       Metadata |= BwctlMetadata | anyMetadata
+        Data |= BwctlData | anyData
 }
 
 BwctlMetadata =
@@ -24,27 +28,32 @@
                BwctlMetadataContent
        }
 
+BwctlMetadataBlock =
+        BwctlSubject? &
+        (
+                BwctlParameters |
+                Parameters
+        )?
+
 BwctlMetadataContent =
        (
-               BwctlSubject &
-               BwctlParameters?
-       ) |
-       (       IperfSubject &
-               IperfParameters?
-       ) |
-       RoleContent? &
-       Key? &
-       EventType?
+                BwctlMetadataBlock
+       ) &
+       EventType? &
+       Key?
 
 BwctlSubject =
        element bwctl:subject {
                Identifier &
                MetadataIdentifierRef? &
-               EndPoint
+                (
+                        EndpointPair |
+                        L4EndpointPair
+                )
        }
 
 BwctlParameters =
-       element nmwg:parameters {
+       element bwctl:parameters {
                Identifier &
                BwctlParameter +
        }
@@ -61,16 +70,38 @@
                )
        }
 
-RoleContent =
-       element iperf:parameters {
-               Identifier &
-               element nmwg:parameter {
-                       attribute name { xsd:string } &
-                       attribute value { xsd:string }
-               }
-       }
-               
+# Data Block, at the moment, only ResultCodes are used
 
-# Data Block, at the moment, only Iperf Data is used
+BwctlData =
+        element nmwg:data {
+                Identifier &
+                MetadataIdentifierRef? &
+                (
+                        (
+                                Metadata* |
+                                BwctlMetadata*
+                        ) |
+                        (
+                                BwctlCommonTime+ &
+                                ResultDatum*
+                        ) |
+                        ResultDatum* |
+                        Key*
+                )
+        }
 
-BwctlData |= IperfData
+BwctlCommonTime =
+        element nmwg:commonTime {
+                Type &
+                (
+                        TimeStamp |
+                        (
+                                StartTime &
+                                (
+                                        EndTime |
+                                        Duration
+                                )
+                        )
+                ) &
+                ResultDatum*
+        }

Modified: trunk/nmwg/schema/rnc/nmbase.rnc
===================================================================
--- trunk/nmwg/schema/rnc/nmbase.rnc    2007-02-02 18:24:43 UTC (rev 202)
+++ trunk/nmwg/schema/rnc/nmbase.rnc    2007-02-02 19:43:33 UTC (rev 203)
@@ -439,3 +439,100 @@
                 text 
         )*        
 
+# ##############################################################
+# This sequence defines the building blocks without respect for
+# namespace. (What we really want is *:subject etc... but relaxng
+# doesn't allow that - so we just wildcard the element, but still
+# indicate the type of stuff that goes inside.)
+# ##############################################################
+
+anyMetadata = 
+        element * {
+                (
+                        Identifier &
+                        MetadataIdentifierRef? &
+                        anyMetadataContent
+                ),
+                anyElement*
+        }
+
+anyMetadataBlock =
+        anySubject? &
+        anyParameters?
+
+anyMetadataContent = 
+        (
+                anyMetadataBlock
+        ) &        
+        EventType? &
+        Key?        
+
+
+anySubject =
+        element * {
+                SubjectContent
+        }
+
+anyParameters = 
+        element * {
+                anyParametersContent
+        }
+   
+anyParametersContent =    
+        Identifier &
+        anyParameter+
+   
+anyParameter = 
+        element * { 
+                attribute name { xsd:string } &
+                (
+                        attribute value { xsd:string } |
+                        (
+                                anyElement |
+                                text
+                        )
+                )
+        }   
+   
+anyData =
+        element * {
+                (
+                        Identifier &
+                        MetadataIdentifierRef? &
+                        (
+                                anyMetadata* |
+                                (
+                                        anyCommonTime+ & 
+                                        anyDatum*
+                                ) |
+                                anyDatum* |
+                                Key*
+                        )
+                ),
+                anyElement*
+        }
+
+anyCommonTime = 
+        element nmwg:commonTime {
+                (
+                        Type &
+                        (
+                                TimeStamp |
+                                (
+                                        StartTime & 
+                                        (
+                                                EndTime | 
+                                                Duration 
+                                        )
+                                )
+                        ) &
+                        anyDatum*
+                ),
+                anyElement*
+        }
+
+anyDatum =
+        element * {
+                anyThing  
+        }
+