perfsonar development work

Author: roman
Date: 2007-08-06 09:46:14 -0400 (Mon, 06 Aug 2007)
New Revision: 2592

Modified:
   branches/new-structure/trunk/geant2_java-rrd-ma/conf/eventType-map.xml
   branches/new-structure/trunk/geant2_java-rrd-ma/conf/objects.config
   branches/new-structure/trunk/geant2_java-rrd-ma/conf/rrd-database_TEST.xml
Log:

configs updated to support errors data



Modified: 
branches/new-structure/trunk/geant2_java-rrd-ma/conf/eventType-map.xml
===================================================================
--- branches/new-structure/trunk/geant2_java-rrd-ma/conf/eventType-map.xml    
  2007-08-06 13:24:50 UTC (rev 2591)
+++ branches/new-structure/trunk/geant2_java-rrd-ma/conf/eventType-map.xml    
  2007-08-06 13:46:14 UTC (rev 2592)
@@ -12,5 +12,9 @@
         
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.UtilizationQueryGenerator</metadataQueryGenerator>
         
<baseChainingMerger>org.perfsonar.service.measurementArchive.rrdType.NMWGInterfaceBaseChaining</baseChainingMerger>
     </eventType>
+    <eventType>
+        <name>http://ggf.org/ns/nmwg/characteristic/errors/2.0</name>
+        
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.ErrorsQueryGenerator</metadataQueryGenerator>
+    </eventType>
 
 </eventType-config>

Modified: branches/new-structure/trunk/geant2_java-rrd-ma/conf/objects.config
===================================================================
--- branches/new-structure/trunk/geant2_java-rrd-ma/conf/objects.config 
2007-08-06 13:24:50 UTC (rev 2591)
+++ branches/new-structure/trunk/geant2_java-rrd-ma/conf/objects.config 
2007-08-06 13:46:14 UTC (rev 2592)
@@ -12,6 +12,7 @@
 http://ggf.org/ns/nmwg/characteristic/utilization/2.0/subject/ 
org.ggf.ns.nmwg.characteristic.utilization.v2_0.Subject
 http://ggf.org/ns/nmwg/characteristic/utilization/2.0/parameters/      
org.ggf.ns.nmwg.characteristic.utilization.v2_0.Parameters
 http://ggf.org/ns/nmwg/characteristic/utilization/2.0/datum/   
org.ggf.ns.nmwg.characteristic.utilization.v2_0.Datum
+http://ggf.org/ns/nmwg/characteristic/errors/2.0/subject/      
org.ggf.ns.nmwg.characteristic.errors.v2_0.Subject
 http://ggf.org/ns/nmwg/event/status/base/2.0/stateOper/        
org.ggf.ns.nmwg.event.status.base.v2_0.StateOper
 http://ggf.org/ns/nmwg/event/status/base/2.0/stateAdmin/       
org.ggf.ns.nmwg.event.status.base.v2_0.StateAdmin
 http://ggf.org/ns/nmwg/event/status/base/2.0/datum/    
org.ggf.ns.nmwg.event.status.base.v2_0.Datum

Modified: 
branches/new-structure/trunk/geant2_java-rrd-ma/conf/rrd-database_TEST.xml
===================================================================
--- 
branches/new-structure/trunk/geant2_java-rrd-ma/conf/rrd-database_TEST.xml  
2007-08-06 13:24:50 UTC (rev 2591)
+++ 
branches/new-structure/trunk/geant2_java-rrd-ma/conf/rrd-database_TEST.xml  
2007-08-06 13:46:14 UTC (rev 2592)
@@ -5,6 +5,9 @@
                  
xmlns:netutil="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/";
                  xmlns="http://ggf.org/ns/nmwg/base/2.0/";>
 
+
+    <!-- utilization -->
+
     <nmwg:metadata id="meta1">
         <netutil:subject id="subj1">
             <nmwgt:interface>
@@ -79,5 +82,41 @@
     </nmwg:data>
 
 
+    <!-- errors -->
 
+    <nmwg:metadata id="meta3">
+        <errors:subject id="subj1">
+            <nmwgt:interface>
+                <nmwgt:hostName>test-hostName</nmwgt:hostName>
+                <nmwgt:ifAddress type="ipv4">10.1.2.3</nmwgt:ifAddress>
+                <nmwgt:ifName>test-0</nmwgt:ifName>
+                <nmwgt:ifIndex>2</nmwgt:ifIndex>
+                <nmwgt:direction>in</nmwgt:direction>
+                <nmwgt:capacity>1000000000</nmwgt:capacity>
+            </nmwgt:interface>
+        </errors:subject>
+        <nmwg:parameters>
+            <nmwg:parameter 
name="supportedEventType">http://ggf.org/ns/nmwg/characteristic/errors/2.0</nmwg:parameter>
+        </nmwg:parameters>
+    </nmwg:metadata>
+
+
+    <nmwg:data id="data3" metadataIdRef="meta3">
+        <nmwg:key>
+            <nmwg:parameters>
+                <nmwg:parameter 
name="file">__BASEPATH__/samples/rrd/test.rrd</nmwg:parameter>
+                <nmwg:parameter name="dataSource">bytes</nmwg:parameter>
+                <nmwg:parameter name="valueUnits">Bps</nmwg:parameter>
+
+                <!-- those below are optional parameters describing rrd 
file-->
+                <nmwg:parameter name="dataSourceStep">300</nmwg:parameter>
+                <nmwg:parameter 
name="dataSourceType">ABSOLUTE</nmwg:parameter>
+                <nmwg:parameter 
name="dataSourceHeartbeat">400</nmwg:parameter>
+                <nmwg:parameter name="dataSourceMinValue">0</nmwg:parameter>
+                <nmwg:parameter 
name="dataSourceMaxValue">10000000</nmwg:parameter>
+            </nmwg:parameters>
+        </nmwg:key>
+    </nmwg:data>
+
+
 </nmwg:store>
\ No newline at end of file