perfsonar development work

Author: zurawski
Date: 2007-02-15 12:20:25 -0500 (Thu, 15 Feb 2007)
New Revision: 209

Added:
   trunk/nmwg/schema/rnc/event.rnc
Modified:
   trunk/nmwg/schema/rnc/nmtopo-l4.rnc
   trunk/nmwg/schema/rnc/nmtopo.rnc
   trunk/nmwg/schema/rnc/sonar.rnc
Log:
Syntax errors related to verification have been corrected.  'event.rnc' 
deals with the event/status namespace.  This is now used in sonar.rnc.

-jason



Added: trunk/nmwg/schema/rnc/event.rnc


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

Modified: trunk/nmwg/schema/rnc/nmtopo-l4.rnc
===================================================================
--- trunk/nmwg/schema/rnc/nmtopo-l4.rnc 2007-02-13 19:35:59 UTC (rev 208)
+++ trunk/nmwg/schema/rnc/nmtopo-l4.rnc 2007-02-15 17:20:25 UTC (rev 209)
@@ -31,7 +31,7 @@
 L4EndpointPairContent =
         (
                 element nmtl4:endPoint {
-                        attribute port { xsd:int }? &
+                        attribute port { xsd:string }? &
                         attribute protocol { xsd:string }? &
                         (
                                 attribute role { "src" } |
@@ -43,7 +43,7 @@
                         )?                
                 },
                 element nmtl4:endPoint {
-                        attribute port { xsd:int }? &
+                        attribute port { xsd:string }? &
                         attribute protocol { xsd:string }? &
                         (
                                 attribute role { "dst" } |
@@ -67,7 +67,7 @@
         }
 
 L4EndpointContent = 
-        attribute port { xsd:int }? &
+        attribute port { xsd:string }? &
         attribute protocol { xsd:string }? &
         attribute index { xsd:string }? &
         L4Role? &
@@ -93,7 +93,7 @@
 PathContent = 
         Identifier &
         PathIdRef? &        
-        Endpoint*
+        L4Endpoint*
 
 
 ## ########################

Modified: trunk/nmwg/schema/rnc/nmtopo.rnc
===================================================================
--- trunk/nmwg/schema/rnc/nmtopo.rnc    2007-02-13 19:35:59 UTC (rev 208)
+++ trunk/nmwg/schema/rnc/nmtopo.rnc    2007-02-15 17:20:25 UTC (rev 209)
@@ -72,7 +72,7 @@
                 text
         ) &
         attribute type { xsd:string } &
-        attribute port { xsd:int }?
+        attribute port { xsd:string }?
 
 
 # ##############################################################

Modified: trunk/nmwg/schema/rnc/sonar.rnc
===================================================================
--- trunk/nmwg/schema/rnc/sonar.rnc     2007-02-13 19:35:59 UTC (rev 208)
+++ trunk/nmwg/schema/rnc/sonar.rnc     2007-02-15 17:20:25 UTC (rev 209)
@@ -23,24 +23,13 @@
 # Include additional functionality from other files
 # ############################################################## 
 include "service.rnc"
+include "event.rnc"
 include "utilization.rnc" {
-        StoreContent |= SonarStoreContent
         Metadata |= SonarMetadata
         Data |= SonarData        
 } 
 
 
-SonarStoreContent = 
-        Identifier? & 
-        MessageIdentifierRef? &
-        Type &
-        Parameters? &                        
-        (
-                SonarStoreMetadata |  
-                Data
-        )+        
-        
-
 # ##############################################################
 # Similar to the nmwg metadata (still in the appropriate namespace)
 # but we incorporate the new subject elements.
@@ -63,38 +52,29 @@
 # 
 # ##############################################################
 
-SonarStoreMetadata = 
-        element nmwg:metadata {
-                Identifier &
-                MetadataIdentifierRef? &
-                SonarStoreMetadataContent
-       }        
-
-
-SonarStoreMetadataContent =
-        SonarStoreSubject? &
-        Parameters? &
-        EventType? &
-        Key?   
-
-
 SonarMetadata = 
         element nmwg:metadata {
                 Identifier &
                 MetadataIdentifierRef? &
                 SonarMetadataContent
-           }        
+        }        
 
 
 SonarMetadataContent =
         (
                 (
-                        SonarSubject? &
                         (
-                                SonarParameters |
-                                Parameters
-                        )?
-                ) |
+                                SonarSubject? &
+                                (
+                                        Parameters |
+                                        SonarParameters
+                                )?
+                        ) |
+                       (
+                                NMWGSubject? &
+                                Parameters?
+                        )
+                )? |
                 UtilizationMetadataBlock |
                 FilterMetadataBlock |
                 LSMetadataBlock
@@ -176,17 +156,48 @@
         element perfsonar:subject {
                 Identifier &
                 MetadataIdentifierRef? & 
-                Service?
+                (
+                        Node? |
+                        (
+                                BaseLink? |
+                                L2Link? |
+                                L3Link?
+                        ) |
+                        (
+                                Interface |
+                                BaseInterface |
+                                L2Interface |
+                                L3Interface
+                        ) |
+                        (                   
+                                EndpointPair |
+                                L4EndpointPair
+                        ) |
+                        Service
+                )?
         }
 
-
-SonarStoreSubject = 
-       element nmwg:subject {
+NMWGSubject = 
+        element nmwg:subject {
                 Identifier &
                 MetadataIdentifierRef? & 
                 (
-                        Interface |
-                        Service
+                        Node? |
+                        (
+                                BaseLink? |
+                                L2Link? |
+                                L3Link?
+                        ) |
+                        (
+                                Interface |
+                                BaseInterface |
+                                L2Interface |
+                                L3Interface
+                        ) |
+                        (                   
+                                EndpointPair |
+                                L4EndpointPair
+                        )
                 )?
         }
 
@@ -234,12 +245,14 @@
                                 (
                                         Datum* |
                                         ResultDatum* |
+                                        EventDatum* |
                                         LookupServiceDataContent*            
                    
                                 )
                         ) |
                         (
                                 Datum* |
                                 ResultDatum* |
+                                EventDatum* |
                                 LookupServiceDataContent*                    
            
                         ) |
                         Key*        
@@ -290,6 +303,7 @@
                 (
                         Datum* |
                         ResultDatum* |
+                        EventDatum* |
                         LookupServiceDataContent*                            
    
                 )
         }