perfsonar development work

Author: zurawski
Date: 2007-02-02 15:35:11 -0500 (Fri, 02 Feb 2007)
New Revision: 204

Added:
   trunk/nmwg/schema/example_instances/bwctl.xml
Modified:
   trunk/nmwg/schema/rnc/bwctl.rnc
   trunk/nmwg/schema/rnc/nmbase.rnc
   trunk/nmwg/schema/rnc/result.rnc
   trunk/nmwg/schema/test-instances.sh
Log:
BWCTL updates:

- Schema validates, but the open issue of remains if we should define 
what possible namespaced elements may apear in a BWCTL message (iperf or 
other tools) if if we can get away using an 'anyElement'.

- The instance may be a little out of date, I have added the nmwgr:datum 
elements in place of the original iperf:datum for the time being.

-jason



Added: trunk/nmwg/schema/example_instances/bwctl.xml


Property changes on: trunk/nmwg/schema/example_instances/bwctl.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: trunk/nmwg/schema/rnc/bwctl.rnc
===================================================================
--- trunk/nmwg/schema/rnc/bwctl.rnc     2007-02-02 19:43:33 UTC (rev 203)
+++ trunk/nmwg/schema/rnc/bwctl.rnc     2007-02-02 20:35:11 UTC (rev 204)
@@ -1,4 +1,4 @@
-# File:                bwctl.rnc
+# File:                bwctl.rnc
 #
 # Version:
 # Purpose:
@@ -9,24 +9,30 @@
 
 namespace nmwg = "http://ggf.org/ns/nmwg/base/2.0/";
 namespace bwctl = "http://ggf.org/ns/nmwg/tools/bwctl/2.0/";
+namespace nmwgtopo3 = "http://ggf.org/ns/nmwg/topology/base/3.0/";
+namespace nmwgt = "http://ggf.org/ns/nmwg/topology/2.0/";
 
 # Include additional functionality from other files
 
 include "nmtopo.rnc"
-include "nmtopo_ver2.rnc"
+include "nmtopo_ver3.rnc"
+include "result.rnc"
 
 # any* is included here to allow tool specific versions (iperf/nuttcp/etc...)
 include "nmbase.rnc" {
-       Metadata |= BwctlMetadata | anyMetadata
-        Data |= BwctlData | anyData
+        Metadata |= BwctlMetadata
+        Data |= BwctlData
 }
 
 BwctlMetadata =
-       element nmwg:metadata {
-               Identifier &
-               MetadataIdentifierRef? &
-               BwctlMetadataContent
-       }
+        element nmwg:metadata {
+                Identifier &
+                MetadataIdentifierRef? &
+               (
+                       BwctlMetadataContent |
+                       anyElement*
+               )
+        }
 
 BwctlMetadataBlock =
         BwctlSubject? &
@@ -36,39 +42,45 @@
         )?
 
 BwctlMetadataContent =
-       (
+        (
                 BwctlMetadataBlock
-       ) &
-       EventType? &
-       Key?
+        ) &
+        EventType? &
+        Key?
 
 BwctlSubject =
-       element bwctl:subject {
-               Identifier &
-               MetadataIdentifierRef? &
+        element bwctl:subject {
+                Identifier &
+                MetadataIdentifierRef? &
                 (
-                        EndpointPair |
-                        L4EndpointPair
+                        (
+                                EndpointPair |
+                                       L4EndpointPair
+                        ) |
+                        (
+                                Endpoint |
+                                       L4Endpoint
+                        )                        
                 )
-       }
+        }
 
 BwctlParameters =
-       element bwctl:parameters {
-               Identifier &
-               BwctlParameter +
-       }
+        element bwctl:parameters {
+                Identifier &
+                BwctlParameter+
+        }
 
 BwctlParameter =
-       element nmwg:parameter {
-               attribute name { "duration" | "advisoryWindowsize" |
-                                "scheduleInterval" | "latest" |
-                                "numberOfTests" | "alpha" 
-               } &
-               (
-                       attribute value { xsd:int } |
-                       xsd:int
-               )
-       }
+        element nmwg:parameter {
+                attribute name { "duration" | "advisoryWindowsize" |
+                                 "scheduleInterval" | "latest" |
+                                 "numberOfTests" | "alpha" 
+                } &
+                (
+                        attribute value { xsd:int } |
+                        xsd:int
+                )
+        }
 
 # Data Block, at the moment, only ResultCodes are used
 

Modified: trunk/nmwg/schema/rnc/nmbase.rnc
===================================================================
--- trunk/nmwg/schema/rnc/nmbase.rnc    2007-02-02 19:43:33 UTC (rev 203)
+++ trunk/nmwg/schema/rnc/nmbase.rnc    2007-02-02 20:35:11 UTC (rev 204)
@@ -438,101 +438,3 @@
                 anyNMWGAttribute | 
                 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  
-        }
-

Modified: trunk/nmwg/schema/rnc/result.rnc
===================================================================
--- trunk/nmwg/schema/rnc/result.rnc    2007-02-02 19:43:33 UTC (rev 203)
+++ trunk/nmwg/schema/rnc/result.rnc    2007-02-02 20:35:11 UTC (rev 204)
@@ -36,6 +36,6 @@
                 attribute type { xsd:string }? &
                 (
                         text |
-                        AnyElement+
+                        anyElement+
                 )
         }

Modified: trunk/nmwg/schema/test-instances.sh
===================================================================
--- trunk/nmwg/schema/test-instances.sh 2007-02-02 19:43:33 UTC (rev 203)
+++ trunk/nmwg/schema/test-instances.sh 2007-02-02 20:35:11 UTC (rev 204)
@@ -68,7 +68,7 @@
 $JAVA -jar $MSV -warning $SCHEMA_DIR/abw.rng $INSTANCE_DIR/abw2.xml
 $JAVA -jar $JING $SCHEMA_DIR/abw.rng $INSTANCE_DIR/abw2.xml
 
-# test nmdelayrtt instance
+# test bwctl instance
 rm -f rnc/*rng rnc/*xsd
 
 $JAVA -jar $TRANG -I rnc -O rng $SCHEMA_DIR/bwctl.rnc $SCHEMA_DIR/bwctl.rng