perfsonar development work

Author: zurawski
Date: 2007-06-19 11:24:05 -0400 (Tue, 19 Jun 2007)
New Revision: 237

Modified:
   trunk/nmwg/schema/example_instances/snmp.xml
   trunk/nmwg/schema/rnc/snmp.rnc
Log:
Adding additional datum examples.

-jason



Modified: trunk/nmwg/schema/example_instances/snmp.xml
===================================================================
--- trunk/nmwg/schema/example_instances/snmp.xml        2007-06-19 15:07:47 
UTC (rev 236)
+++ trunk/nmwg/schema/example_instances/snmp.xml        2007-06-19 15:24:05 
UTC (rev 237)
@@ -68,5 +68,17 @@
       </nmwg:parameters>
     </nmwg:key>  
   </nmwg:data>
-  
+
+ <nmwg:data xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/"; id="data3" 
metadataIdRef="192.168.0.202-1">
+   <nmwg:datum timeType="unix" timeValue="1182266520" value="3434.043" 
valueUnits="Bps"/>
+   <nmwg:datum timeType="unix" timeValue="1182266530" value="3423.656" 
valueUnits="Bps"/>
+   <nmwg:datum timeType="unix" timeValue="1182266540" value="3243.454" 
valueUnits="Bps"/>   
+ </nmwg:data>
+   
+ <nmwg:data xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/"; id="data4" 
metadataIdRef="192.168.0.202-2">
+   <snmp:datum timeType="unix" timeValue="1182266520" value="3434.043" 
valueUnits="Bps"/>
+   <snmp:datum timeType="unix" timeValue="1182266530" value="3423.656" 
valueUnits="Bps"/>
+   <snmp:datum timeType="unix" timeValue="1182266540" value="3243.454" 
valueUnits="Bps"/> 
+ </nmwg:data>   
+   
 </nmwg:message>

Modified: trunk/nmwg/schema/rnc/snmp.rnc
===================================================================
--- trunk/nmwg/schema/rnc/snmp.rnc      2007-06-19 15:07:47 UTC (rev 236)
+++ trunk/nmwg/schema/rnc/snmp.rnc      2007-06-19 15:24:05 UTC (rev 237)
@@ -2,7 +2,7 @@
 #
 # File:         snmp.rnc - Specialized schema for snmp
 #
-# Version:      $Id:$
+# Version:      $Id$
 # Purpose:      Describes specific elements to be used in the
 #               representation and handling of snmp
 # Reference:    http://books.xmlschemata.org/relaxng/page2.html
@@ -192,6 +192,7 @@
 SNMPDatum =
         element snmp:datum {
                 attribute value { xsd:string } &
+                attribute valueUnits { xsd:string }? &                
                 (
                         (
                                 attribute timeType { xsd:string } &